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

21021 Commits

Author SHA1 Message Date
Huabing.Xu eba84b5dea fix wrong indentions 2014-06-27 14:45:30 +08:00
Huabing.Xu 1152f77ed7 clean up fast tmx code 2014-06-27 14:42:53 +08:00
Huabing.Xu b232896f85 roll back fps compute logic 
fix crash bug
 2014-06-27 13:41:06 +08:00
Huabing.Xu 7254977358 roll back quadcommand 2014-06-27 12:44:19 +08:00
Huabing.Xu 6292ed05be improvement for fast tmx rendering 2014-06-27 11:50:44 +08:00
Huabing.Xu a04b5fc5d5 use custom command for fast_tmx rendering 2014-06-27 10:30:21 +08:00
Huabing.Xu 81aa9c2c74 use custom command for rendering 2014-06-26 20:45:08 +08:00
Huabing.Xu 87e5e1460e adjust some code to reduce indentions 2014-06-26 11:45:15 +08:00
Huabing.Xu e19ce7054b add comments 2014-06-26 11:21:29 +08:00
Huabing.Xu c1b5984ce8 using stable sort for quads 2014-06-25 11:08:47 +08:00
Huabing.Xu 1919ebc61f add fast tmx files to Xcode project file 2014-06-25 11:08:28 +08:00
Huabing.Xu 290897af14 Merge branch 'v3' into fast_tmx 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-25 10:10:08 +08:00
Huabing.Xu bda9708206 clean up Fast TMX code2 2014-06-25 10:06:37 +08:00
Huabing.Xu 67f83f43b0 clean up Fast TMX code 2014-06-25 10:04:20 +08:00
minggo 4ce61b94b9 Merge pull request #7191 from CocosRobot/update_lua_bindings_1403606774 
[AUTO]: updating luabinding automatically
 2014-06-24 20:15:29 +08:00
CocosRobot 2cd212b1b0 [AUTO]: updating luabinding automatically 2014-06-24 10:48:02 +00:00
minggo 63d0f66553 Merge pull request #7189 from andyque/feature5161 
replace size with contentSize
 2014-06-24 18:43:33 +08:00
minggo 75245cb99e Merge pull request #7190 from minggo/perf-improve 
use reference instead
 2014-06-24 18:25:53 +08:00
minggo 7155eb4ebb use reference instead 2014-06-24 18:23:10 +08:00
andyque 4d82673760 issue #5161, replace _size with _contentSize 2014-06-24 15:08:58 +08:00
minggo 742421766d Merge pull request #7187 from minggo/performance-improve 
use reference instead
 2014-06-24 14:53:56 +08:00
minggo 3336f7edad use reference instead 2014-06-24 14:53:02 +08:00
Huabing.Xu 740372ceb3 new version of rendering for tile map 2014-06-24 11:04:17 +08:00
minggo aa7e48794b [ci skip] 2014-06-24 10:50:09 +08:00
minggo 76e2540fd7 Merge pull request #7163 from darkdukey/fixNodeReader 
Fix NodeReader crash
 2014-06-24 10:49:10 +08:00
minggo 8f0d23df60 Merge pull request #7185 from CocosRobot/update_cocosfiles_1403578075 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-24 10:48:41 +08:00
CocosRobot 7f104f4bf7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-24 02:47:56 +00:00
minggo d9c99e6251 [ci skip] 2014-06-24 10:47:50 +08:00
minggo 4bb6545250 Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics 
closed #5541: Add rotation action support for physics.
 2014-06-24 10:46:10 +08:00
minggo 375f01b6cc Merge pull request #7183 from CocosRobot/update_lua_bindings_1403577263 
[AUTO]: updating luabinding automatically
 2014-06-24 10:43:03 +08:00
minggo ad64cf7e94 Merge pull request #7176 from CocosRobot/update_cocosfiles_1403520184 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-24 10:42:51 +08:00
CocosRobot 879862b993 [AUTO]: updating luabinding automatically 2014-06-24 02:35:55 +00:00
boyu0 f2ecb31958 closed #5541: add more warning for unsupported functions. 2014-06-24 10:33:21 +08:00
minggo 66763bd400 Merge pull request #7180 from MSOpenTech/wp8-v3 
WP8 v3 broken build fix
 2014-06-24 10:31:56 +08:00
minggo 9c130e7aa2 Merge pull request #7181 from CocosRobot/update_cocosfiles_1403577062 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-24 10:31:39 +08:00
CocosRobot cb9e5c2d77 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-24 02:31:03 +00:00
minggo 0a61932730 [ci skip] 2014-06-24 10:30:36 +08:00
minggo 6394c62c40 Merge pull request #7131 from samuele3hu/v3_lua_fix 
Add Lua binding for Animation3D and Animate3D ,and add related test case.
 2014-06-24 10:29:28 +08:00
andyque 199ad9c623 issue #5161, replace deprecated methods 2014-06-24 10:18:01 +08:00
samuele3hu e34fcf05f6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-24 10:14:53 +08:00
samuele3hu 50f82ce1d0 Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00
andyque 312ab4f396 Merge branch 'v3' into feature5161 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
 2014-06-24 09:51:18 +08:00
Dale Stammen 87a6b83001 added missing files for wp8 2014-06-23 08:35:39 -07:00
Dale Stammen 44d6248056 added missing cocoloader files 2014-06-23 08:31:29 -07:00
CocosRobot 8038db923c [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-23 10:43:05 +00:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +08:00
minggo a2ebf315ba Merge pull request #7123 from andyque/cleanupBinaryLoader 
cocostudio binary parser
 2014-06-23 18:38:02 +08:00
andyque 7eae7625c1 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 18:30:03 +08:00
andyque d2680f2884 fix windows compile error 2014-06-23 18:29:23 +08:00
samuele3hu 9a3720b1f7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-23 18:07:20 +08:00