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

16104 Commits

Author SHA1 Message Date
Pisces000221 49163bb774 Add LabelTTFCJKWrappingTest 2014-02-08 17:15:57 +08:00
Pisces000221 1170943cf8 Add LabelTTFCJKWrappingTest 2014-02-08 17:14:38 +08:00
Pisces000221 ae8057b933 Added ischinese_unicode function 2014-02-08 14:07:18 +08:00
James Chen d1a0dd395c Merge pull request #5300 from dumganhar/iss3900-sp-v27 
closed #3900: Upgrades spidermonkey to Firefox v27.
 2014-02-08 14:04:53 +08:00
James Chen 4d60b17a59 Merge pull request #5298 from heliclei/develop 
[jenkins]To add ios build support:fix xcodebuild stackoverflow, add shared build schemes
 2014-02-08 14:04:28 +08:00
James Chen a75004398d issue #3900: Updates cocos2d-console to support spidermonkey v27. 2014-02-08 13:48:38 +08:00
James Chen e7bc7c10e1 issue #3900: Updates bindings-generator. 2014-02-08 10:54:18 +08:00
James Chen bca9bba8c5 A typo fix: GL::VERTEX_ATTRIB_FLAT_NONE -> GL::VERTEX_ATTRIB_FLAG_NONE. 2014-02-08 10:41:02 +08:00
James Chen 5163f1f78d issue #3900: Updates debugger codes to Firefox v27. 'step into' works now. congratulations! ;) 2014-02-08 10:35:03 +08:00
James Chen 3ff127cf92 Merge pull request #5296 from samuele3hu/developDynamic 
issue #3907:The project that lua or js template generated crash on the iOS platform
 2014-02-07 21:30:45 +08:00
James Chen bb36f99a08 Merge pull request #5297 from dumganhar/develop 
[Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2.
 2014-02-07 21:29:51 +08:00
heliclei c5542d782f fix build path 2014-02-07 21:25:34 +08:00
heliclei 78419adc81 xctool fails to init, use xcodebuild instead 2014-02-07 21:24:48 +08:00
James Chen e0e37424f0 [Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2. 2014-02-07 21:11:30 +08:00
samuele3hu 49fbfcbbe8 issue #3907:The project that lua or js template generated crash on the iOS platform 2014-02-07 18:11:26 +08:00
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
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 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