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

23633 Commits

Author SHA1 Message Date
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
minggo 4fd4a6fb94 Merge pull request #7994 from CocosRobot/update_cocosfiles_1410329274 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-10 14:08:40 +08:00
CocosRobot deef5cb3d7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 06:07:55 +00:00
minggo 46d4f487bb Merge pull request #7978 from super626/v3 
Calculate Content Size for Sprite3D
 2014-09-10 14:06:47 +08:00
minggo 896510c3db Merge pull request #7993 from CocosRobot/update_cocosfiles_1410328993 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-10 14:06:06 +08:00
minggo f032286787 Merge pull request #7961 from andyque/addChipmunkStaticLib 
Add chipmunk static lib
 2014-09-10 14:05:10 +08:00
CocosRobot 2656b94fe6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 06:03:14 +00:00
minggo 5a4c8644e9 Merge pull request #7992 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-09-10 14:01:53 +08:00
andyque 8aea6330a5 modify linux cmakelist 2014-09-09 22:59:55 -07:00
zhangbin c20caa7c35 Update the reference of submodule cocos2d-console. 2014-09-10 13:59:48 +08:00
minggo 1ec0375edf Merge pull request #7989 from CocosRobot/update_lua_bindings_1410313823 
[AUTO]: updating luabinding automatically
 2014-09-10 13:50:56 +08:00
minggo cb3450a99b Merge pull request #7988 from CocosRobot/update_cocosfiles_1410313808 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-10 13:41:39 +08:00
andyque 499d828179 add chipmunk static library for linux 2014-09-10 10:58:20 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
andyque 182a76a0f5 add chipmunk config for iOS & mac 2014-09-10 10:08:38 +08:00
andyque acae8a2535 Merge branch 'v3' into addChipmunkStaticLib 
Conflicts:
	CMakeLists.txt
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
	cocos/CMakeLists.txt
 2014-09-10 10:00:15 +08:00
CocosRobot 0e49107514 [AUTO]: updating luabinding automatically 2014-09-10 01:52:43 +00:00
CocosRobot 15254a5ddb [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 01:50:11 +00:00
Ricardo Quesada 574dca0a04 Merge pull request #7986 from ricardoquesada/android_props_fixes 
Android properties back to 10
 2014-09-09 18:47:21 -07:00
Ricardo Quesada f5cd48f154 Android properties back to 10 2014-09-09 18:46:47 -07:00
Ricardo Quesada a7cdc3e0fe Merge pull request #7984 from ricardoquesada/fixes_platform_directory 
Fixes platform directory
 2014-09-09 18:42:49 -07:00
Ricardo Quesada 1e79cacf26 Updates CHANGELOG 2014-09-09 18:25:47 -07:00
Ricardo Quesada d5a6289a9b compiles on wp8 2014-09-09 18:22:11 -07:00
Ricardo Quesada 6b4323642a compiles on winphone8 2014-09-09 18:15:16 -07:00
Ricardo Quesada 4d57e991ea Compiles in Win32 2014-09-09 18:07:24 -07:00
Ricardo Quesada fdabaa3082 Compiles on Android 2014-09-09 17:53:08 -07:00
Ricardo Quesada 0972506bf5 compiles and runs on linux 2014-09-09 17:41:49 -07:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 73450be715 compiles and runs in Linux 2014-09-09 17:11:06 -07:00
Ricardo Quesada f5e54f8e69 Fixes for linux compilation 2014-09-09 17:01:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
Ricardo Quesada 81fa462f3d Merge pull request #7981 from ricardoquesada/cmakefile_for_mac 
Squashed commit of the following:
 2014-09-09 12:21:41 -07:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
XiaoYang 803f5d4178 Merge pull request #129 from songchengjiang/new_v3 
Sprite3DHitTest use AABB testing
 2014-09-09 17:53:02 +08:00
songchengjiang 4099015421 Sprite3D set default _contentSize by AABB 2014-09-09 17:47:34 +08:00
songchengjiang 117c38f806 Sprite3DHitTest use AABB testing 2014-09-09 17:05:33 +08:00
minggo 0abe4cbbb6 Merge pull request #7974 from andyque/fixWin32CompileError 
change toolset from 12.0 to 4.0
 2014-09-09 16:41:24 +08:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
andyque 6a4397a3eb change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
minggo c4fe5728ee Merge pull request #7973 from CocosRobot/update_lua_bindings_1410244922 
[AUTO]: updating luabinding automatically
 2014-09-09 15:23:39 +08:00
andyque b280a02b5d modify external version 2014-09-09 15:23:07 +08:00
CocosRobot ed8835d262 [AUTO]: updating luabinding automatically 2014-09-09 06:43:49 +00:00
minggo 1ee9cebebd Merge pull request #7925 from super626/transition 
Animation3D
 2014-09-09 14:39:15 +08:00
minggo 2ba6e73212 Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097 
[AUTO]: updating luabinding automatically
 2014-09-09 14:20:16 +08:00
minggo 162fb3ec18 Merge pull request #7967 from minggo/remove-_setLocalZOrder 
deprecated Node::_setZOrder()
 2014-09-09 14:20:00 +08:00
minggo 9373d096e8 Merge pull request #7969 from andyque/fixUI 
deprecated ui::TextField getStringValue and setText, use getString and
 2014-09-09 14:18:07 +08:00
XiaoYang 336b545f4f Merge pull request #128 from liuliang2004/transition 
Modify the environment configuration
 2014-09-09 14:05:08 +08:00
liuliang be72d5730c Modify the environment configuration 2014-09-09 14:03:27 +08:00
andyque 83e14259ad deprecated ui::TextField getStringValue and setText, use getString and 
setString instead
 2014-09-09 13:59:35 +08:00
yangxiao a6337a3c56 remove sequence3d 2014-09-09 13:20:33 +08:00