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

18351 Commits

Author SHA1 Message Date
James Chen 671832acb7 Merge pull request #6184 from shujunqiao/lua-manual-console 
[lua] add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp
 2014-04-09 15:16:27 +08:00
James Chen 0e505aee48 Merge pull request #6185 from natural-law/develop 
Add environment variable into file .bashrc on Linux.
 2014-04-09 15:11:05 +08:00
James Chen b444cd3b82 Merge pull request #6183 from natural-law/issue4703 
Solve the incorrect effect of test case : RenderTexture Test issue 937
 2014-04-09 14:55:40 +08:00
James Chen 3ba71c9595 Merge pull request #6175 from shujunqiao/cocos-console-test-package 
[ci skip]add get package size in cocos-console-test.py.
 2014-04-09 14:55:02 +08:00
zhangbin 9d5b36145b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-09 14:37:15 +08:00
zhangbin f1080c1366 Add environment variable into file .bashrc on Linux. 2014-04-09 14:33:10 +08:00
shujunqiao 2c2876698d add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp. 2014-04-09 14:20:02 +08:00
James Chen 2c7ea5e729 Update CHANGELOG [ci skip] 2014-04-09 14:10:19 +08:00
James Chen c344a1e349 Merge pull request #6182 from Dhilan007/develop_activity 
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
 2014-04-09 14:08:06 +08:00
zhangbin 43eaccca09 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4703 2014-04-09 13:47:18 +08:00
zhangbin ddffa3b120 closed #4703, Solve the incorrect effect of test case : RenderTexture test issue 937. 2014-04-09 13:40:43 +08:00
James Chen 8e428d7321 Merge pull request #6163 from heliclei/fix-autotest 
fix autotest touch hang:run test scene constructor in cocos thread
 2014-04-09 13:28:30 +08:00
James Chen d93a7e6445 Merge pull request #6177 from DarraghCoy/small_dangling_ptr_fix 
Small dangling ptr fix to EventDispatcher::removeEventListenersForTarget
 2014-04-09 13:22:24 +08:00
James Chen 5fae622209 Merge pull request #6181 from shujunqiao/console-std 
modify const char* to std::string in CCConsole.
 2014-04-09 13:21:27 +08:00
Darragh Coy 117f22d895 Tweak formatting and change spaces to tabs so indentation appears consistent on github. 2014-04-08 08:47:26 -07:00
Darragh Coy 0082900d10 Small dangling pointer tweak/fix to CCEventDispatcher 
If cleaning a target node that has a listener in the 'to be added' listeners list then ensure that listener does not have a stale reference to the node. This is a minor tweak in addition to pull request 6160 (https://github.com/cocos2d/cocos2d-x/pull/6160).
 2014-04-08 08:46:09 -07:00
Dhilan007 c378b42191 closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work 2014-04-08 21:08:20 +08:00
shujunqiao 9391906738 modify const char* to std::string in CCConsole. 2014-04-08 18:20:06 +08:00
shujunqiao 11af83dbf6 [ci skip], add get package size in cocos-console-test.py. 2014-04-08 18:02:12 +08:00
minggo 6208943cb1 Merge pull request #6168 from heliclei/fix-console-upload 
closed #4533:fix console upload hang issue
 2014-04-08 17:55:15 +08:00
minggo e2252cafe3 Merge pull request #6174 from minggo/change-to-private 
change QuadCommand::generateMaterialID() to private
 2014-04-08 17:54:36 +08:00
minggo ccbd77309d change QuadCommand::generateMaterialID() to private 2014-04-08 17:49:18 +08:00
James Chen 02507ce25f Merge pull request #6173 from lmskater/fix-git-fail-return-value 
[Jenkins][ci skip]: Modified the return value when git fails, it's used for `ci rebuild`
 2014-04-08 17:32:31 +08:00
minggo 0c2b654410 Merge pull request #6171 from minggo/iss4683-assert_not_thread_safe 
use assert because CCASSERT is not thread safe
 2014-04-08 17:16:28 +08:00
lm ca9b4a3196 [Jenkins][ci skip]: Fix return value of git fail 2014-04-08 16:35:01 +08:00
minggo b1d4821988 Merge pull request #6172 from natural-law/issue4666 
Optimize the configuration of copy resources files in templates.
 2014-04-08 16:33:37 +08:00
zhangbin 99f7ca5c40 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4666 2014-04-08 16:27:18 +08:00
zhangbin 12fb27b01e closed #4666, Update the build configuration files in template & update the reference of submodule cocos2d-console. 2014-04-08 16:23:12 +08:00
James Chen 87a3b7e6cb Update AUTHORS [ci skip] 2014-04-08 15:50:26 +08:00
James Chen e1f2b71429 Merge pull request #6161 from DarraghCoy/check_node_not_running_when_destroyed 
Adding extra CCNode verification in Node's destructor
 2014-04-08 15:49:22 +08:00
James Chen 0db1bbdf68 Merge pull request #6167 from shujunqiao/testcpp-shader 
delete ShaderFail sample in ShaderTest.cpp. It's needed for `autotest`.
 2014-04-08 15:47:01 +08:00
James Chen 2d3cb82816 Update CHANGELOG [ci skip] 2014-04-08 15:45:18 +08:00
James Chen 2703740acd Update AUTHORS [ci skip] 2014-04-08 15:43:38 +08:00
James Chen 28ebec46dc Merge pull request #6151 from mgcL/ScriptHandlerMgr-memory-free 
add destroyInstance for ScriptHandlerMgr
 2014-04-08 15:41:18 +08:00
James Chen b0c0d1e82b Merge pull request #6165 from natural-law/develop 
Update the reference of submodule plugin-x
 2014-04-08 15:37:24 +08:00
James Chen 5df765ef0c Merge pull request #6169 from dumganhar/iss4710-eventdispatcher-crash 
closed #4710: [win32] Crash in EventDispatcher if game starts up with mouse moving frequently
 2014-04-08 15:31:52 +08:00
James Chen ec6714cc82 Merge pull request #6170 from dumganhar/iss4711-fileexist-win32 
closed #4711: [win32] Passing empty string to FileUtils::isFileExist may also return true
 2014-04-08 15:31:17 +08:00
James Chen e04b820cfc closed #4711: [win32] Passing empty string to FileUtils::isFileExist may also return true 2014-04-08 15:24:47 +08:00
James Chen 8f451d48a1 issue #4710: Fixed wrong indention. 2014-04-08 15:11:04 +08:00
James Chen 49bba30409 closed #4710: [win32] Crash in EventDispatcher if game starts up with mouse moving frequently 2014-04-08 15:08:34 +08:00
minggo e28093ee1a closed #4683: use assert because CCASSERT is not thread safe 2014-04-08 14:53:57 +08:00
heliclei 4e1284bd45 closed #4533:fix console upload hang issue 2014-04-08 14:52:53 +08:00
shujunqiao fb777b1a1d [ci skip], delete ShaderFail sample in ShaderTest.cpp. 2014-04-08 14:52:17 +08:00
shujunqiao fae742c0b8 modify ShaderTest.cpp not crah to autotest. 2014-04-08 14:32:25 +08:00
zhangbin a2e4aeb857 Update the reference of submodule plugin-x 2014-04-08 14:31:21 +08:00
James Chen 0834c07fa3 Update CHANGELOG [ci skip] 2014-04-08 11:37:00 +08:00
James Chen ecf784646d Update AUTHORS [ci skip] 2014-04-08 11:34:01 +08:00
heliclei 798708f775 fix autotest touch hang:run test scene constructor in cocos thread 2014-04-08 11:29:42 +08:00
James Chen c2b8557efb Merge pull request #6162 from dumganhar/pull/6160 
Fixed a potential crash in EventDispatcher, based on PR #6160
 2014-04-08 11:25:59 +08:00
James Chen 546db2de4a Unregistered listener when it's removed from _toAddedListeners. 2014-04-08 11:17:38 +08:00