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

29538 Commits

Author SHA1 Message Date
joshuastray 342734e3b5 Merge remote-tracking branch 'upstream/v3' into physics 2015-05-21 21:15:42 +08:00
joshuastray 83237b8dbd add physics3d js manual binding and tests 2015-05-21 18:05:49 +08:00
minggo dff368aa49 Merge pull request #11944 from andyque/add-vs2015-support 
add vs2015 support
 2015-05-21 14:50:51 +08:00
andyque 81fcbb45dc update 3rd party 2015-05-21 14:01:05 +08:00
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +08:00
minggo a14881effa Merge pull request #11941 from CocosRobot/update_lua_bindings_1432176062 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-21 12:45:35 +08:00
CocosRobot ad301891f0 [AUTO]: updating luabinding & jsbinding automatically 2015-05-21 02:46:49 +00:00
minggo ef8e7958cd [ci skip]update CHANGELOG 2015-05-21 10:37:35 +08:00
minggo 22f0e2fbbf Merge pull request #11918 from WenhaiLin/v3-37 
AudioEngine: Fixed play with a large audio file may fail on Win32
 2015-05-21 10:36:08 +08:00
minggo 69b6c9a3e5 Merge pull request #11906 from samuele3hu/v3_check 
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
 2015-05-21 10:35:38 +08:00
minggo dc0dd081d8 Merge pull request #11938 from CocosRobot/update_lua_bindings_1432172799 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-21 10:35:14 +08:00
minggo 9f720512a1 Merge pull request #11937 from CocosRobot/update_cocosfiles_1432172742 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-21 10:34:39 +08:00
CocosRobot cb6abaa14c [AUTO]: updating luabinding & jsbinding automatically 2015-05-21 01:52:51 +00:00
CocosRobot 5005c77d45 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-21 01:45:44 +00:00
minggo f1eae8f724 Merge pull request #11929 from namezero111111/patch-1 
Fixed missing const-correctness
 2015-05-21 09:38:24 +08:00
子龙山人 9ac23a5436 Merge pull request #11933 from kobake/fix-typo-angel 
Fix typo: "angel" to "angle"
 2015-05-21 09:37:53 +08:00
minggo bfbc8d28f2 Merge pull request #11928 from MSOpenTech/v3-winrt-bullet3d 
V3: Windows 8.1 Universal App version of Bullet 3D physics lib
 2015-05-21 09:36:42 +08:00
kobake d6f7a0a8a1 Fix typo. angel -> angle 2015-05-21 09:22:59 +09:00
Ricardo Quesada 6131501c5f Merge pull request #11931 from ricardoquesada/meshcommand_particle_fixes 
Removes state from MeshCommand.
 2015-05-20 16:30:53 -07:00
Ricardo Quesada f2d3ecad48 Removes state from MeshCommand. 
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
 2015-05-20 15:57:26 -07:00
Dale Stammen aa641189ad fixed audio file path for winrt 2015-05-20 11:22:13 -07:00
Dale Stammen d70a9bf369 resolve full path for audio file 2015-05-20 11:18:54 -07:00
Namezero 89152ef514 Fixed missing const-correctness 2015-05-20 17:19:42 +02:00
Dale Stammen ee8a85fb9b set version to 1.0.0.0 update GUID 2015-05-20 08:10:24 -07:00
Dale Stammen 209e7c62f4 added libbullet to Windows 8.1 Universal App projects 2015-05-20 08:01:01 -07:00
Dale Stammen 46a69cf00b ignore warning 4996 2015-05-20 07:59:17 -07:00
Dale Stammen 3523173594 removed CC_PLATFORM_WP8 2015-05-20 07:58:39 -07:00
Dale Stammen d68f2c1c3d removed CC_PLATFORM_WP8 2015-05-20 07:56:14 -07:00
Dale Stammen aa7876aefc remove deprecated methods 2015-05-20 07:55:10 -07:00
Dale Stammen 14e812c7d4 enable CC_USE_3D_PHYSICS for CC_PLATFORM_WINRT 2015-05-20 07:53:49 -07:00
Dale Stammen 1b9a36f041 removed CC_PLATFORM_WP8 code 2015-05-20 07:52:59 -07:00
Dale Stammen cada493685 remove deprecated methods 2015-05-20 07:51:52 -07:00
Dale Stammen 5b36a76e6b update version to 53 2015-05-20 07:51:01 -07:00
minggo 6e0d8e2f74 Merge pull request #11922 from CocosRobot/update_cocosfiles_1432114339 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-20 18:38:34 +08:00
minggo 607eb2ac04 Merge pull request #11924 from WenhaiLin/v3-support-android-studio 
[ci skip]Remove unnecessary code.
 2015-05-20 18:20:44 +08:00
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
CocosRobot 3790e60928 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-20 09:32:20 +00:00
WenhaiLin 02946a55a1 Fixed crash. 2015-05-20 17:13:04 +08:00
WenhaiLin 81dc551fe9 AudioEngine: Fixed play with a large audio file may fail on Win32. 2015-05-20 15:13:31 +08:00
minggo fefe1b10fe Merge pull request #11917 from CocosRobot/update_cocosfiles_1432104240 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-20 15:13:11 +08:00
CocosRobot a5a6515332 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-20 06:44:01 +00:00
minggo 1812660c7b Merge pull request #11915 from WenhaiLin/v3-37 
Rename visual studio solution files
 2015-05-20 14:26:20 +08:00
WenhaiLin c26ae4a972 Rename solution file for Win32 project. 2015-05-20 13:55:23 +08:00
minggo 18dec36266 Merge pull request #11914 from WenhaiLin/v3-37 
[ci skip]Update ignore.
 2015-05-20 13:51:04 +08:00
minggo 6205d043b0 [ci skip]update CHANGELOG 2015-05-20 13:41:59 +08:00
minggo 7024d3129c Merge pull request #11893 from MSOpenTech/v3-winrt-audio 
New audio engine support in winrt win8.1-universal
 2015-05-20 13:40:41 +08:00
WenhaiLin 45294782bb [ci skip]Update ignore. 2015-05-20 13:40:35 +08:00
minggo 79f70c49ce Merge pull request #11905 from WenhaiLin/v3-37 
Remove unnecessary files.
 2015-05-20 13:39:36 +08:00
minggo 191c460366 Merge pull request #11896 from samuele3hu/v3_camera 
[ci skip]Add Scene3DTest and update TerrainTest based on the Lua
 2015-05-20 13:38:59 +08:00
minggo e365c33379 [ci skip]update CHANGELOG 2015-05-20 11:22:51 +08:00