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

16559 Commits

Author SHA1 Message Date
samuele3hu e436aa4022 issue #3956:Replace Object with Ref 2014-02-21 10:22:03 +08:00
samuele3hu 555ef20202 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDynamic 
Conflicts:
	cocos/scripting/lua/bindings/LuaBasicConversions.h
	cocos/scripting/lua/bindings/lua_cocos2dx_physics_manual.cpp
 2014-02-21 10:10:20 +08:00
Dhilan007 d0e640d966 remove CC prefix. 2014-02-21 09:59:43 +08:00
samuele3hu 3532665520 issue #3956:Change tolua_fix.c to tolua_fix.cpp and modify the toluafix_pushusertype_ccobject function to get real type of object 2014-02-21 09:45:33 +08:00
Dhilan007 54f48b23e6 LabelBMFont re-implemented as a wrapper of Label. 2014-02-20 22:33:52 +08:00
James Chen 97a6ac65d3 Merge pull request #5424 from heliclei/console-autotest 
testcpp autotest:support next, back and restart test via console
 2014-02-20 22:22:55 +08:00
James Chen 0e154a2bec Merge pull request #5425 from dumganhar/develop 
closed #2535: TouchScriptHandlerEntry will release twice lua reference
 2014-02-20 21:59:33 +08:00
James Chen 68eaa746ea closed #2535: TouchScriptHandlerEntry will release twice lua reference 2014-02-20 21:58:20 +08:00
heliclei e64a647563 testcpp autotest:support next, back and restart test via console 2014-02-20 21:49:13 +08:00
James Chen 7277046ba8 Merge pull request #5423 from dumganhar/develop 
closed #4104: Crash if invoking Array::initWithObjects()
 2014-02-20 21:45:51 +08:00
James Chen 23082c0d6c closed #4104: Crash if invoking Array::initWithObjects() 2014-02-20 21:44:40 +08:00
James Chen 30d100296a Merge pull request #5422 from dumganhar/develop 
Added virtual and override keywords to Scene::init() method
 2014-02-20 21:37:46 +08:00
James Chen 0b6858bdde Added virtual and override keywords to Scene::init() method 2014-02-20 21:37:01 +08:00
James Chen 4cb0d336be Merge pull request #5421 from CocosRobot/updategeneratedsubmodule_1392901877 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-20 21:12:38 +08:00
CocosRobot 6f2f35ab7a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 13:11:20 +00:00
James Chen abbc22b8fb Merge pull request #5420 from dumganhar/develop 
Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058
 2014-02-20 21:04:47 +08:00
James Chen b06a98b8ee Compilation error fix after merging https://github.com/cocos2d/cocos2d-x/pull/5058 2014-02-20 21:01:52 +08:00
James Chen 32383a7cfd Update CHANGELOG [ci skip] 2014-02-20 20:46:14 +08:00
James Chen 3168c87bdd Update AUTHORS [ci skip] 2014-02-20 20:45:34 +08:00
James Chen 0658355772 Merge pull request #4415 from HoGarfield/WsThreadHelper 
closed #4103: Potential crash when websocket connection closes
 2014-02-20 20:44:55 +08:00
James Chen 9d4f378116 Merge pull request #5417 from CocosRobot/update_cocosfiles_1392899613 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-20 20:35:38 +08:00
James Chen 182d67f2b6 Update AUTHORS [ci skip] 2014-02-20 20:35:25 +08:00
CocosRobot b88ade5534 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 12:33:34 +00:00
James Chen e59a14f205 Merge pull request #5058 from zhiqiangxu/develop 
ScrollView should implement ActionTweenDelegate
 2014-02-20 20:33:04 +08:00
James Chen 4016d9074f Update AUTHORS [ci skip] 2014-02-20 20:30:46 +08:00
James Chen 95143da782 Merge pull request #4990 from daltomi/debug 
closed #4102: Uses 'cbegin/cend', 'const std::string' where it's reasonable.
 2014-02-20 20:29:56 +08:00
James Chen ee0fd8ea57 Update AUTHORS [ci skip] 2014-02-20 20:25:46 +08:00
James Chen 450d30b164 Merge pull request #5040 from martell/mingwclang 
closed #3809: Added clang support for Windows
 2014-02-20 20:24:36 +08:00
James Chen 147828ac87 Update AUTHORS [ci skip] 2014-02-20 20:21:42 +08:00
James Chen be507f6fda Merge pull request #5059 from zhiqiangxu/useless_code_in_scrollview 
delete useless code in deaccelerateScrolling
 2014-02-20 20:20:28 +08:00
James Chen 36611f9770 Update CHANGELOG [ci skip] 2014-02-20 19:35:05 +08:00
James Chen a05417b5cb Update AUTHORS [ci skip] 2014-02-20 19:34:22 +08:00
James Chen 3cba9de519 Merge pull request #5415 from dumganhar/merge5232 
closed #4101: No callback is invoked when websocket connection fails
 2014-02-20 19:31:49 +08:00
James Chen e9fa65b6f4 closed #4101: No callback is invoked when websocket connection fails 2014-02-20 19:29:53 +08:00
James Chen dc6839d692 Merge commit 'refs/pull/5232/head' of git://github.com/cocos2d/cocos2d-x into merge5232 2014-02-20 19:27:17 +08:00
James Chen 334ac95017 Merge pull request #5414 from boyu0/iss4096_add_test_s3tc_bitmap_with_on_mipmap 
closed #4096: add s3tc bitmap with no mipmaps test case.
 2014-02-20 19:06:19 +08:00
boyu0 4410e70ca1 closed #4096: add s3tc bitmap with no mipmaps test case. 2014-02-20 18:27:52 +08:00
James Chen 3cfd9e9c08 Merge pull request #5412 from CocosRobot/update_cocosfiles_1392891685 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-20 18:22:02 +08:00
CocosRobot d70f9f2e7e [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 10:21:26 +00:00
James Chen f16d7652df Merge pull request #5393 from heliclei/console-autotest 
add console autotest support
 2014-02-20 17:58:21 +08:00
James Chen 787dade5b0 Merge pull request #5408 from dumganhar/iss4097-disable-script 
closed #4097: Adds a macro to disable inserting script binding relevant codes.
 2014-02-20 17:57:46 +08:00
James Chen eaecf8d738 Merge pull request #5411 from CocosRobot/updategeneratedsubmodule_1392889932 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-20 17:54:20 +08:00
CocosRobot 9e061b751a [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-20 09:52:15 +00:00
James Chen 50bdbe09b9 Merge pull request #5409 from lmskater/fix_trigger_url 
[Jenkins] fix pending url
 2014-02-20 17:29:45 +08:00
James Chen e68d7860c3 Merge pull request #5403 from samuele3hu/developEventTrigger 
close #4094: [Lua] Rename EGLView to GLView and deprecate EGLView
 2014-02-20 17:29:14 +08:00
James Chen 7970e37bf5 closed #4097: Adds missing include. 2014-02-20 17:23:22 +08:00
samuele3hu e2596bce8b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 
Conflicts:
	tools/tojs/cocos2dx.ini
	tools/tolua/cocos2dx.ini
 2014-02-20 17:20:51 +08:00
lm 98566d193f [Jenkins] fix pending url 2014-02-20 17:08:53 +08:00
James Chen b3f25a7cfb Merge pull request #5407 from CocosRobot/update_cocosfiles_1392886204 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-20 17:08:43 +08:00
James Chen b1e44a7ed6 issue #4097: Enables script bindings by default. 2014-02-20 17:02:20 +08:00