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

27353 Commits

Author SHA1 Message Date
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
Ray 80a5b201f8 3DNode Reader lua Test 2015-02-19 17:28:51 +08:00
Ray 73e40f1c4b Node3DReader Test 2015-02-19 16:18:54 +08:00
Ray 2f01deee89 3D Editor Reader 
Node3DReader
 2015-02-19 12:08:09 +08:00
minggo 1b482b2c3f Merge pull request #10516 from MSOpenTech/wp8-v3 
Added missing Particle3D files and tests to WP8 and Universal App projects
 2015-02-17 21:47:20 +08:00
minggo 6433c0feca Merge pull request #10512 from super626/particle_merge 
load all materials for linux
 2015-02-17 21:46:24 +08:00
Dale Stammen 0801160a37 added precompiled Particle3D shaders 2015-02-16 11:28:24 -08:00
Dale Stammen 76233d4c6e added missing Particle3D files and tests 2015-02-16 10:41:03 -08:00
Dale Stammen 795f65c85f added missing Particle3D files and tests 2015-02-16 10:01:09 -08:00
yangxiao a50efe998f fix compile 2015-02-16 11:57:07 +08:00
yangxiao bdd7da89a1 add header 2015-02-16 11:26:06 +08:00
yangxiao 6c73e22a32 variable name error 2015-02-16 11:18:54 +08:00
yangxiao 180cee96d8 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-02-16 10:04:53 +08:00
yangxiao 5c8fbcedab load all materials linux routine 2015-02-16 10:03:58 +08:00
minggo 16ac6c2709 Merge pull request #10510 from CocosRobot/update_cocosfiles_1424001603 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-15 20:02:24 +08:00
CocosRobot 83fed82923 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-15 12:00:05 +00:00
minggo 15c256c0c4 Merge pull request #10509 from CocosRobot/update_lua_bindings_1424001103 
[AUTO]: updating luabinding automatically
 2015-02-15 19:56:34 +08:00
CocosRobot 6a91450f7c [AUTO]: updating luabinding automatically 2015-02-15 11:53:55 +00:00
minggo dbe4ac6e9b Merge pull request #10507 from CocosRobot/update_cocosfiles_1424001009 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-15 19:53:46 +08:00
CocosRobot 33be077835 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-15 11:50:10 +00:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
minggo 638fa834f9 [ci skip]update CHANGELOG 2015-02-15 19:07:54 +08:00
minggo 7d9527280c [ci skip]update AUTHORS 2015-02-15 19:06:59 +08:00
minggo d5e82521de Merge pull request #10359 from flamefox/3dattachnode 
getAttachNode should failed when there is no bone with name
 2015-02-15 19:03:52 +08:00
minggo dd7d8a61ef Merge pull request #8980 from fspadoni/v3 
CCPhysicsWorld.cpp Remove cpArbiterIgnore call from collisionPreSolveCallback
 2015-02-15 18:58:17 +08:00
XiaoYang 9e7b22f35c Merge pull request #239 from samuele3hu/particle_merge 
Fix the search path error
 2015-02-15 18:38:16 +08:00
samuele3hu 9be620043f Fix the search path error 2015-02-15 18:29:10 +08:00
yangxiao 10a8613b36 android properties to 10 2015-02-15 17:22:39 +08:00
yangxiao 2f8c8ffb5a Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-02-15 16:53:38 +08:00
yangxiao f71b432d1d fix render release bug 2015-02-15 16:52:20 +08:00
yangxiao d34a9f68f2 check ParticleModelRender to avoid crash 2015-02-15 16:39:58 +08:00
XiaoYang c27a397a1d Merge pull request #238 from samuele3hu/particle_merge 
Add Particle3DTest for Lua and update related configure files
 2015-02-15 16:25:48 +08:00
samuele3hu 3a7cbe9d67 Add Particle3DTest for Lua and update related configure files 2015-02-15 15:56:20 +08:00
yangxiao a9384a3250 add particle3dtest 2015-02-15 13:26:29 +08:00
yangxiao 5547d85add missing file 2015-02-15 11:41:14 +08:00
yangxiao f9f532ef65 missing file 2015-02-15 11:16:46 +08:00
yangxiao 33a0cc310a wrong filename 2015-02-15 11:01:11 +08:00
yangxiao 9153dd5cc3 add particle to lua binding 2015-02-13 18:27:32 +08:00
yangxiao 6172302a9b ref path add extensions 2015-02-13 16:57:00 +08:00
minggo 3c5b22b8d2 Merge pull request #10497 from perminovVS/v3 
Fix visual studio project out of date
 2015-02-13 16:23:25 +08:00
yangxiao 51ae806700 remove unused code 2015-02-13 16:19:38 +08:00
Vladimir Perminov 9f5efe5153 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-02-13 11:18:14 +03:00
yangxiao 0f27e0c31a add to ext.h 2015-02-13 16:16:30 +08:00
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
minggo f77cafb7ce Merge pull request #10267 from kompjoefriek/indent-consistency 
fixed indentation of Python files
 2015-02-13 15:36:20 +08:00
minggo 4684500987 Merge pull request #10493 from gravitation1/v3 
Cleaned up CCAction.cpp
 2015-02-13 15:29:55 +08:00
minggo eb0a66d091 Merge pull request #10494 from SunLightJuly/v3_fix_bug 
called initGLContextAttrs()  before create glview
 2015-02-13 14:01:42 +08:00
SunLightJuly aaf6ad03c8 called initGLContextAttrs() before create glview 2015-02-13 13:45:15 +08:00
Justin Fraize 3667cc6e1f Cleaned up CCAction.cpp 
*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
 2015-02-12 21:00:12 -08:00
minggo 87e444873f Merge pull request #10268 from kompjoefriek/Fixing-warnings 
Fixed some compiler warnings
 2015-02-13 10:04:19 +08:00