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

18480 Commits

Author SHA1 Message Date
James Chen cb2f48c1e0 Merge pull request #6193 from shujunqiao/autotest-mac 
not excute android autotest now.[ci skip]
 2014-04-09 16:40:05 +08:00
Anton Sokolchenko 87015ae888 2026:72: Result of 'malloc' is incompatible with type 'unsigned char *' 
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
 2014-04-09 11:37:56 +03:00
James Chen 9bd3be1d03 Merge pull request #6186 from samuele3hu/develop_new_label 
close #4721:clone for EventListeners of lua didn't clone the related property and add more EventDispatcher test cases
 2014-04-09 16:34:37 +08:00
shujunqiao 71bc948369 not excute android autotest now. 2014-04-09 16:30:08 +08:00
samuele3hu b6579aa322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-09 16:25:44 +08:00
James Chen 804c436433 Merge pull request #6192 from CocosRobot/update_cocosfiles_1397030961 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-04-09 16:23:43 +08:00
samuele3hu 7de6552f54 Update the NewEventDispatcherTest 2014-04-09 16:22:03 +08:00
CocosRobot e272c66932 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-09 08:09:22 +00:00
James Chen 83eed34537 Merge pull request #6191 from CocosRobot/update_cocosfiles_1397030339 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-04-09 15:59:35 +08:00
CocosRobot 2a32a7a149 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-09 07:59:00 +00:00
James Chen 10b06c6494 Merge pull request #6190 from dumganhar/develop 
Updates bindings-generator to the latest version.
 2014-04-09 15:45:01 +08:00
James Chen 82333e357e Updates bindings-generator to the latest version. 2014-04-09 15:44:07 +08:00
James Chen d71483632f Merge pull request #6187 from Dhilan007/develop_activity 
closed #4659:Remove the usage of OpenSL
 2014-04-09 15:39:06 +08:00
James Chen ac98dc7203 Update CHANGELOG [ci skip] 2014-04-09 15:37:02 +08:00
James Chen 13c2a2d680 Update AUTHORS [ci skip] 2014-04-09 15:29:32 +08:00
James Chen 39cca5012c Merge pull request #6188 from Mazyod/develop-cocos2dx 
[FIX]: HTTPClient should not report 2xx status codes as errors!
 2014-04-09 15:27:52 +08:00
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
Mazyad Alabduljaleel 1928a0cb07 = [FIX]: HTTPClient should not report 2xx status codes as errors! 2014-04-09 11:07:51 +04:00
Dhilan007 d310d8d099 closed #4659:Remove the usage of OpenSL 2014-04-09 14:57:07 +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
samuele3hu 1c124f52ad Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-09 14:29:04 +08:00
samuele3hu dbd01051d8 close #4721:clone for EventListeners of lua didn't clone the related property 2014-04-09 14:26:05 +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
Nick Barrios 9c2a148256 CCGLView: Remove createWithFullScreen(const std::string& viewName, Size size) overload. Use more specific createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) instead. 2014-04-08 14:02:36 -04:00
Nick Barrios 6b8d5dd090 CCGLView: Add support for specifying video mode and monitor for fullscreen window creation. 2014-04-08 13:33:24 -04: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
Huabing.Xu 7f1fb13113 closed #4629: remove unused _renderStack 2014-04-08 16:54:00 +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