[Nyartoolkit-and-dev] [SCM] nyartoolkit-and (nyartoolkit-and) branch, android-2.2, created. e0527cde82499ecb4507319f813f0b675d1f9afb

Back to archive index

atsuo****@users***** atsuo****@users*****
2011年 3月 11日 (金) 14:20:21 JST


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to "nyartoolkit-and" repository
containing the "nyartoolkit-and" project.

The branch, android-2.2 has been created
        at  e0527cde82499ecb4507319f813f0b675d1f9afb (commit)

- Log -----------------------------------------------------------------
commit e0527cde82499ecb4507319f813f0b675d1f9afb
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Fri Mar 11 13:32:20 2011 +0900

    set Min SDK version.

commit 34e6867cbc9c5892f5ca034a3adbcc9fcf1ac460
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Jan 5 11:41:43 2011 +0900

    Fix background transparent of min3d.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit d19208e523c8417613de61aecb725bef3f82ba50
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Jan 5 11:37:18 2011 +0900

    Import min3d.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 3ba6b808a59e746453cab95268129e2304580aee
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Jun 24 20:02:46 2010 +0900

    Reduce GC for to reduce loading time.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 86231cf3ee82a9a5d4acca7a0e6904051f19ea80
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Jun 24 20:02:02 2010 +0900

    Add confidence check for marker detection.
    and some bug fix.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit a98d6935a968035c56922a88e86bd392a4756265
Merge: ce50320c865bff4216de8fb2967a724f2e6c6ef6 6929ad904f58ac81fc5fe6250a5bcd41d09b23bd
Author: unknown <rokub****@users*****>
Date:   Sat May 29 23:23:20 2010 +0900

    Merge branch 'android-1.6' of git+ssh://git.sourceforge.jp/gitroot/nyartoolkit-and/nyartoolkit-and into android-1.6

commit ce50320c865bff4216de8fb2967a724f2e6c6ef6
Author: 六望 風 <rokub****@users*****>
Date:   Sat May 29 21:44:58 2010 +0900

    GPLのコメントなどを追加、classpathの変更

commit 3058e6ba3d80f067b928c321212a2f86d0d86a83
Author: 六望 風 <rokub****@users*****>
Date:   Sat May 29 21:37:55 2010 +0900

    nyartoolkit.jogl.utils の移動、Android版では不要と思われるファイルを削除(src.utils, sample, test)

commit 0bfaa0c5d181b40876d3e9b914ed8ad8051d1267
Author: 六望 風 <rokub****@users*****>
Date:   Sat May 29 21:31:58 2010 +0900

    Add comment

commit 6929ad904f58ac81fc5fe6250a5bcd41d09b23bd
Merge: 6f07ee239b1d1f894e6f9c7a700918c45e0ff55b 834c0b21888319ad847576c1f0388ba8d60ff8c7
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu May 27 15:37:17 2010 +0900

    Merge branch 'master' into android-1.6

commit 6f07ee239b1d1f894e6f9c7a700918c45e0ff55b
Author: 六望 風 <rokub****@users*****>
Date:   Wed May 26 00:41:59 2010 +0900

    LICENSE.txt の内容修正とファイル名の綴りを修正

commit e5b3d322cd9345de562309621395fc63a36f35f3
Author: 六望 風 <rokub****@users*****>
Date:   Wed May 26 00:40:35 2010 +0900

    COPYING.txtを追加
    ReadmeファイルをforAndroidSDK用に新規作成
    NyARTKforJavaベースのreadmeは削除

commit 3b9d4fae384670561bcfa2847df490649bde064b
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed May 19 14:44:11 2010 +0900

    Move loading message to outside of a loop.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 3025deff413b77f96263cae041049b5373b20767
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed May 19 12:06:01 2010 +0900

    Fix of closing failure for N1Camera.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 50cf42bf4b42639d7c3f4b49f6e559711e520c1e
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Tue May 18 20:37:40 2010 +0900

    Fix of start-up failure after first launch.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 4e44567d4225c0ffcb416c4410ea5219f88abdba
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Mon May 17 10:50:41 2010 +0900

    Remove Dev1Camera device.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 620bc7a18e1b8d3cf1da08dd78f7f80610e6206d
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Mon May 10 20:46:52 2010 +0900

    Add support multiple marker.
    
    Found first marker hiro assigns droid model.
    Found first marker kanji assigns miku model.
    Others assigns a cube object.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 3c938fb51525799f0a38ed2a78db1d61359ffba5
Merge: f599328505d500218f967599f7cb15369d561049 a2776c5c6f8415ef91c94c35d3b954afbef6a427
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Fri Apr 30 10:06:26 2010 +0900

    Merge branch 'master' into android-1.6

commit f599328505d500218f967599f7cb15369d561049
Merge: 76cfeb091aa37c9d326e70ec5ddc643e998af6e2 824c0cd0b5b9d37e14e135d9bbf06521c227555a
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Tue Apr 27 16:59:12 2010 +0900

    Merge branch 'master' into android-1.6
    
    Conflicts:
    	src.utils/jmf/jp/nyatla/nyartoolkit/jmf/utils/JmfNyARRaster_RGB.java
    	src.utils/jogl/jp/nyatla/nyartoolkit/jogl/utils/NyARGLUtil.java
    	src.utils/qt/jp/nyatla/nyartoolkit/qt/utils/QtNyARRaster_RGB.java

commit 76cfeb091aa37c9d326e70ec5ddc643e998af6e2
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Apr 21 10:29:52 2010 +0900

    Move camera preview format convert function to JNI.
    
    YUV420SP to ARGB/RGB24.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit d37e13b75a6756eeaa2675eac0272d321f610b40
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Apr 21 10:17:41 2010 +0900

    Move android_group/artoolkit to androidgroup/nyartoolkit
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit bc18b235a86e34730373c9331859b4aef8385dbe
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Tue Apr 13 11:57:50 2010 +0900

    Add capture bitmap file for Static Camera.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 7bbeb6f98871bdf1721e4681238b42925fe0c93c
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Tue Apr 13 10:59:12 2010 +0900

    Add debug log for frame rate in makeFramerate().
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit dde0431b0a151ced651b763deb4a9d3a8233873d
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Tue Apr 13 10:29:40 2010 +0900

    Revert "Add debug log for frame rate."
    
    This reverts commit 04aaffe36e9af5ad21c287a946942bf28ad3aff5.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 04aaffe36e9af5ad21c287a946942bf28ad3aff5
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Mon Apr 12 12:55:40 2010 +0900

    Add debug log for frame rate.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit ee9b445f5d1a929d36592a8c85eebebf6fc8a024
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Mon Apr 12 10:25:59 2010 +0900

    Remove Attached Camera.
    
    It is obsolete.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit c89f937a6a810fe20091ac6816b67d499a2d2629
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Apr 8 15:10:18 2010 +0900

    Change preview size to 320x240 for supporting emulator.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 4ee28e99544d49f044f8ce7fc58af095f45f1a14
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Apr 8 13:22:17 2010 +0900

    Remove focusing from HT-03A.
    
    and some clean-up for Nexus One.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 5631a90d85e4277533ede1f1a38a1a53a4e5cc66
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Apr 8 12:04:59 2010 +0900

    Add missed Cube class.
    
    Sorry.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 33b023556f9e06ab6ef0fcee18a1b842a771b714
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Apr 7 14:46:25 2010 +0900

    Add Cube rendering object.
    
    This is switchable by touching the screen.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit f9e7931bed4c9b625d32b8cc627d2683a570b9c3
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Tue Apr 6 10:24:54 2010 +0900

    Add support Nexus One.
    
    This causes error when closing.
    It will fix later.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 93588dbcbb48d0d67355e90c8aa50d1b05491275
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Mon Apr 5 16:11:20 2010 +0900

    Add support translucent background mode.
    
    This feature is selectable with mTranslucentBackground.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 21067eb0eba4faa24c9a2c21d168c01b6887bef0
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Fri Apr 2 11:36:15 2010 +0900

    Move to start preview after SurfaceChanged for UVC camera.
    
    Too early preview callback causes some problems.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit b8c53e8fd1fb8d6e376cbf15c36bc8d635e021f6
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Fri Apr 2 11:28:58 2010 +0900

    Move to start preview after SurfaceChanged for HT-03A.
    
    Too early preview callback causes some problems.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 3381b0f8f486441df2bc1d85f47c0467fc521440
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Fri Apr 2 11:12:15 2010 +0900

    Update GLSurfaceView from //branches/master/... @ 142658,142658
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 8ceba6ea80707b91be39756b9e2b859fb0f34f27
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Apr 1 20:35:28 2010 +0900

    Update GLSurfaceView from from //depot/cupcake/@135843.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 05969601f3b3b039953203861302630a8b66d23b
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Apr 1 19:02:34 2010 +0900

    Support Metasequoia model for Android.
    
    Implemented by noritsuna.
    
    Signed-off-by: noritsuna <norit****@users*****>

commit edddfb7c86e3389161eb998df6c07e45029fa2a0
Merge: 8caa6993682fa5408738c84d955ec99e42eeb3b9 5042d6d103723efbe9385dee475605aa64396691
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Thu Apr 1 13:42:51 2010 +0900

    Merge branch 'master' into android-1.6

commit 8caa6993682fa5408738c84d955ec99e42eeb3b9
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Fri Mar 5 16:12:26 2010 +0900

    Add support UVC camera
    
    Support UVC camera with take picture version.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 7004ad5b6cf96727936c990cb2c5c7178006d6cf
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Fri Mar 5 09:25:28 2010 +0900

    Add support HT-03A.
    
    Support HT-03A with preview frame capture version.
    
    Signed-off-by: Atsuo Igarashi <atsuo****@gmail*****>

commit 75a57b42737e01522566c5e0e7718cd56b05533b
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Feb 24 14:37:23 2010 +0900

    Support NyARToolkit-2.5.1.
    
    Modified for Android and NyARToolkit-2.5.1 by suga.
    
    Signed-off-by: suga <sugai****@users*****>

commit e541af2dc1bbec4e21a3ab9dc0582da4ca62e295
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Feb 24 12:55:28 2010 +0900

    Support Android.
    
    Imple****@NyART***** by noritsuna.
    
    Signed-off-by: noritsuna <norit****@users*****>

commit 847751689f81136802e0aa93fd6af97ccd0e2eae
Author: Atsuo Igarashi <atsuo****@gmail*****>
Date:   Wed Feb 24 12:49:59 2010 +0900

    Fix compile error with Android SDK.
    
    Remove & modify some util files.

-----------------------------------------------------------------------


hooks/post-receive
-- 
nyartoolkit-and (nyartoolkit-and)




Nyartoolkit-and-dev メーリングリストの案内
Back to archive index