Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,885 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

401 Commits

Author SHA1 Message Date
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into files

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 2014-05-16 14:36:00 -07:00
Ricardo Quesada 7e4597508c Does not crash on Mac if the .ttf file is not found 2014-05-15 17:22:53 -07:00
Ricardo Quesada f9f0142842 default value is 0.5 for interpolation 2014-05-15 16:52:15 -07:00
Ricardo Quesada 9d1ab1ba07 uniform sampler CC_Texture0 MUST NOT be defined on shaders 
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
 2014-05-15 16:47:54 -07:00
Ricardo Quesada e5494cd9e5 multiple pass sprite 
on ShaderSprite2.cpp
 2014-05-15 13:13:31 -07:00
Ricardo Quesada 1c13f901ae Even better shader test 2014-05-14 16:55:57 -07:00
Ricardo Quesada 839170c147 Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
Ricardo Quesada dc711643cd Squashed commit of the following: 
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 14 10:03:44 2014 -0700

    math renames

    `Vector2` -> `Vec2`
    `Vector3` -> `Vec3`
    `Vector4` -> `Vec4`
    `Matrix` -> `Mat4`

commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:24:28 2014 -0700

    raw version of rename Vector3

commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:07:14 2014 -0700

    rename Vector2 after merge

commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:05:30 2014 -0700

    Merge branch 'v3' into v3_renameMathClassName

    Conflicts:
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
    	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp

commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 08:51:45 2014 -0700

    rename vector2 in tests/cpp-empty-test folder

commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:58:23 2014 -0700

    rename vector2 in tests/cpp-tests cpp files

commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:52:57 2014 -0700

    rename vector2 in tests/cpp-tests head files

commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:49:48 2014 -0700

    rename vector2 in extension folder

commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:47:22 2014 -0700

    rename vector2 in cocos/2d cpp files

commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:44:39 2014 -0700

    rename vector2 in cocos/2d head files

commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:59 2014 -0700

    rename vector2 in cocos/base folder

commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:43 2014 -0700

    rename vector2 in cocos/deprecated folder

commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:40:26 2014 -0700

    rename vector2 in cocos/editor-support folder

commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:36:48 2014 -0700

    rename vector2 in cocos/ui folder

commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:39 2014 -0700

    rename vector2 in cocos/renderer folder

commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:32:15 2014 -0700

    rename vector2 in cocos/physics folder

commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:25:01 2014 -0700

    rename vector2 in cocos/math folder

commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 00:16:55 2014 -0700

    rename Vector2 to Vec2
    deprecate typedef Vector2
 2014-05-14 10:07:09 -07:00
minggo 048d6c09d3 Merge pull request #6701 from heliclei/autotest-autorun 
support auto start cpp-tests
 2014-05-14 18:16:58 +08:00
andyque 6cb3b47488 closed #5110, refactor 2014-05-14 17:07:24 +08:00
andyque e6889dca36 issue #5110, refactor UIText 2014-05-14 15:26:14 +08:00
andyque 46cf6251b6 issue #5110, rename a member variable and delete gui prefix in ui tests 2014-05-14 11:26:04 +08:00
andyque e6a36fde18 issue #5110, refactor VideoPlayer 2014-05-14 11:18:11 +08:00
andyque 08801c035e issue #5110. refactor UILoadingBar, remove unneeded deprecats 2014-05-14 10:48:16 +08:00
Ricardo Quesada 723938e292 Adds effectNode in ShaderTest2 2014-05-13 18:12:58 -07:00
Ricardo Quesada 0171e27747 Merge pull request #6714 from Dhilan007/v3_nodefix 
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
 2014-05-13 14:14:27 -07:00
Ricardo Quesada 6462a1bf79 Adds simple sample for multitexturing 2014-05-13 12:55:34 -07:00
Dhilan007 ed0ae9d5b3 fix compiling fail on Linux. 2014-05-13 18:51:02 +08:00
minggo 05c16de87a Merge pull request #6715 from dumganhar/iss5160-animation-notification 
closed #5160: Dispatch a custom event after an animation frame is displayed
 2014-05-13 18:38:44 +08:00
James Chen 24524cb5be issue #5160: Updates actiontest 2014-05-13 17:30:48 +08:00
heliclei 35b19a239a exit gracefully after running all tests 2014-05-13 17:20:12 +08:00
James Chen 0dd22af688 closed #5160: Updates ActionTest 2014-05-13 17:08:52 +08:00
Dhilan007 fbfbcaffc8 update project 2014-05-13 16:43:19 +08:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08:00
heliclei 17cd12f8b1 fix win32 compile 2014-05-13 14:43:11 +08:00
Nite Luo 7d8cfc4cca set parent transform dirty when addChild 2014-05-12 23:28:20 -07:00
heliclei 13f3c9705a Merge remote-tracking branch 'upstream/v3' into autotest-autorun 2014-05-13 14:24:00 +08:00
heliclei 8cc224dcef change default auto-run config to false 2014-05-13 14:17:43 +08:00
heliclei 45d8547622 add config item 2014-05-13 14:16:06 +08:00
heliclei eaa879a9f3 fix for winrt build 2014-05-13 14:08:49 +08:00
Nite Luo 0b7b9f6131 Merge branch 'v3' into reparentChildren 2014-05-12 22:52:19 -07:00
Nite Luo e1f82c174b add TestCase for reparentChildren bug 2014-05-12 22:50:31 -07:00
heliclei 471f218acf add config item to control whether start autorun 2014-05-13 11:47:32 +08:00
Ricardo Quesada 012f1020ca GLProgramState fixes 
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
 2014-05-12 19:12:56 -07:00
heliclei 98f1c6768c Merge remote-tracking branch 'upstream/v3' into autotest-autorun 2014-05-13 07:53:49 +08:00
heliclei 1aabedb316 support auto start tests 2014-05-12 21:47:55 +08:00
minggo 9ab2dae212 Merge pull request #6635 from dumganhar/iss4660-unicode 
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
 2014-05-12 17:57:25 +08:00
andyque 9a8c87601c Merge branch 'v3' into refactor5057 2014-05-12 15:52:47 +08:00
andyque 9d7d06a1f8 issue #5047, refactor UIVideoPlayer 2014-05-12 11:35:57 +08:00
andyque 4f3c128c4f issue #5057, refator UITextField 2014-05-12 11:29:22 +08:00
andyque eeaf48d3e5 issue #5047, refactor UISlider 2014-05-12 11:17:06 +08:00
andyque 74ac5d1d5a issue #5057, refactor UIScrollView 2014-05-12 11:08:10 +08:00
andyque 77a463bac3 issue #5057, refactor UIPageView 2014-05-12 10:31:52 +08:00
andyque 7f15a14d55 issue #5057, refactor LoadingBar 2014-05-12 10:12:22 +08:00
andyque 43eb75fb1a issue #5057, refactor Listview 2014-05-12 09:51:23 +08:00
James Chen 4d275f91d0 issue #4660: Updates utf unit test, use c memcmp and run 10000 times 2014-05-11 11:24:32 +08:00
James Chen 945ad2eb04 issue #4660: Adds utf8/16 conversion unit test 2014-05-10 21:52:19 +08:00
Ricardo Quesada 006fe7eb94 Merge pull request #6667 from super626/improved_glprogram 
remove unused shadertest
 2014-05-09 21:42:01 -07:00
Ricardo Quesada 4d579892b1 Merge pull request #6668 from dabingnn/v3_fix_accident_changes 
V3 fix accident changes
 2014-05-09 21:38:09 -07:00
Huabing.Xu ba63befa5e roll back target=android-10 2014-05-09 21:36:35 -07:00