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

470 Commits

Author SHA1 Message Date
Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
 2014-04-23 14:46:14 +08:00
袁全伟 56f9def298 Update AppDelegate.cpp 
use getInstance replace :)
 2014-04-22 13:20:07 +08:00
Dale Stammen 617982cbe5 added missing projects. Fixed property sheets 2014-04-19 10:09:53 -07:00
Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCSprite.cpp
	tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
 2014-04-15 22:21:04 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
James Chen cb807e61c2 closed #4607: Fixed project created by template crashes on iOS5.1 device. 2014-04-15 11:56:50 +08:00
James Chen 43d6e1176a issue #4729: Compilation error fixes for linux 2014-04-10 00:36:42 +08:00
James Chen 96e7bad7e3 Updates templates for linux platform 2014-04-01 01:49:24 -07:00
Dale Stammen 101818ac62 added wp8 support files and projects 2014-03-28 15:44:15 -07:00
Dale Stammen 210f95c2d3 can't close app on WP8 2014-03-28 11:27:43 -07:00
Dhilan007 c642d4d4c4 update templates for remove native activity 2014-03-25 15:43:42 +08:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
James Chen e89b203b13 Remove AccelerometerSimulation.h for cpp template. 2014-03-21 15:08:53 +08:00
Sergey f65ef462e5 getCurrentLanguageCode() for all platforms return iso 639-1 language code 
iPhone template improvements(for game center support)
 2014-03-17 22:34:21 +04:00
minggo 656211a72f add description for how to load .so 2014-03-12 21:28:38 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
andyque 448b101578 fix linux compile error 2014-03-11 20:46:11 +08:00
Ricardo Quesada aa4248ae10 kazmath updates for templates 2014-03-04 17:29:48 -08:00
Ricardo Quesada 4b57d41fd2 updates templates for Linux 2014-03-04 17:27:37 -08:00
James Chen 33a5be526c Removes unused templates. 2014-03-04 09:46:32 +08:00