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

12060 Commits

Author SHA1 Message Date
CaiWenzhi 4843046d17 Merge GUI to develop step 1; 2013-09-16 17:12:15 +08:00
James Chen f50722de67 Merge pull request #3616 from CocosRobot/updategeneratedsubmodule_1379321876 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-16 02:05:38 -07:00
samuele3hu cf5e04ad63 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 
Conflicts:
	samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
 2013-09-16 16:58:30 +08:00
CocosRobot f607d6d248 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 08:58:07 +00:00
samuele3hu b563c52e10 Issue:Resolve the carsh of the simple game test sample and modify the main.cpps in the template for the android projects 2013-09-16 16:55:16 +08:00
James Chen 0121d3033b Merge pull request #3614 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: [EventDispatcher] Comment fixes. Adding a new test. Event priority fix, the lower value, the higher priority.
 2013-09-16 01:52:16 -07:00
James Chen 501ed32973 issue #2087: [dispatcher] Fix of the listener of specified type is null. 2013-09-16 16:40:47 +08:00
James Chen abf834731a issue #2087: [dispatcher] Making Node::updateEventPriorityIndex to inline function. 2013-09-16 16:39:59 +08:00
boyu0 8d7d653031 closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it doesn't copy the previous unpacked data into new memory when malloced memory is not enough. 2013-09-16 16:22:52 +08:00
James Chen d8fb3aa731 issue #2087: [dispatcher] Reverts: HelloCpp. 2013-09-16 16:22:22 +08:00
James Chen 37dd173644 issue #2087: [dispatcher] Fixing errors in test. 2013-09-16 16:03:39 +08:00
James Chen 8e668cd837 issue #2087: [dispatcher] Rename FixedPriorityChangedTest to FixedPriorityTest. 2013-09-16 16:02:48 +08:00
James Chen 46e1291ce1 issue #2087: [dispatcher] Enabled touch for Box2dTestBed, removed touch listener before re-adding. 2013-09-16 15:55:03 +08:00
James Chen 990b801b11 issue #2087: [dispatcher] Reverts: glGetError --> CHECK_GL_ERROR_DEBUG. 2013-09-16 15:54:02 +08:00
James Chen 60645a6702 issue #2087: [dispatcher] Changes event priority. The lower value is, the higher priority will be gotten. 2013-09-16 15:45:56 +08:00
James Chen 7921b45090 issue #2087: [dispatcher] New Dispatcher Test: Fixed priority. Adding include. 2013-09-16 15:43:48 +08:00
James Chen b3cade3be0 issue #2087: [dispatcher] New Dispatcher Test: Fixed priority. 2013-09-16 15:43:20 +08:00
2youyou2 a08ce3df73 change singleton class get method to getInstance 2013-09-16 15:16:05 +08:00
2youyou2 16c70363dd standardizate code 2013-09-16 14:56:59 +08:00
minggo 27381fc83f Merge pull request #3562 from bassarisse/develop 
Win32 icons on template
 2013-09-15 23:44:11 -07:00
James Chen 16b13ce522 issue #2087: [dispatcher] Updating some comments for new event dispatcher. 2013-09-16 14:43:57 +08:00
James Chen 050de08b8f issue #2087: [dispatcher] Node::getEventPriority is a private method now. 2013-09-16 14:43:07 +08:00
2youyou2 302555e711 standardizate code 2013-09-16 14:13:55 +08:00
minggo 5d591b061d Merge pull request #3612 from CocosRobot/updategeneratedsubmodule_1379311527 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-15 23:07:05 -07:00
CocosRobot 32abea024d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 06:05:30 +00:00
minggo 2a315e53b8 Merge pull request #3402 from j4m3z0r/develop-emscripten 
Port my variant of font-rendering over to dev branch -- adds correct ali...
 2013-09-15 22:52:33 -07:00
minggo f47ce3f5bc Merge pull request #3607 from samuele3hu/developTest 
Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions
 2013-09-15 22:45:32 -07:00
minggo 5c398ea1fd Merge pull request #3610 from chengstory/#4685 
Rename
 2013-09-15 22:41:28 -07:00
2youyou2 d8b64b8645 standardize code 2013-09-16 12:21:18 +08:00
zhangcheng d4496ac02d 1. replace "CCFileUtils" to "FileUtils". 2013-09-16 12:16:11 +08:00
2youyou2 b7b079c1c6 standardize code 2013-09-16 12:02:57 +08:00
2youyou2 c767ff355c delete extensions/CCArmature 2013-09-16 11:46:08 +08:00
James Chen e31c4f008d Merge pull request #3597 from chengstory/#4560 
SceneEditorTest He version
 2013-09-15 20:23:05 -07:00
James Chen 79da678acb Merge pull request #3608 from CocosRobot/updategeneratedsubmodule_1379301556 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-15 20:21:06 -07:00
CocosRobot f01fb83e26 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 03:19:19 +00:00
minggo e4f8929898 Merge pull request #3606 from dabingnn/issue_2808_glfw_bug_enhancement 
Issue 2808 glfw bug enhancement
 2013-09-15 20:18:02 -07:00
minggo 81a26d44f6 Merge pull request #3596 from dumganhar/new-event-dispatcher-rename 
[New Event Dispatcher] Using rename registerEventListener to addEventListener, unregisterEventListener to removeEventListener.
 2013-09-15 20:13:51 -07:00
samuele3hu ddf28deaad Delete some end lines 2013-09-16 10:58:02 +08:00
samuele3hu faed7a3d36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-16 10:54:55 +08:00
samuele3hu a3a915ead2 Reset the addChild functions of SpriteBatchNode and add some lua deprecated functions 2013-09-16 10:54:12 +08:00
James Chen 3b798317d4 [dispatcher] Some performance improves. Using std::for_each and range loop, and removing unneeded std::map::find. 2013-09-16 10:44:24 +08:00
minggo 37cfc855b9 Merge pull request #3581 from dabingnn/new_shader_test 
issue #2782: add shader test sprite and close issue
 2013-09-15 19:36:51 -07:00
Huabing.Xu 20fde2bcde issue #2808:glfw linux scripts 2013-09-16 10:11:46 +08:00
minggo 2e6901906d Merge pull request #3602 from samuele3hu/Bridge 
issue:Add LuaJavaBridge
 2013-09-15 19:10:56 -07:00
samuele3hu 6efe3e7eeb issue #2794:Add a newline 2013-09-16 10:04:58 +08:00
2youyou2 ac8261bcd5 update Android.mk 2013-09-16 09:56:25 +08:00
James Chen 3e01dd5edf [dispatcher] Using std::vector instead of std::list for EventListenerItem container. 2013-09-15 21:58:54 +08:00
James Chen 9891077bba [dispatcher] Adding 'emit touch event' menu item. 2013-09-15 21:56:02 +08:00
2youyou2 77db15bd0d change variables name 2013-09-15 20:24:25 +08:00
2youyou2 db4813f161 1.remove CC from class name 
2.fix async loading
 2013-09-15 19:08:45 +08:00