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

15997 Commits

Author SHA1 Message Date
Ricardo Quesada 20346499ab Continue with the refactoring 2014-01-27 19:16:09 -08:00
Ricardo Quesada b96c4f1ad0 Only compile iOS files on iOS 2014-01-27 16:44:10 -08:00
Ricardo Quesada 1f4ca2f0ad Works on Android 2014-01-27 13:05:58 -08:00
Ricardo Quesada 67b62224b4 restore it to platform=10 2014-01-27 12:39:24 -08:00
Ricardo Quesada 3bb74c08ca Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements 2014-01-27 10:53:12 -08:00
Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements 
Conflicts:
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	template/multi-platform-lua/Classes/AppDelegate.cpp
 2014-01-27 10:52:35 -08:00
James Chen 042ec10ffb Merge pull request #5261 from CocosRobot/updategeneratedsubmodule_1390816204 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-27 01:54:53 -08:00
CocosRobot a2fc1cf970 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-27 09:50:08 +00:00
James Chen e83ddec7b8 Merge pull request #5258 from lmskater/create-module-project 
[Jenkins] add create-template-project.py
 2014-01-27 01:42:07 -08:00
James Chen 94b26536ff Merge pull request #5260 from samuele3hu/developBug 
fix:Add lua binding for ‘Component’
 2014-01-27 01:41:26 -08:00
James Chen b736da52f7 Merge pull request #5259 from Dhilan007/develop_crash 
fix miss websocket lib for HelloLua on vs.
 2014-01-27 01:40:44 -08:00
lm f6e4f4b44b [Jenkins] rename language to languages 2014-01-27 17:22:24 +08:00
lm 607a060256 [Jenkins] rename module to template 2014-01-27 17:09:14 +08:00
samuele3hu d9ceed2a7c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-27 17:08:34 +08:00
samuele3hu 1fa2f24bf2 fix:Add the lua binding for ‘Component’ 2014-01-27 17:04:37 +08:00
Dhilan007 662b3dd9a0 fix miss websocket lib for HelloLua on vs. 2014-01-27 17:02:31 +08:00
lm 8356afdd0e [Jenkins] add create-module-project.py 2014-01-27 16:46:35 +08:00
James Chen 09197b65b0 Update CHANGELOG [ci skip] 2014-01-27 16:39:52 +08:00
James Chen fa995c27fb Merge pull request #5257 from dumganhar/iss3871-stop-propagation-fix 
closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce.  And add relevant test case.
 2014-01-27 00:35:04 -08:00
James Chen 098869852b issue #3871: Removes unneeded empty lines. 2014-01-27 16:32:04 +08:00
James Chen 8141397bbd closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case. 2014-01-27 16:30:20 +08:00
James Chen bbe156fe37 Update CHANGELOG [ci skip] 2014-01-27 16:12:31 +08:00
James Chen f64e8826b8 Merge pull request #5242 from Dhilan007/develop_crash 
close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button.
 2014-01-27 00:07:24 -08:00
Dhilan007 35cf49c26d close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button. 2014-01-27 15:37:36 +08:00
James Chen 31643adb99 Merge pull request #5252 from samuele3hu/developBug 
issue #3837:Update the “HelloLua” test case to support on-device debugging
 2014-01-26 23:05:18 -08:00
samuele3hu 9ddce1b4ba issue #3837:Update the comment 2014-01-27 15:00:11 +08:00
James Chen f23b471fbd Merge pull request #5255 from natural-law/develop 
Update the reference of the submodule "plugin".
 2014-01-26 22:36:55 -08:00
zhangbin 015e7c905f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-27 14:23:36 +08:00
zhangbin 7b555c80f2 Update the reference of the submodule "plugin". 2014-01-27 14:22:36 +08:00
James Chen 90c537928e Merge pull request #5253 from boyu0/iss3401_lua_bit_fix 
issue #3401: add bit operation for lua physics test
 2014-01-26 22:11:49 -08:00
samuele3hu 73f272ec7c issue #3837:Update the comment 2014-01-27 14:10:34 +08:00
boyu0 c0765c9a77 issue #3401: bug fix 2014-01-27 14:10:23 +08:00
samuele3hu 61dd9b0340 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-27 14:03:03 +08:00
samuele3hu 8e8e229888 issue #3837:Update the comment 2014-01-27 14:02:11 +08:00
James Chen abc6488b75 Merge pull request #5254 from Dhilan007/develop_label 
close #3869:fixed Font::setCurrentGlyphCollection not saved the settings
 2014-01-26 21:59:22 -08:00
Dhilan007 cb9330dfd6 close #3869:fixed Font::setCurrentGlyphCollection not saved the settings 2014-01-27 13:53:57 +08:00
boyu0 e68db23f7a issue #3401: bug fix 2014-01-27 13:52:29 +08:00
boyu0 6239dadff6 issue #3401: add bit operation for lua physics test 2014-01-27 13:39:11 +08:00
samuele3hu cea6a15903 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-27 12:00:35 +08:00
samuele3hu 13d2f2b97b issue #3837:Update the “HelloLua” test case to support on-device debugging 2014-01-27 11:59:17 +08:00
James Chen 9734d49b59 Merge pull request #5251 from dumganhar/develop 
Updates JS-Test: fix ArmatureTest/ChangeMounttest fails.
 2014-01-26 19:22:47 -08:00
James Chen 4712636783 Updates JS-Test: fix ArmatureTest/ChangeMounttest fails. 2014-01-27 11:22:19 +08:00
James Chen 0cc8050b73 Update CHANGELOG [ci skip] 2014-01-27 10:34:57 +08:00
James Chen 80709aa7d5 Merge pull request #5250 from dumganhar/iss3867-linux-empty-string-crash 
closed #3867: "Testing empty labels" in LabelTest crashes on Linux platform.
 2014-01-26 18:33:43 -08:00
minggo 7065b34f8a Merge pull request #5249 from minggo/develop 
[ci skip]update changelog
 2014-01-26 18:31:48 -08:00
James Chen 6c69626a4f closed #3867: "Testing empty labels" in LabelTest crashes on Linux platform. 2014-01-27 10:31:24 +08:00
minggo c8bd7bc3a8 update changelog 2014-01-27 10:28:11 +08:00
James Chen 208939ab2a Update CHANGELOG [ci skip] 2014-01-26 23:06:48 +08:00
James Chen 64e289d665 Merge pull request #5246 from samuele3hu/developBug 
issue #3863:Rename the lua binding of the `registerScriptHandler` and  `unregisterScriptHandler` of the SkeletonAnimation
 2014-01-26 07:02:02 -08:00
samuele3hu 1ad43e676e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 22:31:57 +08:00