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

10142 Commits

Author SHA1 Message Date
samuele3hu f03c96d673 Merge branch 'develop' of https://github.com/samuele3hu/cocos2d-x into execDev 2013-07-01 15:34:27 +08:00
samuele3hu 60ff2f7472 Merge pull request #3 from cocos2d/develop 
sync with upstream (cocos2d/cocos2d-x)
 2013-07-01 00:33:39 -07:00
samuele3hu 3e3548db77 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-01 15:05:04 +08:00
samuele3hu fe8e30c3e0 issue #2243:Add a uniform fund in ScriptEngineProtocol 2013-07-01 15:04:14 +08:00
James Chen e20356a32d Merge pull request #3037 from boyu0/refactor_2339 
change the useage text
 2013-06-30 23:37:12 -07:00
James Chen c872666650 Merge pull request #3025 from boyu0/refactor_2339 
closed #2339: Refactor checkParams() in create_project.py, use OptionParser to parse the params
 2013-06-30 23:19:08 -07:00
boyu0 1156ae4f60 change the useage text 2013-07-01 14:10:14 +08:00
minggo 9697c5af9a [ci ignore] 2013-07-01 10:14:12 +08:00
minggo 73f3f43252 Merge pull request #3035 from Squallium/develop 
Added ccFPSImages entity as linked resource
 2013-06-30 19:12:17 -07:00
Squallium c770a4bdc8 Added ccFPSImages entity as linked resource 2013-06-30 22:00:29 +02:00
boyu0 2625847a74 closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-07-01 01:04:01 +08:00
James Chen 2c08f25c47 Merge pull request #3032 from dumganhar/iss2342-build-errors 
closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
 2013-06-29 00:05:31 -07:00
James Chen b76798505c closed #2342: Fixing indention. 2013-06-29 15:04:43 +08:00
James Chen bb2f19535b closed #2342: Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled. 2013-06-29 15:01:50 +08:00
Justin Hawkwood 37ca32e75c Corrected code to use textDefinition properties 2013-06-29 15:00:17 +08:00
James Chen 0f048e23bf Merge pull request #3031 from CocosRobot/updategeneratedsubmodule_1372480518 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-28 22:38:34 -07:00
CocosRobot bc6acb6411 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-29 04:35:21 +00:00
James Chen 7326d54348 Merge pull request #3030 from dumganhar/ricardoquesada-js_mac 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3026
 2013-06-28 21:29:59 -07:00
James Chen 9bac943040 issue #2325: [MAC] Removing libxml2.dylib, adding libcurl.dylib and updating dependence for TestCpp. 2013-06-29 12:25:44 +08:00
James Chen 5bc8706ece Merge branch 'develop' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-js_mac 2013-06-29 12:12:36 +08:00
James Chen 7dd6218344 issue #2325: [MAC] Setting the windows size to 800x450 which is the same as HTML5-tests. 2013-06-29 12:12:26 +08:00
James Chen d454bb06c7 Merge pull request #24 from ricardoquesada/js_mac 
Merge js_mac branch of ricardoquesada's repo.
 2013-06-28 21:10:45 -07:00
James Chen e20de6b6aa Reverting submodules. 2013-06-29 11:45:16 +08:00
James Chen e2b9863bf7 issue #2325: [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT. 2013-06-29 11:44:14 +08:00
Ricardo Quesada b846a3060e cocos2d-x in Mac: 
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
 2013-06-28 19:02:10 -07:00
Ricardo Quesada 41a6a51208 Merge remote-tracking branch 'cocos2d/develop' into js_mac 2013-06-28 13:40:15 -07:00
James Chen 1e45c121df Merge pull request #3027 from natural-law/develop 
Adjust the sample projects in plugin
 2013-06-28 00:55:31 -07:00
zhangbin c790d8de9b issue #2336, Modify the compiler of plugins project on ios. 2013-06-28 15:21:39 +08:00
Ricardo Quesada 6e1af21c0e Uses new cocos2d-console 2013-06-27 22:19:33 -07:00
Ricardo Quesada 9b1684b666 Merge remote-tracking branch 'cocos2d/develop' into js_mac 2013-06-27 22:15:03 -07:00
Ricardo Quesada 96a50bf736 updates cocos2d-mac workspace 2013-06-27 22:14:26 -07:00
zhangbin a72207bf95 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-28 11:48:54 +08:00
zhangbin 71f9023cc4 issue #2336, Remove the unused sample projects in plugin. 2013-06-28 11:48:24 +08:00
zhangbin 530afbb9d9 issue #2336, Add a sample project with all plugins. 2013-06-28 11:46:39 +08:00
boyu0 2cccadeaab closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-06-28 10:12:55 +08:00
Ricardo Quesada b0de6d0e8c Project fixes 
In debug: optimization is NONE, and other small fixes for Mac
 2013-06-27 18:14:24 -07:00
James Chen 2514c99176 Merge pull request #3020 from dumganhar/iss2340-spidermonkey_v22 
issue #2340: Upgrading SpiderMonekey to Firefox v22
 2013-06-27 18:13:17 -07:00
Ricardo Quesada b1be161e5d updates to SpiderMonkey v22 2013-06-27 17:34:53 -07:00
Ricardo Quesada 5bb256e837 Merge branch 'develop' into js_mac 2013-06-27 10:48:58 -07:00
James Chen 0f2719fa06 issue #2340: Checking jsc( js compiled) files first. 2013-06-27 17:20:02 +08:00
James Chen 5ce150a10c issue #2340: Updating submodule of cocos2d-console. 2013-06-27 17:19:22 +08:00
James Chen 2a688f67c9 closed #2340: Updating spidermonkey library for iOS. 2013-06-27 16:23:00 +08:00
James Chen 89ccd9240e issue #2340: Using 800x450 as design resolution for TestJavascript. 2013-06-27 16:10:42 +08:00
James Chen 9781e10476 closed #2340: Upgrading SpiderMonkey to Firefox v22. 2013-06-27 16:10:38 +08:00
Ricardo Quesada ccd9cb486c JS Tests compiles and links in Mac 
...but it doesn't work yet due to a bug with the touch events :-(
 2013-06-27 00:58:46 -07:00
minggo 4dd2b07a32 Merge pull request #3019 from Squallium/develop 
removed libxml2 dependence from libcocos2d
 2013-06-27 00:13:48 -07:00
minggo daac52d972 Merge pull request #3018 from boyu0/bug2327 
Fixed Bug#2327:CCNode::isScheduled() is not implemented
 2013-06-26 23:59:04 -07:00
Ricardo Quesada 398c6593f0 JS Tests: Almost working on Mac 2013-06-26 23:45:08 -07:00
Squallium f53e4f692f removed libxml2 dependence from libcocos2d 2013-06-27 08:30:55 +02:00
boyu0 9d227f6f1f Fixed Bug#2327:CCNode::isScheduled() is not implemented 
Add CCScheduler::isScheduledForTarget() method
 2013-06-27 12:05:47 +08:00