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

17165 Commits

Author SHA1 Message Date
Ricardo Quesada d0f963e655 Template fixes 2014-01-30 21:17:55 -08:00
Ricardo Quesada 1f37d84652 compiles on Windows 2014-01-30 21:10:35 -08:00
Ricardo Quesada 31e89d5491 Merge pull request #5274 from ricardoquesada/linux_glview_fixes 
oops, compiles on linux
 2014-01-30 20:37:56 -08:00
Ricardo Quesada 516f66c320 oops, compiles on linux 2014-01-30 20:37:16 -08:00
Ricardo Quesada b9f7f9e162 Merge pull request #5273 from ricardoquesada/glview_with_rect 
glview uses rect instead of size
 2014-01-30 20:24:24 -08:00
Ricardo Quesada 924951d3b5 glview uses rect instead of size 
this is because it could be needed if you want to create a view
inside a window in an specific position
 2014-01-30 20:16:40 -08:00
Ricardo Quesada 191e5ee63a Merge pull request #5272 from CocosRobot/updategeneratedsubmodule_1391139446 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-30 19:43:22 -08:00
CocosRobot 3198bd85ef [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-31 03:37:29 +00:00
Ricardo Quesada e771653762 Merge pull request #5271 from ricardoquesada/glview_improvements 
GlView improvements
 2014-01-30 19:32:17 -08:00
Ricardo Quesada 5fc190b6ed new config file 2014-01-30 19:24:06 -08:00
Ricardo Quesada 2546335c83 TestCpp: compiles on linux 2014-01-30 18:15:44 -08:00
Ricardo Quesada c9dc113fa2 Fixes compilation issues on Android and Linux 2014-01-30 17:28:12 -08:00
Ricardo Quesada 5691829b72 Linux with #ifdef 2014-01-30 17:10:18 -08:00
Ricardo Quesada 7da8c84a75 Renames EGLView -> GLView 2014-01-30 16:51:43 -08:00
Ricardo Quesada 862500f99a Renames EGLView -> GLView 2014-01-30 15:40:56 -08:00
Ricardo Quesada 4cbbd8a9f5 EGLView is not longer a singleton 2014-01-30 15:11:54 -08:00
Ricardo Quesada d19a1012a4 Adds the possibility to create EAGLView with an EAGLView 2014-01-30 15:11:37 -08:00
Ricardo Quesada f1af117a1c code follows c++ guidelines 2014-01-30 15:11:11 -08:00
Ricardo Quesada 43a4c1937f Add `else` to `if` 2014-01-30 15:10:52 -08:00
bmanGH 587e03f5df removed submodule “sample/javascript/Shared”; 2014-01-30 12:34:13 +08:00
bmanGH 709ad6874f Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	samples/Javascript/Shared
 2014-01-30 10:33:02 +08:00
boyu0 3c94caa9a8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3716_refactor_physicscontact 2014-01-29 11:39:11 +08:00
Ricardo Quesada 4ed2e0d9d2 Merge branch 'develop' into glview_improvements 
Conflicts:
	CHANGELOG
	cocos/2d/platform/linux/CCApplication.cpp
	samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppMacros.h
	samples/Cpp/HelloCpp/proj.ios/AppController.mm
	samples/Cpp/HelloCpp/proj.mac/main.cpp
	samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
	samples/Cpp/SimpleGame/proj.ios/AppController.mm
	samples/Cpp/SimpleGame/proj.mac/main.cpp
	samples/Cpp/TestCpp/Classes/AppDelegate.h
	samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
	samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
	samples/Javascript/CocosDragonJS/proj.mac/main.cpp
	samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
	samples/Javascript/CrystalCraze/proj.ios/AppController.mm
	samples/Javascript/CrystalCraze/proj.mac/main.cpp
	samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
	samples/Javascript/MoonWarriors/proj.ios/AppController.mm
	samples/Javascript/MoonWarriors/proj.mac/main.cpp
	samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
	samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
	samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	samples/Lua/HelloLua/proj.ios/AppController.mm
	samples/Lua/HelloLua/proj.mac/main.cpp
 2014-01-28 11:32:25 -08:00
James Chen 1c0eb3198d Update CHANGELOG [ci skip] 2014-01-28 17:36:07 +08:00
minggo 5bdf6e04e2 Merge pull request #5267 from dumganhar/iss3828-move-samples 
issue #3828: Remove samples other than testcpp/testjavascript/testlua
 2014-01-28 01:28:29 -08:00
James Chen c7bbd99b73 issue #3828: Updates the path of java library reference. 2014-01-28 17:16:01 +08:00
James Chen c0746f40f9 issue #3828: Removes unused link folder. 2014-01-28 17:13:02 +08:00
boyu0 a5863aafb3 closed #3716: edit lua support 2014-01-28 17:06:37 +08:00
James Chen 41e261509b Update CHANGELOG [ci skip] 2014-01-28 16:33:01 +08:00
James Chen 3cf052c353 Update AUTHORS [ci skip] 2014-01-28 16:31:59 +08:00
James Chen 6a3e9d7c13 Merge pull request #5222 from martell/dutch3 
closed #3879: Added Dutch Language support for 3.x branch.
 2014-01-28 00:30:53 -08:00
James Chen 3f8f36df68 issue #3828: Updates travis script. 2014-01-28 16:23:16 +08:00
James Chen 6d491e66cf issue #3828: Updates travis-scripts/run-script.sh 2014-01-28 16:11:54 +08:00
James Chen 5e4779aef2 issue #3828: Updates TestJavascript.vcxproj. 2014-01-28 16:09:36 +08:00
James Chen 6988d48d08 issue #3828: Updates win32 projects. 2014-01-28 15:49:23 +08:00
James Chen a00b4a7c49 issue #3828: Updates JS-Test. 2014-01-28 15:38:07 +08:00
James Chen ffd8970996 issue #3828: Updates android build. 2014-01-28 15:33:23 +08:00
James Chen ebe22aaeec issue #3828: Fix a mistake in android-build.py. 2014-01-28 15:17:34 +08:00
James Chen 5d67d53393 issue #3828: Updates android build. 2014-01-28 15:14:27 +08:00
James Chen 8c9b4f27c6 issue #3828: Removes unused files generated by eclipse. 2014-01-28 15:14:27 +08:00
James Chen f6fa26d251 issue #3828: Updates CMakeLists.txt of testlua. 2014-01-27 23:10:11 -08:00
boyu0 1917ffe8b9 issue #3716: refactor physics contact 2014-01-28 14:59:34 +08:00
James Chen c2f1fbc4c1 issue #3828: Updates CMakeLists.txt. Removes unused CMakeLists.txt. 2014-01-28 14:52:47 +08:00
boyu0 9cf659bb0a Merge branch 'physics_event' of https://github.com/edwardzhou/cocos2d-x into iss3716_refactor_physicscontact 
Conflicts:
	cocos/physics/CCPhysicsContact.h
 2014-01-28 14:35:29 +08:00
James Chen d1d447b52e issue #3828: Updates iOS & Mac projects. And update JS-Tests. 2014-01-28 12:55:06 +08:00
James Chen 3592873e2f issue #3828: Moves submodule of JStest. 2014-01-28 11:40:27 +08:00
James Chen bc618ee424 issue #3828: Renames `TestXxx` to `test-xxx` for samples. 2014-01-28 11:34:12 +08:00
Ricardo Quesada 20346499ab Continue with the refactoring 2014-01-27 19:16:09 -08:00
James Chen e80a0b2848 issue #3828: Updates CMakeLists.txt. Removes HelloCpp/ HelloLua. 2014-01-28 11:14:16 +08:00
James Chen 5b1cea1f59 issue #3828: Moves JS-tests submodule to samples/TestJavascript/tests. 2014-01-28 10:51:01 +08:00