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

15835 Commits

Author SHA1 Message Date
James Chen 63d6dfff48 Merge pull request #5204 from Dhilan007/develop_label 
update label test case.
 2014-01-23 23:10:41 -08:00
James Chen f0b395da3c Merge pull request #5205 from dumganhar/develop 
[JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder.
 2014-01-23 23:04:00 -08:00
Dhilan007 412e875446 update label test case. 2014-01-24 15:02:42 +08:00
James Chen f1ffb0b753 [JSB] cc.Node.setLocalZOrder -> cc.Node.setZOrder. 2014-01-24 15:02:14 +08:00
James Chen 1522a44577 Merge pull request #5197 from Dhilan007/develop_label 
close #3642:fix bounding box of new label is incorrect.
 2014-01-23 22:59:27 -08:00
James Chen ee44640de6 Merge pull request #5201 from lmskater/develop 
[Jenkins] add win32 build in pull-request-builder.py
 2014-01-23 22:59:17 -08:00
minggo 66409a2a8b Merge pull request #5202 from minggo/bug-fix 
fix crash of PerformanceTest
 2014-01-23 22:49:40 -08:00
minggo 0ec70678e0 fix crash of PerformanceTest 2014-01-24 14:48:07 +08:00
lm 188107f6c0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-24 14:40:38 +08:00
lm 232194646d [Jenkins] add win32 build in pull-request-builder.py 2014-01-24 14:40:15 +08:00
James Chen bd0558a66c Merge pull request #5200 from andyque/develop 
change include header file Application.h to cocos2d.h
 2014-01-23 22:37:37 -08:00
minggo f1fa6b2af4 Merge pull request #5199 from minggo/bug-fix 
pause schedule after 3 seconds
 2014-01-23 22:28:16 -08:00
minggo 58f2f19008 pause schedule after 3 seconds 2014-01-24 14:26:35 +08:00
andyque ecdd742f57 change include header file Application.h to cocos2d.h 2014-01-24 14:26:34 +08:00
minggo a74cdeebfd Merge pull request #5198 from minggo/bug-fix 
remove unneeded codes to fix running error
 2014-01-23 22:15:33 -08:00
minggo dffad2acd8 remove unneeded codes to fix running error 2014-01-24 14:13:17 +08:00
Dhilan007 771ed300c4 close #3642:fix bounding box of new label is incorrect. 2014-01-24 14:04:08 +08:00
James Chen 9819076376 Merge pull request #5196 from lmskater/develop 
[Jenkins] fix the url of build description
 2014-01-23 20:17:44 -08:00
lm 7807405138 [Jenkins] fix the url of build description 2014-01-24 12:05:31 +08:00
James Chen 27ff8f3c68 Merge pull request #5195 from dumganhar/iss3833-ccs-scenetest-crash 
closed #3833: SceneTest of CocoStudio crashes
 2014-01-23 20:04:43 -08:00
James Chen 8cf54d835d Update AUTHORS [ci skip] 2014-01-24 11:59:36 +08:00
James Chen aa8cfb5f04 Update CHANGELOG [ci skip] 2014-01-24 11:58:09 +08:00
James Chen 2e75a86431 Merge pull request #5185 from hanjukim/develop 
closed #3832: color and opacity settings are invalid when alignText.
 2014-01-23 19:56:45 -08:00
James Chen c6e7093270 closed #3833: SceneTest of CocoStudio crashes 2014-01-24 11:50:58 +08:00
James Chen 3d113e1709 Update CHANGELOG [ci skip] 2014-01-24 11:42:23 +08:00
James Chen 5f71d320c3 Merge pull request #5189 from samuele3hu/developNewEventDispacther 
close #3822:Use the new event-dispatcher to update some lua test cases which used the old event-dispatcher
 2014-01-23 19:41:09 -08:00
James Chen afd11b43a4 Update CHANGELOG [ci skip] 2014-01-24 11:37:46 +08:00
James Chen dfbb68a9e1 Update CHANGELOG [ci skip] 2014-01-24 11:37:23 +08:00
minggo 8aaeb99f17 [ci skip] 2014-01-24 11:36:52 +08:00
James Chen 4a91f3176e Merge pull request #5194 from andyque/develop 
fix a potential bug of CCSkin. It will cause the display of CCSkin wrongly
 2014-01-23 19:35:45 -08:00
James Chen 2c1321fe14 Merge pull request #5193 from lmskater/develop 
[Jenkins] add missing double quotes in pull-request-builder.py
 2014-01-23 19:17:06 -08:00
andyque 43ff0c42cf fix a potential bug of CCSkin. It will cause the display of CCSkin wrongly. 2014-01-24 11:05:34 +08:00
lm 490c85a388 [Jenkins] add missing double quotes in pull-request-builder.py 2014-01-24 09:50:40 +08:00
samuele3hu 8798fba4dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewEventDispacther 2014-01-24 09:49:46 +08:00
samuele3hu 1ff51b67f0 issue #3822:Update the hellolua using the `EventListenerTouchOneByOne` 2014-01-24 09:48:39 +08:00
James Chen 646dd2f8c5 Merge pull request #5191 from heliclei/develop 
[jenkins]add ios build script
 2014-01-23 08:10:46 -08:00
heliclei 8861a50e65 fix project path 2014-01-23 23:40:08 +08:00
heliclei a28da90c9d add ios build script 2014-01-23 23:30:54 +08:00
samuele3hu 6b927fb6b0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewEventDispacther 2014-01-23 22:28:05 +08:00
samuele3hu 402d0cf7b1 issue #3822:Update the test cases which are related with touch using the `EventListenerTouchAllAtOnce` or `EventListenerTouchOneByOne` 2014-01-23 22:26:14 +08:00
James Chen e9a333c1c4 Merge pull request #5187 from lmskater/develop 
[Jenkins] fix the path in gen_jsb_win32.bat
 2014-01-23 03:18:15 -08:00
lm c82566435a [Jenkins] fix the path in pull-request-builder.py 2014-01-23 19:05:49 +08:00
lm 76066c81d8 [Jenkins] fix the path in gen_jsb_win32.bat 2014-01-23 19:02:19 +08:00
James Chen f0580d6c07 Merge pull request #5186 from dumganhar/develop 
Fixes couldn't find CCEGLView.h in  main.cpp of template.
 2014-01-23 02:31:19 -08:00
James Chen d8b2f7615d Fixes couldn't find CCEGLView.h in main.cpp of template. 2014-01-23 18:15:02 +08:00
James Chen 38ae628dea Update CHANGELOG [ci skip] 2014-01-23 18:03:31 +08:00
Hanju Kim 1a34a6ff84 remove unused header 
remove CC Prefix
 2014-01-23 18:55:51 +09:00
James Chen 41c63e2f4d Merge pull request #5183 from dumganhar/iss3823-fullscreen-glfw 
closed #3823: Fullscreen support for desktop platforms (windows, linux, mac).
 2014-01-23 01:41:41 -08:00
Hanju Kim 0d05db2326 Merge remote-tracking branch 'remotes/upstream/develop' into develop 2014-01-23 18:40:07 +09:00
James Chen a3813ca294 closed #3823: Reverts a line in lua template. 2014-01-23 17:24:03 +08:00