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

16072 Commits

Author SHA1 Message Date
James Chen 05c79b54ac issue #3900: Typedef jschar to wchar_t to fix linking errors on windows. 2014-02-07 17:30:02 +08:00
James Chen 6cc22ac0b0 issue #3900: Fixes wrong include. 2014-02-07 17:26:28 +08:00
James Chen f0418a17d3 issue #3900: Include fix. jsapi.h and jsfriendapi.h should be included before cocos2d.h, otherwise it will cause char16_t redefinition on windows. 2014-02-07 17:04:44 +08:00
James Chen c25787e575 issue #3900: Removes the definition of DEBUG. Windows uses _DEBUG . 2014-02-07 16:01:57 +08:00
James Chen 5714552458 issue #3900: mozjs-27.0.lib -> mozjs-27.lib for windows. 2014-02-07 15:29:44 +08:00
James Chen 4c2da5d286 issue #3900: mozjs-25 -> mozjs-27 for windows. 2014-02-07 15:16:14 +08:00
James Chen 558fb7e420 issue #3900: Adds spidermonkey v27 library for windows. 2014-02-07 15:13:14 +08:00
James Chen 20ab9daa3a issue #3900: Adds spidermonkey v27 library for Android. 2014-02-07 14:21:41 +08:00
James Chen 90c4a63677 issue #3900: Adds spidermonkey v27 library for iOS and Mac. 2014-02-07 14:05:03 +08:00
James Chen 03292f44e2 issue #3900: TestJavascript could run on Mac platform with spidermonkey v27. 2014-02-07 13:09:38 +08:00
James Chen e4366e3e00 issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false. 2014-02-07 11:16:13 +08:00
James Chen 408c3fdda9 issue #3900: JSBool -> bool, JS_TRUE -> true, JS_FALSE -> false. 2014-02-07 11:15:05 +08:00
James Chen 5eda53be60 Merge pull request #5285 from dumganhar/unused 
Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate).
 2014-02-02 05:04:37 -08:00
James Chen 3026e6d5ca Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate). 2014-02-02 20:46:15 +08:00
James Chen 667cd04ee6 Update run-script.sh, samples -> tests. 2014-02-01 12:33:15 +08:00
James Chen dbfc2f722b Merge pull request #5282 from dumganhar/iss3828-ios-simulator-run-fix 
issue #3828: Icon resources should be packaged.
 2014-01-31 20:22:58 -08:00
James Chen bed6777673 issue #3828: Don't package Test_info.plist for `TestJavascript Mac` target. 2014-02-01 12:20:38 +08:00
James Chen a4e7d2b658 issue #3828: Icon resources should be packaged. Only XXX_info.plist should not be packaged. If it was packaged, it would cause problem of running on simulator. 2014-02-01 12:18:22 +08:00
James Chen 5d7a481995 Merge pull request #5281 from dumganhar/iss3828-ios-simulator-run-fix 
issue #3828: Don't copy resources in test-xxx/proj.ios(mac)/xxx.png(.plist) in project configuration. This will fix the issue that application installed to iOS simulator can't be launched.
 2014-01-31 19:58:10 -08:00
James Chen d0a44cd57e issue #3828: Don't copy resources in test-xxx/proj.ios(mac)/xxx.png(.plist) in project configuration. This will fix the issue that application installed to iOS simulator can't be launched. 2014-02-01 11:55:46 +08:00
Ricardo Quesada ae2b988c16 Merge pull request #5280 from ricardoquesada/tests_renamed 
new modules
 2014-01-31 16:07:50 -08:00
Ricardo Quesada 6ce6806544 new modules 2014-01-31 16:07:09 -08:00
Ricardo Quesada 009808673b Merge pull request #5278 from ricardoquesada/tests_renamed 
samples renamed to tests
 2014-01-31 14:17:01 -08:00
Ricardo Quesada e77d22a58f samples -> tests 2014-01-31 14:09:28 -08:00
Ricardo Quesada 5fde81d1e2 cocos2d-samples -> cocos2d-tests 2014-01-31 11:13:48 -08:00
Ricardo Quesada b3df05a74b Merge pull request #5277 from ricardoquesada/windows_project 
Updates Windows project
 2014-01-30 21:31:50 -08:00
Ricardo Quesada 28a6626852 Updates Windows project 2014-01-30 21:30:51 -08:00
Ricardo Quesada d1a81b6178 Merge pull request #5276 from ricardoquesada/samples_removed 
removed projects files from old samples folder
 2014-01-30 21:24:27 -08:00
Ricardo Quesada d2b37e05cb removed projects files from old samples folder 2014-01-30 21:23:38 -08:00
Ricardo Quesada 5d2f259219 Merge pull request #5275 from ricardoquesada/compiles_on_win 
Compiles on win
 2014-01-30 21:18:41 -08:00
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
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