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

13201 Commits

Author SHA1 Message Date
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
samuele3 062fb85943 issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class 2013-11-13 10:12:44 +08:00
Ricardo Quesada 865e780921 Merge pull request #4213 from ricardoquesada/listener_id_type 
correct type for  Listener ID
 2013-11-12 17:15:44 -08:00
Ricardo Quesada 4848e3d3bb correct size for Listener ID 2013-11-12 17:14:51 -08:00
Ricardo Quesada 2db3ffd01f Merge pull request #4212 from ricardoquesada/coding_iii 
removes cocos2d-x from title since the image is already there
 2013-11-12 15:58:08 -08:00
Ricardo Quesada da05fa1f63 removes cocos2d-x from title since the image is already there 2013-11-12 15:57:29 -08:00
Ricardo Quesada dbd414cf32 Merge pull request #4211 from ricardoquesada/coding_ii 
More fixes to CODING STYLE
 2013-11-12 15:25:15 -08:00
Ricardo Quesada d8efcc04e6 More fixes to CODING STYLE 
Adds cocos2d-x logo, and other  syntax fixes
 2013-11-12 15:23:43 -08:00
Ricardo Quesada a21d93eda0 Merge pull request #4210 from ricardoquesada/coding 
Updates CODING STYLE
 2013-11-12 14:57:34 -08:00
Ricardo Quesada 3f61a0ac00 Updates CODING STYLE 
Adds Xcode 5.0, gcc 4.8 and VS 2012 as the supported compilers
 2013-11-12 14:56:24 -08:00
James Chen 5498c79c9e Merge pull request #4203 from CocosRobot/updategeneratedsubmodule_1384249810 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-12 02:00:16 -08:00
James Chen cb6b3f8163 Merge pull request #4201 from Dhilan007/incomplete_copy 
fix incomplete copy resource
 2013-11-12 01:59:00 -08:00
Dhilan007 d43bc3f75d remove unnecessary print 2013-11-12 17:53:23 +08:00
samuele3 f429c4c632 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 17:51:33 +08:00
CocosRobot 0acaa1f76e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-12 09:50:13 +00:00
James Chen c74e5fc464 Merge pull request #4200 from samuele3hu/developCheck 
Resolve some warning and modify uint32_t to long
 2013-11-12 01:43:33 -08:00
samuele3 cb51df7d65 Update bindings-generator 2013-11-12 17:31:24 +08:00
samuele3 ae6597dbaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 
Conflicts:
	tools/bindings-generator
 2013-11-12 17:23:41 +08:00
samuele3 18bc96096c Resolve some warning and modify uint32_t to long 2013-11-12 17:18:51 +08:00
samuele3 c1d256c159 issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
Dhilan007 e182328d51 fix incomplete copy resource 2013-11-12 16:25:39 +08:00
minggo 8d79e67ecf Merge pull request #4165 from 2youyouo2/develop 
[ci skip]update armature
 2013-11-11 23:57:30 -08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-11-12 15:30:36 +08:00
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
minggo e2224d5316 [ci skip] 2013-11-12 11:24:59 +08:00
James Chen 42ca4f6122 Merge pull request #4187 from dumganhar/develop 
#include <algorithm> for std::max, std::min on VS2013.
 2013-11-11 18:52:16 -08:00
James Chen db07c781ab #include <algorithm> for std::max, std::min on VS2013. 2013-11-12 10:35:50 +08:00
James Chen 0358eae8f0 Update CHANGELOG [ci skip] 2013-11-12 10:33:18 +08:00
James Chen 8c42e62a3f Update AUTHORS [ci skip] 2013-11-12 10:32:22 +08:00
James Chen cfd82a26bb Merge pull request #4156 from bopohaa/patch-1 
closed #3159: Webp Test Crashes.
 2013-11-11 18:31:03 -08:00
James Chen 412712c5e4 Update CHANGELOG[ci skip] 2013-11-12 09:45:07 +08:00
James Chen d7a0787336 Up 2013-11-12 09:44:07 +08:00
James Chen cc3a6ebda9 Merge pull request #4150 from ledyba/fix_ccdevice 
Close X Display
 2013-11-11 17:40:32 -08:00
minggo 44bed76c21 Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3 
[ci skip]Develop nutty optimizeguireader 3
 2013-11-11 17:36:22 -08:00
Ricardo Quesada 0e642013db Merge pull request #4182 from ricardoquesada/android_create_fixes 
fixes for android create
 2013-11-11 16:10:19 -08:00
Ricardo Quesada a5eeff4f4f fixes for android create 
improves the message.
fixes some grammar errors
 2013-11-11 16:09:32 -08:00
Ricardo Quesada 4b2eda3cdc Merge pull request #4181 from ricardoquesada/delete_fixes 
calls `delete[]` instead of `delete`
 2013-11-11 16:08:35 -08:00
Ricardo Quesada d6446e9b14 calls `delete[]` instead of `delete` 
calls `delete[]` instead of `delete`
 2013-11-11 16:07:46 -08:00
James Chen 51cfd3fb4b Merge pull request #4151 from pyrasis/develop 
[Win32] fix compile error.
 2013-11-11 04:42:42 -08:00
James Chen a951ba600f Merge pull request #4179 from CocosRobot/updategeneratedsubmodule_1384167474 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-11 03:02:04 -08:00
CocosRobot 3472d7ad50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 10:57:57 +00:00
James Chen d64de4f74d Merge pull request #4178 from dumganhar/develop 
[develop] Updating bindings-generator, fixing forward declare that gener...
 2013-11-11 02:46:48 -08:00
James Chen df214acb6f [develop] Updating bindings-generator, fixing forward declare that generates binding glue codes which is an empty class. 2013-11-11 18:42:39 +08:00
CaiWenzhi b688e39584 Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-11 18:23:21 +08:00
CaiWenzhi 4f76141c41 optimize guireader 2013-11-11 18:22:14 +08:00
minggo b868c3f1dc Merge pull request #4173 from minggo/remove-makefile 
[ci skip]remove makefiles
 2013-11-11 02:19:16 -08:00
minggo d3cf36ba37 Merge pull request #4171 from dumganhar/jsb-64bit-fix 
[ci skip]Jsb 64bit fix
 2013-11-11 02:17:42 -08:00
CaiWenzhi 782c26bc37 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-11 17:57:43 +08:00
minggo d1a414194e [ci skip]update linux build commands 2013-11-11 17:36:23 +08:00
2youyou2 cdae8f51bc Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-11-11 17:30:52 +08:00