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

13011 Commits

Author SHA1 Message Date
minggo c9d28276d3 Merge pull request #3915 from Dhilan007/0002 
[ci skip]fix compile fail on vs2012.
 2013-10-10 03:25:38 -07:00
minggo 16d0fe313b issue #2905: modify makefile to refer to correct path 2013-10-10 18:22:51 +08:00
James Chen 590d8d50e0 Merge pull request #3914 from Dhilan007/00001 
fix copy resource error.
 2013-10-10 03:09:20 -07:00
LinWenhai 83ab7128e7 fix incomplete copy 2013-10-10 18:07:36 +08:00
LinWenhai 8c6a481588 fix incomplete copy 2013-10-10 18:06:59 +08:00
LinWenhai f861d6d2fc fix incomplete copy 2013-10-10 18:03:15 +08:00
minggo 3f010e78f8 issue #2905: modify makefile to refer to correct path 2013-10-10 18:03:03 +08:00
LinWenhai 312d761390 Update build_native.cmd 2013-10-10 18:01:45 +08:00
minggo 6e62be5443 issue #2905: modify makefile to include correct header files 2013-10-10 17:39:53 +08:00
James Chen 643e8fa23e Merge pull request #3912 from dumganhar/iss2823-jsb-remote-debugger-sp23 
issue #2823: [JSB] Support remote debugging JSB project by FireFox.
 2013-10-10 02:17:31 -07:00
James Chen 0d60432d95 issue #2823: Removing unused codes of debugger. 2013-10-10 17:17:48 +08:00
Dhilan007 5ea5c394e7 fix compile fail on vs2012. 2013-10-10 17:17:10 +08:00
Dhilan007 e181f7a4d2 fix copy resource error. 2013-10-10 17:10:37 +08:00
James Chen 5b3cbf9a29 issue #2823: Updating build_native.sh for AssetsMangerTest. 2013-10-10 17:07:13 +08:00
minggo 9cf7d48d62 include correct path in cocos2dx.ini to generate audio lua binding 2013-10-10 17:04:36 +08:00
minggo 7b7aabf2de include correct path in cocos2dx.ini to generate audio binding 2013-10-10 16:54:05 +08:00
James Chen 732233336b issue #2823: Updating build_native.sh for JSB projects. Copy all resources in scripting/javascript/bindings/js/* 2013-10-10 16:47:19 +08:00
James Chen 02f724cd23 issue #2823: Enabling JSB debugger in debug mode. Removing the definition of JSB_ENABLE_DEBUGGER. 2013-10-10 16:18:12 +08:00
James Chen 8afef57679 issue #2823: Adding README.md. 2013-10-10 16:18:12 +08:00
James Chen 5b190b62f6 issue #2823: Removing loading web console.js in jsb_debugger.js. 2013-10-10 16:18:12 +08:00
James Chen cff1c46f20 issue #2823: Reverting ScriptingCore.cpp for Spidermonkey v23. 2013-10-10 16:18:12 +08:00
James Chen 3f967e5e8d issue #2823: Removing some codes for debugging in ScriptingCore.h/.cpp. 2013-10-10 16:18:12 +08:00
James Chen 154061319c issue #2823: Removing unused js files in 'js/debugger' folder. 2013-10-10 16:18:12 +08:00
James Chen 5f4b0d9a0e issue #2823: Removing unused debugger codes in MoonWarriors/Classes/AppDelegate.cpp. 2013-10-10 16:18:11 +08:00
James Chen 9342b084c5 issue #2823: Reverting CCFileUtils.cpp. 2013-10-10 16:18:11 +08:00
James Chen d8a4a7a595 issue #2823: Updating webconsole.js and loading webconsole.js in jsb_debugger.js.[ Console can't work now, TO BE DONE ] 2013-10-10 16:18:11 +08:00
James Chen d25cbcdbd9 issue #2823: Removing unused conversion. 2013-10-10 16:18:11 +08:00
James Chen 6b455463fa issue #2823: Removing some log outputs in transport.js. 2013-10-10 16:18:11 +08:00
James Chen 7328ae89a5 issue #2823: Adding XPCInspector support in debugger/main.js. 2013-10-10 16:18:11 +08:00
James Chen 7a6861c800 issue #2823: Reverting script.js. 2013-10-10 16:18:11 +08:00
James Chen 2e9644446a issue #2823: Renaming '_lockVM' to '_enterNestedEventLoop', '_unlockVM' to '_exitNestedEventLoop'. 2013-10-10 16:18:10 +08:00
James Chen adbb3585ac issue #2823: _lockVM take no arguments now. 2013-10-10 16:18:10 +08:00
James Chen a919fd5de1 issue #2823: Fix socket errors on WINDOWS. 2013-10-10 16:18:10 +08:00
James Chen 0ad7a9fd4b issue #2823: minor fix and logs. 2013-10-10 16:18:10 +08:00
James Chen 43b4269c11 issue #2823: Removing unused file 'main.debug.js'. 2013-10-10 16:18:09 +08:00
James Chen 6185f6fac2 issue #2823: Removing unused codes in jsb_debugger.js. 2013-10-10 16:18:09 +08:00
James Chen e69aebc34f issue #2823: Fixing mess code when modifying the value of variables which contains utf8 letters. 2013-10-10 16:18:09 +08:00
James Chen ef4fcb5e56 issue #2823: Moving 'utf16to8' to DevToolsUtils.js and adding 'utf8to16' function. 2013-10-10 16:18:09 +08:00
James Chen 7e82ab14a0 issue #2823: debugger loading js source with utf8 is ok. 2013-10-10 16:18:09 +08:00
James Chen b5d02d8cca issue #2823: firefox debugger step ok. 2013-10-10 16:18:09 +08:00
James Chen b5679cbc3a issue #2823: load js file in firefox. 2013-10-10 16:18:08 +08:00
James Chen d033411bbe issue #2823: comment some test codes. 2013-10-10 16:18:08 +08:00
James Chen c381e4ce50 issue #2823: firefox remote connection ok. 2013-10-10 16:18:08 +08:00
James Chen 2e07b0736b Update .gitmodules, fix wrong reference of auto-generated. 2013-10-10 16:13:37 +08:00
minggo 866906fd58 issue #2905:modify project settings to include correct audio path 2013-10-10 15:40:06 +08:00
minggo 28b06ecde0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-10 15:07:04 +08:00
James Chen 0b1079cb8b Merge pull request #3909 from CocosRobot/updategeneratedsubmodule_1381387378 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-10-09 23:48:35 -07:00
CocosRobot 56c945efe6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-10-10 06:43:01 +00:00
James Chen fa51236dee Update CHANGELOG[ci skip] 2013-10-10 14:40:30 +08:00
James Chen d1cd3ca5d1 Merge pull request #3903 from Dhilan007/di2899 
issues #2899:Fix application will crash when back to background on Andro...
 2013-10-09 23:38:39 -07:00