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

29501 Commits

Author SHA1 Message Date
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
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
minggo ba694beccb Merge pull request #11895 from super626/v3 
fix #10767
 2015-05-20 11:20:47 +08:00
minggo dbf1b415a5 Merge pull request #11898 from WenhaiLin/v3-console-crash 
Console:Fixed crash
 2015-05-20 11:19:38 +08:00
minggo c6b0d1f2bb Merge pull request #11909 from natural-law/v3 
Modify the js template & cocos2d-console for IDE support.
 2015-05-20 11:12:19 +08:00
Bin Zhang c4349d9441 Update the reference of submodule cocos2d-console. 2015-05-20 10:54:40 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
Ricardo Quesada ae413a6f6d Merge pull request #11904 from ricardoquesada/meshcommand_fixes 
MeshCommand uses StateBlock
 2015-05-19 18:51:03 -07:00
Ricardo Quesada ac54dad9a0 MeshCommand uses StateBlock 
When MeshCommand is used with GLProgramState, it will use the StateBlock
internally, instead of the manual and error prone way of keeping state
 2015-05-19 18:13:18 -07:00
Ricardo Quesada 5d90a8725e Merge pull request #11903 from ricardoquesada/cleaner_code_properties 
Terrain uses StateBlock
 2015-05-19 18:07:50 -07:00
Ricardo Quesada 5924a917a1 Terrain uses StateBlock 
cleaner code, conforms to new way of setting the state
 2015-05-19 17:18:44 -07:00
Ricardo Quesada 703852de69 Merge pull request #11902 from CocosRobot/update_lua_bindings_1432076290 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-19 16:56:46 -07:00
CocosRobot 61aad4581a [AUTO]: updating luabinding & jsbinding automatically 2015-05-19 23:02:24 +00:00
anniruddh.koppal 8432323450 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio 2015-05-19 16:01:10 -07:00
Ricardo Quesada c28c1ffbfb Merge pull request #11901 from ricardoquesada/cleaner_code_properties 
Properties fixes
 2015-05-19 15:48:08 -07:00
Ricardo Quesada aa027fbe0f Properties fixes 
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
 2015-05-19 13:51:52 -07:00
WenhaiLin 80367e978d Console:Fixed crash 2015-05-19 18:33:06 +08:00
samuele3hu b6a2299666 Add a newline 2015-05-19 16:55:37 +08:00
samuele3hu 7f728f029c Add Scene3DTest and update TerrainTest based on the Lua 2015-05-19 16:52:39 +08:00
XiaoYang 39340c52ed Merge pull request #331 from tangziwen/v3 
fix crash when the visiting camera is not exist
 2015-05-19 15:01:34 +08:00
Bin Zhang 4ccf18f414 Remove the cocos2d-html5 when creating js project by cocos new. 2015-05-19 14:55:04 +08:00
tangziwen 8d791390ff fix crash when visiting camera is not exist 2015-05-19 14:47:28 +08:00
anniruddh.koppal ea345717c7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio 2015-05-18 23:40:28 -07:00
minggo 43b5983abe [ci skip]update AUTHORS 2015-05-19 11:46:04 +08:00
minggo fedd3c46e1 [ci skip]update CHANGELOG 2015-05-19 11:44:06 +08:00
minggo bb3ad7d249 Merge pull request #11677 from tankorsmash/patch-1 
Fix setSprite never updating progress on ProgressTimer
 2015-05-19 11:42:20 +08:00
anniruddh.koppal 3a8d2ffc9e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio 2015-05-18 19:23:48 -07:00
anniruddh.koppal e0b3091dcf Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio 
Conflicts:
	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
 2015-05-18 19:21:48 -07:00
anniruddh.koppal 9081304e80 reduced audio file sizes 2015-05-18 19:00:59 -07:00
minggo 38773e2164 Merge pull request #11869 from samuele3hu/v3_updateccs 
Fix the bug that tableCellSizeForIndex of tableview get the wrong result  in the Lua
 2015-05-19 09:26:09 +08:00
minggo e3e78b039a Merge pull request #11851 from andyque/fixIssue11769 
Copy missing text color property of ui::Text.
 2015-05-18 18:14:29 +08:00
minggo e429edec3e Merge pull request #11882 from CocosRobot/update_cocosfiles_1431937160 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-18 16:20:27 +08:00
CocosRobot 181f225eb7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-18 08:19:22 +00:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
minggo 204877351f Merge pull request #11879 from joshuastray/js-tests 
[ci skip]added missing terrain/particle/sprite3d tests
 2015-05-18 16:04:57 +08:00
minggo 20da707b90 Merge pull request #11881 from CocosRobot/update_lua_bindings_1431932345 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-18 16:04:28 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00