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

122 Commits

Author SHA1 Message Date
Dhilan007 72709c30d5 fixed compilation fail on Android. 2014-05-07 18:20:40 +08:00
Dale Stammen 703c6c2b39 added missing Assets folder 2014-05-05 13:47:43 -07:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
Ricardo Quesada c590bbe547 target is android-10 2014-04-30 13:18:57 -07:00
Ricardo Quesada 8bb8416c26 Improved directory structure 2014-04-29 17:37:36 -07:00
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 2014-04-25 16:20:24 +08:00
Dale Stammen 3930beda40 input event refactor. console enabled for wp8 2014-04-19 10:10:44 -07:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
Dale Stammen 8d1f4188eb added wp8 support files and projects 2014-03-28 15:53:55 -07:00
Dale Stammen 8bd5497ac6 use ResolutionPolicy::SHOW_ALL on WP8 2014-03-28 11:28:48 -07:00
Dale Stammen 210f95c2d3 can't close app on WP8 2014-03-28 11:27:43 -07:00
Kazuki Sakamoto 3fba61f384 Remove NativeActivity 2014-03-24 19:57:29 -07:00
James Chen 611cccd3e7 [win32] HelloCpp -> cpp-empty-test, HelloLua -> lua-empty-test. 2014-03-12 15:59:48 +08:00
James Chen 79e979ac71 updates CMakeLists.txt 2014-03-11 19:10:37 +08:00
James Chen 25604d3872 Update CMakeLists.txt 2014-03-11 19:10:37 +08:00
James Chen 431e800dd6 All tests could run on Android. 2014-03-11 19:10:36 +08:00
James Chen b635d9abd9 Remove .gitkeep in 'cpp-empty-test', Add proguard-project.txt. 2014-03-11 19:10:36 +08:00
James Chen 3d5c3001bd cpp-empty-test works ok for Android. 2014-03-11 19:10:36 +08:00
James Chen fda8cfa740 plist rename. 2014-03-11 19:10:35 +08:00
James Chen 7504a25d9c cpp-hello -> cpp-empty-test, lua-hello -> lua-empty-test, ouch.... 2014-03-11 19:10:35 +08:00