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

29015 Commits

Author SHA1 Message Date
XiaoYang dd95f9fbb9 Merge pull request #287 from zhukaixy/terrain 
add for wp8 support --ziwen.tang
 2015-04-03 18:04:25 +08:00
tangziwen 14b94a6aac Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resolve Conflicts:
	tests/cpp-tests/Classes/controller.cpp
 2015-04-03 17:50:08 +08:00
zhukaixy 6eb86f736c add for wp8 support --ziwen.tang 2015-04-03 17:12:44 +08:00
tangziwen 72f5121959 Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain 2015-04-03 16:58:27 +08:00
tangziwen d79c38e17a add WP8 support 2015-04-03 16:50:09 +08:00
yangxiao 7ea1c1ac1f reset 2015-04-03 16:15:09 +08:00
XiaoYang bdce345b51 Merge pull request #286 from tangziwen/terrain 
Terrain
 2015-04-03 15:59:17 +08:00
CocosRobot e20a747138 [AUTO]: updating luabinding automatically 2015-04-03 07:53:06 +00:00
Huabing.Xu 42cc17621f Merge pull request #11272 from WenhaiLin/v3-autotests 
Test automation support
 2015-04-03 15:47:45 +08:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-04-03 15:45:51 +08:00
Daiki Asahi fc92acf587 remove interlevel argument. 2015-04-03 16:43:39 +09:00
XiaoYang 7fd56d2afd Merge pull request #285 from tangziwen/terrain 
Terrain
 2015-04-03 14:57:13 +08:00
tangziwen ee41c9b3f1 add win rt support 2015-04-03 14:36:29 +08:00
WenhaiLin 0d51c13743 Make all test cases work fine with new test framework. 2015-04-03 14:31:03 +08:00
tangziwen 8a7b318c1a Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment 2015-04-03 13:49:07 +08:00
XiaoYang 930ea8cd9c Merge pull request #284 from songchengjiang/v3 
fix the bug of Particle3DModelRender
 2015-04-03 13:47:14 +08:00
songchengjiang e4a58d5c35 fix the bug of Particle3DModelRender 2015-04-03 12:43:14 +08:00
WenhaiLin 6f47006324 Add new test framework. 2015-04-03 11:54:39 +08:00
Huabing.Xu 98371e4fbb Merge pull request #11267 from WenhaiLin/v3-at01 
Disable MessageBox when the device does not have an accelerometer on WinRT.
 2015-04-03 11:53:07 +08:00
WenhaiLin fdba25cdde Disable MessageBox when the device does not have an accelerometer on WinRT 2015-04-03 11:51:00 +08:00
Huabing.Xu cb77d0145a Merge pull request #11266 from WenhaiLin/v3-at01 
Add getInScene,getDuration for TransitionScene class.
 2015-04-03 11:50:44 +08:00
WenhaiLin f2dc7958bf Add getInScene,getDuration for TransitionScene class. 2015-04-03 11:49:15 +08:00
Huabing.Xu bf31214796 Merge pull request #11263 from WenhaiLin/v3-menuitem-fix 
MenuItem: Fixed crash if MenuItem::onExit is called multiple times.
 2015-04-03 09:53:57 +08:00
Huabing.Xu ee0a1eed91 Merge pull request #11264 from WenhaiLin/v3-Performance-setContentScaleFactor 
Performance: Fixed lag if Director::setContentScaleFactor is called frequently
 2015-04-03 09:48:18 +08:00
tangziwen e4ae88ef15 add new line at end of file 2015-04-03 09:11:09 +08:00
Dale Stammen d8b6a0aaf9 removed unused method 2015-04-02 09:11:19 -07:00
Dale Stammen 47b338e4e6 fix deprecated warnings 2015-04-02 09:08:26 -07:00
Dale Stammen 344b44bdcb fire foreground and background events 2015-04-02 09:08:16 -07:00
Dale Stammen 957bf48790 fire foreground and background events 2015-04-02 09:07:44 -07:00
WenhaiLin aaae566b7b Performance: Fixed lag if Director::setContentScaleFactor is called frequently 2015-04-02 23:35:56 +08:00
WenhaiLin a544eadab8 MenuItem: Fixed crash if MenuItem::onExit is called multiple times. 2015-04-02 23:27:07 +08:00
yinjimmy 587ee21e4b revert lua runtime 2015-04-02 18:27:53 +08:00
XiaoYang 63a27d14b7 Merge pull request #282 from lvlonggame/terrain 
fix bug: about minFilter and magFilter
 2015-04-02 17:26:35 +08:00
yangxiao cfbfe3b676 add to linux 2015-04-02 16:57:38 +08:00
minggo b648d1f25e Merge pull request #11255 from CocosRobot/update_lua_bindings_1427939343 
[AUTO]: updating luabinding automatically
 2015-04-02 15:21:21 +08:00
lvlong 60bed4f461 revert alpha map minFilter 2015-04-02 15:10:51 +08:00
lvlong c3cc8b917c fix bug: about minFilter and magFilter 2015-04-02 15:01:14 +08:00
yangxiao 827231f5c9 add to cocos2d 2015-04-02 14:29:02 +08:00
yangxiao 1b63e5168a add to linux 2015-04-02 14:21:51 +08:00
yangxiao 9aabbabe6e reset 2015-04-02 14:20:36 +08:00
yangxiao 784c68f9a0 modify test title 2015-04-02 14:18:22 +08:00
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
xiaofeng11 46a0ceff75 Merge pull request #8 from doomsdayer/v3 
Remove CCNodeReader.h/cpp for win8.1-universal
 2015-04-02 10:29:01 +08:00
XiaoYang 984babc9c9 Merge pull request #281 from tangziwen/terrain 
update terrain
 2015-04-02 10:19:11 +08:00
yusheng.lu 82c6e623e0 Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters 2015-04-02 10:15:36 +08:00
samuele3hu 826fe4cf31 Update the Xcode project setting for luajit 2015-04-02 10:07:31 +08:00
CocosRobot dfc2390659 [AUTO]: updating luabinding automatically 2015-04-02 01:51:14 +00:00
minggo 6cf344ded6 Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup 
Remove useless (char*) casts in CCTMXXMLParser.cpp
 2015-04-02 09:45:22 +08:00
XiaoYang 42e304c767 Merge pull request #280 from lvlonggame/terrain 
fix aabbDirty bug.
 2015-04-02 09:42:40 +08:00
minggo e7a6c7eada Merge pull request #11245 from CocosRobot/update_lua_bindings_1427857074 
[AUTO]: updating luabinding automatically
 2015-04-02 09:39:36 +08:00