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

16182 Commits

Author SHA1 Message Date
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
samuele3hu 4bc00ba47a fix:Update some description 2014-01-24 10:03:49 +08:00
samuele3hu 38e48ee13a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-24 09:56:29 +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
Ricardo Quesada 284bad6f21 API requirement is 10 again 2014-01-23 16:11:28 -08:00
Ricardo Quesada 2b92ba75b4 more fixes for new GLView API 2014-01-23 16:04:11 -08:00
Ricardo Quesada 8ecaf49f93 GLView improvements 
it is not longer a singleton
it is possible to specify the size
 2014-01-23 15:36:55 -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
Hanju Kim 977c84392c Tab to space 2014-01-23 18:11:40 +09:00
James Chen d980d33d56 issue #3823: install_glfw.sh will not skip if it was installed. Since it will not be updated if we find a new version of glfw. 
BTW, install script will not be invoked in every build after we switch to cmake.
 2014-01-23 01:07:28 -08:00
James Chen e97dd396ba issue #3823: Removes glfw, curl include and library path. They are installed to system. 2014-01-23 01:05:48 -08:00
James Chen 3250604478 issue #3823: Removes curl libraries for linux. It was installed by 'apt-get'. 2014-01-23 01:04:21 -08:00
Hanju Kim d62f711884 New and old label comparison 2014-01-23 17:27:50 +09:00
Hanju Kim c042c5f3db updateColor should be called after updating quads on alignText 2014-01-23 17:27:28 +09:00
minggo 636205147f Merge pull request #5184 from minggo/update-version 
update version
 2014-01-23 00:26:35 -08:00
minggo c1f503bed0 update version 2014-01-23 16:25:38 +08:00
samuele3hu a91d9161c7 issue #3822:Update the KeypadTest using the new event-dispatcher 2014-01-23 16:17:24 +08:00
Hanju Kim 44b2d5d3b8 Old / New label test 2014-01-23 17:16:30 +09:00
James Chen 87980456a9 Merge pull request #5180 from lihex/issue#3781 
Should check ndk architechture.
 2014-01-23 00:13:23 -08:00
James Chen 687600481a Merge pull request #5181 from lmskater/develop 
[Jenkins] add auto generate bindings for win7
 2014-01-23 00:12:09 -08:00