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

25375 Commits

Author SHA1 Message Date
XiaoYang 16ce7ac50f Merge pull request #168 from lvlonggame/v3 
fix bug: if the material's content  that version 0.1 is empty.
 2014-11-28 13:54:04 +08:00
lvlong 82241a74dd fix bug: if the material's content that version 0.1 is empty. 2014-11-27 17:31:22 +08:00
XiaoYang e68199b8bb Merge pull request #163 from lvlonggame/v3 
fix bug: read animation number by different version.
 2014-11-19 18:03:27 +08:00
lvlong 3b8fcd21eb fix bug: read animation number by different version. 2014-11-19 17:59:35 +08:00
yangxiao 460bc2bf08 move aabb calculation to bundle 2014-11-19 17:58:40 +08:00
XiaoYang 17e45981f6 Merge pull request #162 from tangziwen/v3 
use dummy texture even if in release mode
 2014-11-19 17:19:15 +08:00
tangziwen 0d43a8f337 add macro CC_MODEL_VIEWER 2014-11-19 17:01:34 +08:00
tangziwen 63fcdcebdd use dummy texture even if in release mode 2014-11-19 16:16:59 +08:00
yangxiao cd060e01dc Merge branch 'newcode' into v3 2014-11-19 11:54:36 +08:00
minggo 1923524422 Merge pull request #9154 from natural-law/v3 
Solve the error when building android for sample projects of engine.
 2014-11-19 10:12:18 +08:00
yangxiao fb638bdf94 Merge branch 'newcode' into v3 2014-11-19 10:12:05 +08:00
yangxiao eccfbe5c59 merge bundle modification 2014-11-19 10:09:30 +08:00
zhangbin 3715aeb0f6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2014-11-19 10:00:51 +08:00
XiaoYang 1d31df9970 Merge pull request #160 from lvlonggame/v3 
modify read animation.
 2014-11-19 08:52:06 +07:00
minggo 6da161a3a8 Merge pull request #9160 from MSOpenTech/v3-win8.1-template-fix 
Updated universal app template file copy build script to use App.Shared directory
 2014-11-19 09:34:39 +08:00
Dale Stammen b75af6bedc updated template file copy build script to use App.Shared dir 2014-11-18 13:45:37 -08:00
zhangbin 5aff5640b5 Solve the error when building android for sample projects of engine. 
1. Update the project config.
2. Update the submodule cocos2d-console.
 2014-11-18 18:39:53 +08:00
lvlong a33bad7482 modify read animation. 2014-11-18 16:10:33 +08:00
Ricardo Quesada a1afa62000 Merge pull request #9148 from ricardoquesada/new_console_version 
updates to latest version of console
 2014-11-17 21:04:38 -08:00
Ricardo Quesada 960935fce5 updates to latest version of console 2014-11-17 21:04:11 -08:00
Ricardo Quesada 8c84b834a0 Merge pull request #9147 from ricardoquesada/new_cocos_console_version 
new console version
 2014-11-17 20:21:01 -08:00
Ricardo Quesada f5b9bbe976 new console version 
supports multiple paths for templates
 2014-11-17 20:20:18 -08:00
Ricardo Quesada d044d9da07 Merge pull request #9146 from ricardoquesada/templates_root 
setup adds COCOS_TEMPLATES_ROOT
 2014-11-17 20:05:50 -08:00
Ricardo Quesada a55fb2a1f5 setup adds COCOS_TEMPLATES_ROOT 2014-11-17 20:05:15 -08:00
minggo b4f7c9c673 Merge pull request #9141 from MSOpenTech/v3-wp8-devenv 
Fixed WP8 solution folder names to enable building test projects using devenv
 2014-11-18 11:09:27 +08:00
Ricardo Quesada ddec619532 Merge pull request #9143 from ricardoquesada/updated_cocos_console 
Using new cocos-console
 2014-11-17 18:27:52 -08:00
Ricardo Quesada 0da34ffa80 Using new cocos-console 2014-11-17 18:26:37 -08:00
Ricardo Quesada 19ea011dfc Merge pull request #9142 from ricardoquesada/setup_py_fixes 
Setup py fixes
 2014-11-17 18:15:13 -08:00
Ricardo Quesada 71fec06a11 fixes indentation 2014-11-17 18:11:17 -08:00
Ricardo Quesada 99966755e5 sets COCOS_X_ROOT 
sets COCOS_X_ROOT environment variable and also uses PEP8 coding style
 2014-11-17 18:11:08 -08:00
Ricardo Quesada d38e3d23d0 Update CONTRIBUTE.md 2014-11-17 12:30:53 -08:00
Dale Stammen 200cb6d3b4 fixed test solution folder names to enable building project using devenv 2014-11-17 11:52:46 -08:00
minggo 70fdf6af5d Merge pull request #9137 from natural-law/support-wp8 
Modify the cpp template to support win8.1-universal project.
 2014-11-17 16:09:48 +08:00
zhangbin 365e09e5db Merge branch 'v3' into support-wp8 2014-11-17 16:01:12 +08:00
zhangbin 534570075b Update the reference of submodule cocos2d-console. 2014-11-17 15:57:49 +08:00
Ricardo Quesada 506dd0219a Update CONTRIBUTE.md 2014-11-16 21:06:23 -08:00
minggo a6030dd063 Merge pull request #9108 from nilium/v3-plugin-libjars-unignore 
Permit plugin-x plugins to ship third-party libraries.
 2014-11-17 09:54:42 +08:00
James Chen 8bdf12a8f9 Merge pull request #9135 from CocosRobot/update_cocosfiles_1416159132 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-17 09:53:33 +08:00
CocosRobot 18b0a6cacc [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-16 17:32:13 +00:00
Ricardo Quesada 52fd559fa6 Merge pull request #9134 from ricardoquesada/std_swap 
Using std::swap instead of CC_SWAP
 2014-11-16 09:29:39 -08:00
Ricardo Quesada dcc4c46d5b Using std::swap instead of CC_SWAP 
CC_SWAP is deprecated. Use `std::swap` instead.
 2014-11-16 09:29:05 -08:00
Ricardo Quesada a893cc9b30 ooops 
commited by mistake debug messages
 2014-11-14 15:33:13 -08:00
Ricardo Quesada a5255a7154 Merge pull request #9126 from ricardoquesada/v21_externals 
externals: using v21
 2014-11-14 15:32:22 -08:00
Ricardo Quesada 8fd633926f externals: using v21 2014-11-14 15:31:48 -08:00
Ricardo Quesada ac5ffea643 Merge pull request #9101 from super626/v3 
Add uv animation test
 2014-11-14 14:18:37 -08:00
Ricardo Quesada bc0c3d5a3f Merge pull request #9085 from jicheol-ryu/v3 
fix bug - potential memory leak.
 2014-11-14 14:17:13 -08:00
Ricardo Quesada d6b656c9ed Merge pull request #9125 from CocosRobot/update_cocosfiles_1415999444 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-14 14:14:42 -08:00
CocosRobot c227ba9e40 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-14 21:10:45 +00:00
Ricardo Quesada 4ab77acd57 Merge pull request #9124 from ricardoquesada/compiler_warnings 
fixes compiler warnings
 2014-11-14 13:08:11 -08:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00