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

29015 Commits

Author SHA1 Message Date
Wenhai Lin 0356f9daca Fixed git-archive-all 2015-03-13 12:07:33 +08:00
Huabing.Xu 49c99cf675 Merge pull request #10844 from dabingnn/v3 
update version string and releaseNotes for 3.5
 2015-03-13 11:53:04 +08:00
Huabing.Xu c3aea9f6c0 update version string and releaseNotes for 3.5 2015-03-13 11:51:32 +08:00
XiaoYang 7b6b00257d Merge pull request #253 from songchengjiang/v3 
fix the bug of MoveTo
 2015-03-13 11:42:58 +08:00
songchengjiang 7026b89b02 fix the bug of moveTo 2015-03-13 11:35:58 +08:00
Martin Konopka 350b81501d Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder] 
Initialization follows the order of declaration, not the order of the initialization list.
 2015-03-12 23:47:58 +01:00
SunLightJuly 8c196847cb add security framework to Mac template project of Lua 2015-03-12 19:18:06 +08:00
pipu 56c3d1c6f6 To add the function node load callback called during create node from csb file. 2015-03-12 17:36:39 +08:00
pipu 7515fc78f5 To set csd version for serializing. 2015-03-12 16:15:17 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
yangxiao 50c3a9cb4c fix removeAllChildren cause camera to be destroyed bug 2015-03-12 10:39:21 +08:00
byeonggee.seo a2274162b5 merged 2015-03-12 10:06:53 +09:00
mogemimi 8cf0ec1aca Minor refactor TMXMapInfo 
* Replace with range-based for loop
* Replace some size() with !empty()
* Refactor scope of local variable
 2015-03-12 01:21:57 +09:00
mogemimi 279604bac5 Add missing white spaces and some minor cleanups 
* Add missing white space
* Fix if-else statement without curly braces
* Fix indentation
* Clean up code
 2015-03-12 01:19:37 +09:00
mogemimi abeb269534 Remove useless (char*) cast 2015-03-12 01:14:05 +09:00
minggo 773eedcaa5 [ci skip]update CHANGELOG 2015-03-11 15:52:01 +08:00
minggo d0e468b05c Merge pull request #10813 from CocosRobot/update_cocosfiles_1426059178 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-11 15:40:51 +08:00
CocosRobot 54ac9ef67f [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-11 07:32:59 +00:00
minggo 44b1f77fa3 Merge pull request #10799 from SunLightJuly/v3_remove_simu 
V3 remove simulator
 2015-03-11 15:31:17 +08:00
GarfieldKwong 656842d6f1 fix issue autorelease will not release trigger by autorelease. 2015-03-11 15:31:06 +08:00
minggo a1e6aa23c9 Merge pull request #10811 from andyque/remove-download-deps 
remove backup 3rd party libs
 2015-03-11 15:03:15 +08:00
andyque f3763bde3d remove backup 3rd party libs 2015-03-11 14:59:34 +08:00
SunLightJuly ad63fc35c7 fixed download-reps.py: not to download lua runtime binaries 2015-03-11 14:50:39 +08:00
minggo d2be2290a3 Merge pull request #10796 from Mazyod/http-client-mac 
Http client mac
 2015-03-11 14:26:08 +08:00
minggo cb82c1af9b Merge pull request #10810 from andyque/fix-jenkins-template 
remove template config.json check
 2015-03-11 14:02:38 +08:00
andyque e76cc8c99d remove template config.json check 2015-03-11 14:00:28 +08:00
minggo edad2d8066 Merge pull request #10806 from andyque/v3 
cleanup Jenkins scripts
 2015-03-11 11:19:17 +08:00
minggo 32eadde568 Merge pull request #10805 from CocosRobot/update_lua_bindings_1426041793 
[AUTO]: updating luabinding automatically
 2015-03-11 10:51:57 +08:00
andyque 1c483b27fd update github remote 2015-03-11 10:49:39 +08:00
CocosRobot e079216248 [AUTO]: updating luabinding automatically 2015-03-11 02:45:36 +00:00
minggo 04393854e8 Merge pull request #10789 from fusijie/fix-moveto-reverse 
disable MoveTo::reverse()
 2015-03-11 10:39:45 +08:00
minggo c4ac2b5f47 Merge pull request #10795 from pipu/optimize_ButtonReader 
To optimize ButtonReader for source path and source.
 2015-03-11 10:05:48 +08:00
minggo c701f89329 Merge pull request #10683 from Mazyod/mac-editbox-fix 
Fix editbox on Mac
 2015-03-11 10:00:50 +08:00
pipu 90da84a663 To modify that check whether or not string is not empty. 2015-03-11 09:59:07 +08:00
Jacky 605ce58293 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
andyque 98d57551d1 remove exceptions code 2015-03-11 00:59:21 +08:00
andyque 0991ce5002 update master jenkins scripts 2015-03-11 00:08:52 +08:00
SunLightJuly 608ed24180 Synchronization with V3 2015-03-11 00:02:50 +08:00
SunLightJuly 6c2eb01213 cleanup proj.android 2015-03-10 23:33:09 +08:00
SunLightJuly b77801a99b cleanup proj.win32 2015-03-10 22:56:03 +08:00
andyque 34619fc125 add git --version 2015-03-10 19:07:55 +08:00
Mazyad Alabduljaleel 1dee334f29 added security framework to the tests project 2015-03-10 15:04:29 +04:00
andyque ffa01950ac use subprocess.call 2015-03-10 19:00:07 +08:00
Mazyad Alabduljaleel 52524ae453 add security framework to Mac template project 2015-03-10 14:57:21 +04:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
andyque 9457ed5fbd fix subprocess.check_output error 2015-03-10 18:47:35 +08:00
andyque 7f4bfc395f change os.system to subprocess 2015-03-10 18:42:26 +08:00
SunLightJuly ba55f14fbf removed runtime in libsimulator 2015-03-10 18:28:59 +08:00
andyque 5bd5c62a91 change git merge method 2015-03-10 18:24:38 +08:00
andyque d7972e8b0a Merge remote-tracking branch 'refs/remotes/upstream/v3' into v3 2015-03-10 18:08:50 +08:00