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

16206 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
heliclei 5a3aeee66f trim payload size to fix xcodebuild stack overflow 2014-02-07 14:57:07 +08:00
heliclei 1ef549ab4e update .gitignore 2014-02-07 14:55:26 +08:00
heliclei e081ea2dc4 add xcode shared schemes 2014-02-07 14:46:36 +08:00
James Chen 20ab9daa3a issue #3900: Adds spidermonkey v27 library for Android. 2014-02-07 14:21:41 +08:00
Ricardo Quesada e33baac396 iso almost working 2014-02-06 22:20:28 -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 6b6e254c17 Merge pull request #5294 from samuele3hu/developDynamic 
fix:Compile error of the project that js template generate on the iOS platform
 2014-02-07 13:45:10 +08:00
samuele3hu b29217ed2d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 2014-02-07 13:38:46 +08:00
James Chen 03292f44e2 issue #3900: TestJavascript could run on Mac platform with spidermonkey v27. 2014-02-07 13:09:38 +08:00
samuele3hu 4fa29862b6 fix:Compile error of the project that js template generate on the iOS platform 2014-02-07 12:05:38 +08:00
Ricardo Quesada 3ef77f5cd3 Merge pull request #5293 from samuele3hu/developDynamic 
fix:Compile error of the project that lua template generate on the iOS platform
 2014-02-06 20:04:45 -08:00
samuele3hu 445b0e49b8 fix:Compile error of the project that lua template generate on the iOS platform 2014-02-07 11:46:59 +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
Ricardo Quesada ad7b54eb0e iso almost working 100% ok 2014-02-06 18:47:45 -08:00
Ricardo Quesada cf08d0b3f9 isometric kind of working 2014-02-06 16:19:46 -08:00
Éloi Rivard 9e565a0e02 Typo fixed 2014-02-06 22:29:21 +01:00
Ricardo Quesada 02af5059bf code cleanup 2014-02-05 22:43:06 -08:00
Ricardo Quesada 314d3955b6 working!! 2014-02-05 22:36:03 -08:00
Ricardo Quesada d3aed1124a what is happening here? 2014-02-05 20:09:04 -08:00
Ricardo Quesada 3560227d09 sort of working 2014-02-05 19:51:24 -08:00
Ricardo Quesada 9a53f5a9f5 Testing a new TMX renderer 
faster
 2014-02-04 17:59:21 -08:00
Ricardo Quesada 3fff487738 Merge pull request #5290 from ricardoquesada/console_win32_fix 
log() in win32 doesn't add extra \n
 2014-02-04 09:00:27 -08:00
Ricardo Quesada 822f141748 log() in win32 doesn't add extra \n 2014-02-04 08:59:56 -08:00
Ricardo Quesada 54057c6dfb Merge pull request #5288 from ricardoquesada/template_fixes 
ios template compiles OK
 2014-02-03 11:33:20 -08:00
Ricardo Quesada 71c53ef0fd ios template compiles OK 2014-02-03 11:32:00 -08:00
Ricardo Quesada 377607d87a Merge pull request #5287 from WanderWang/develop 
fix a mistake about README
 2014-02-03 09:40:53 -08:00
WanderWang 5d10310d39 Update README.md 2014-02-03 23:26:40 +08:00
WanderWang 2608806b7b Merge pull request #1 from cocos2d/develop 
Merge from trunk
 2014-02-03 07:25:20 -08:00
Ricardo Quesada 4f4259bbad Merge pull request #5286 from maksqwe/console_fix 
fix timeout getting status of sockets in Console::loop()
 2014-02-02 14:41:49 -08:00
Maks 33a12a594e fix timeout getting status of sockets in Console::loop() 
'016000' - is octal constants, 016000 == 7168
http://msdn.microsoft.com/en-us/library/00a1awxf.aspx
 2014-02-03 00:24:58 +02: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
edba 4da6b97786 Added getPropertiesForGID that assings value instead of returning it. 2014-01-31 14:57:26 -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