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

28008 Commits

Author SHA1 Message Date
Nite Luo 2be140fccc Merge pull request #10225 from darkdukey/saveRenderState 
save/restore render state
 2015-01-27 11:12:05 -08:00
Nite Luo 75253d66ff Merge branch 'v3' into v3_fixRenderer 2015-01-27 10:56:28 -08:00
Nite Luo a45db07da3 Merge pull request #10236 from super626/usecase 
Usecase 2 for 2d + 3d
 2015-01-27 10:30:18 -08:00
geron-cn 3268dbc9fd add cpp-test for animation list and projected 2015-01-28 02:12:09 +08:00
geron-cn df10a974fa fix projectnode 2015-01-27 23:19:27 +08:00
minggo f09626bcfb Merge pull request #10235 from pipu/modify_parse_ignoresize 
Modify that parse ignoreSize for TextAtlas, TextBMFont.
 2015-01-27 18:44:01 +08:00
cheyiliu 71abf22a0d Update SocketIOTest.cpp 
just a fix for spelling
 2015-01-27 18:22:39 +08:00
WenhaiLin d9bb6192dc Fixed may access wrong memory in Scheduler::schedule 2015-01-27 17:29:12 +08:00
Huabing.Xu cee1df2278 Merge branch 'v3' into v3_fixRenderer 2015-01-27 16:54:35 +08:00
yangxiao 220b34d105 Merge branch 'newcode' into v3 2015-01-27 16:35:54 +08:00
yangxiao fad8f9f1da format 2015-01-27 16:31:15 +08:00
yangxiao af8a6c16b1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-01-27 16:24:07 +08:00
XiaoYang 95a4f20a9b Merge pull request #222 from lvlonggame/v3 
fix bug:  issues #10207
 2015-01-27 16:23:22 +08:00
Wenhai Lin f2335fb3bc Fixed Scale9Sprite can't run move/scale/rotation action in physics scene 2015-01-27 16:13:45 +08:00
lvlong 57970da398 Do some optimize 2015-01-27 15:50:05 +08:00
yangxiao 89f107ac08 remove unused variables 2015-01-27 15:25:40 +08:00
minggo 15bf919000 Merge pull request #10231 from geron-cn/fixanimationlistclone 
FIX BUG:  animationinfos lost after actiontimeline clone
 2015-01-27 15:24:25 +08:00
yangxiao 9744439048 use case 2 finished 2015-01-27 15:24:15 +08:00
pipu ed1b7edce7 Modify that parse ignoreSize for TextAtlas, TextBMFont. 2015-01-27 15:09:48 +08:00
Huabing.Xu a38b210803 add depth in renderCommand 
refactor rendering order of renderQueue
 2015-01-27 14:29:09 +08:00
minggo 5a4fbf691b Merge pull request #10234 from CocosRobot/update_lua_bindings_1422338223 
[AUTO]: updating luabinding automatically
 2015-01-27 14:00:36 +08:00
CocosRobot 4792a44a87 [AUTO]: updating luabinding automatically 2015-01-27 05:58:53 +00:00
minggo 880abfe814 Merge pull request #10209 from andyque/fixLoadingBarReloadTexture 
Fix loading bar reload texture issue
 2015-01-27 13:50:38 +08:00
minggo e1afb7c789 Merge pull request #10226 from andyque/removeDuplicateCode 
remove unused code
 2015-01-27 13:50:15 +08:00
minggo 2a94ede427 Merge pull request #10227 from cpascal/add_EditBox_getDescription 
Added override of ui::EditBox::getDescription()
 2015-01-27 13:49:55 +08:00
minggo 434c0baba4 Merge pull request #10219 from geron-cn/fixProjectNodeLoader 
fix bug: fix crash when lack of projectnode file
 2015-01-27 13:41:27 +08:00
geron-cn 390c336a19 FIX animationfio lost after actiontimeline clone 2015-01-27 12:04:14 +08:00
flamefox 5057503299 Merge pull request #2 from cocos2d/v3 
Merge
 2015-01-27 10:49:20 +08:00
flamefox 575f68b724 Merge branch 'v3' of https://github.com/flamefox/cocos2d-x into v3 
Conflicts:
	templates/cocos2dx_files.json
 2015-01-27 10:44:19 +08:00
flamefox f81a2a8990 when bindings-generator on windows，it need this 2015-01-27 10:42:06 +08:00
flamefox 160d046030 when bindings-generator on windows，it need this 2015-01-27 10:31:38 +08:00
andyque 7b81f3a811 remove unused code 2015-01-27 10:17:41 +08:00
cpascal d857164768 Added override of ui::EditBox::getDescription() 2015-01-27 11:10:04 +09:00
cpascal 985db1cd21 Merge remote-tracking branch 'upstream/v3' into v3 2015-01-27 11:04:58 +09:00
Nite Luo 398f0b861d Merge pull request #10220 from darkdukey/billboardTest 
Billboard test-case
 2015-01-26 16:54:41 -08:00
Nite Luo 15adaf2877 save/restore render state 2015-01-26 16:37:11 -08:00
kompjoefriek 722ec8713b Merge remote-tracking branch 'upstream/v3' into v3 2015-01-26 23:18:48 +01:00
kompjoefriek dd694e39d2 Revert "Fixes cocos2d/cocos2d-x/#8414" 
This reverts commit 60fc8de036.
 2015-01-26 23:13:28 +01:00
Nite Luo 55b2504bfd Merge branch 'v3' into billboardTest 2015-01-26 10:53:17 -08:00
flamefox 83643f68e7 Merge pull request #1 from cocos2d/v3 
metge v3
 2015-01-27 02:03:11 +08:00
Vladimir Timofeev 7956297430 cmake+msvc: disable tests and lua bindings by default (temporarily, until tests will be fixed) 2015-01-26 17:28:58 +03:00
geron-cn 937ee25e7b revert plugin 2015-01-26 21:25:11 +08:00
geron-cn d3baae0304 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader 2015-01-26 21:21:31 +08:00
geron-cn a1a7273436 fix bug: fix crash when lack of projected file 2015-01-26 21:20:26 +08:00
Vladimir Timofeev 004ee0b785 cmake+msvc: Use inline debug info (/Z7) format. Or internal error may occur because some dependant libs compiled with Z7 format. 2015-01-26 15:29:03 +03:00
yangxiao cc18a3a955 another use case not finished 2015-01-26 18:44:30 +08:00
lvlong bb419719aa fix bug: about caching uniform. 2015-01-26 18:40:00 +08:00
andyque 95e8072afa fixed issue #10183 2015-01-26 18:26:59 +08:00
minggo 81caa9f351 [ci skip] Update CHANGELOG 2015-01-26 18:02:00 +08:00
minggo f54c6c93bb Merge pull request #10215 from andyque/fixIssue10210 
don't release the scale9Image when updateSprites
 2015-01-26 17:58:21 +08:00