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

24466 Commits

Author SHA1 Message Date
SunLightJuly 4ba19791ed fixed bug in Cocos2dxLuaLoader 2014-09-30 13:11:39 +08:00
minggo e9ec051018 Merge pull request #8212 from minggo/fix-warning 
[ci skip]fix warnings
 2014-09-30 12:01:22 +08:00
minggo 804b26344e fix warnings 2014-09-30 11:58:38 +08:00
minggo 4fa63f9d12 Merge pull request #8210 from CocosRobot/update_cocosfiles_1412046934 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-30 11:17:59 +08:00
minggo ef221ce323 [ci skip] Update CHANGELOG 2014-09-30 11:17:03 +08:00
CocosRobot f834ae8d07 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 03:15:35 +00:00
minggo d1e41c771b Merge pull request #8162 from super626/light 
3D Light
 2014-09-30 11:13:59 +08:00
Dhilan007 db45794625 fix macro 2014-09-30 09:57:28 +08:00
Dhilan007 18307d52da fix macro 2014-09-30 09:48:24 +08:00
Dhilan007 7ebe4a5548 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/audio/AudioEngine.cpp
	cocos/audio/apple/AudioPlayer.h
	cocos/audio/include/AudioEngine.h
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
	tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
 2014-09-30 09:45:47 +08:00
minggo 39fa97f5d4 Merge pull request #8207 from CocosRobot/update_cocosfiles_1412014134 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-30 09:38:49 +08:00
minggo a4a15f87fa Merge pull request #8208 from ledenis/fix-copy-msvc 
Fix copy files in cpp-empty-test in MSVC build
 2014-09-30 09:37:31 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
boyu0 2b0afa6063 fix bug: physics crashes when remove/add children too quick. 2014-09-30 08:15:46 +08:00
ledenis 3d69e5e1d4 Fix copy files in cpp-empty-test in MSVC build 2014-09-29 22:08:41 +02:00
CocosRobot 2f35269bf9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 18:08:55 +00:00
Ricardo Quesada f1a01c5462 Merge pull request #8206 from ricardoquesada/cmake_mac_audio_fixes 
Fixes audio issues when using CMake on Mac
 2014-09-29 15:06:22 -03:00
Ricardo Quesada a16c5d5e43 Adds missing includes 2014-09-29 14:45:43 -03:00
Ricardo Quesada 7a1dac5aa6 Fixes audio issues when using CMake on Mac 2014-09-29 14:07:11 -03:00
minggo 09ebebc6d2 Merge pull request #8203 from dabingnn/v3_changeTabtoSpace 
change tab to space
 2014-09-29 18:47:22 +08:00
minggo b4d845c330 Merge pull request #8202 from CocosRobot/update_cocosfiles_1411986711 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-29 18:46:14 +08:00
Huabing.Xu 88679c2437 change tab to space 2014-09-29 18:44:01 +08:00
CocosRobot 13b165cf75 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 10:31:52 +00:00
minggo db9c5137a0 Merge pull request #8199 from CocosRobot/update_lua_bindings_1411985319 
[AUTO]: updating luabinding automatically
 2014-09-29 18:30:52 +08:00
minggo 0cd2f985e8 Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug 
fix egl config chooser bug
 2014-09-29 18:24:19 +08:00
Dhilan007 a895790d3c update configuration for resource dependence 2014-09-29 18:17:05 +08:00
CocosRobot 50a06a13ad [AUTO]: updating luabinding automatically 2014-09-29 10:11:17 +00:00
minggo f3fd6c8f5a [ci skip]Update Authors 2014-09-29 18:05:10 +08:00
minggo 4736124357 [ci skip] Update CHANGELOG 2014-09-29 18:04:10 +08:00
minggo 8a5829631d Merge pull request #8171 from huangshiwu/v3_Teivaz 
Enable screen orientation change handling - by Teivaz
 2014-09-29 18:02:03 +08:00
minggo f7fcb047aa [ci skip] Update CHANGELOG 2014-09-29 18:00:29 +08:00
minggo f4b080a03f Merge pull request #8192 from samuele3hu/v3_3D 
Add Camera3DTest ,BillBoradTest and more Sprite3DTest for Lua, and update the related lua bindings files
 2014-09-29 17:56:42 +08:00
minggo 736ce4d12d Merge pull request #8197 from cocoscodeide/v3 
change script file modified time will cause Cocos Code IDE reload file.
 2014-09-29 17:53:30 +08:00
minggo bfac4b4793 [ci skip]Update Authors 2014-09-29 17:53:10 +08:00
minggo f2fe4efdee [ci skip] Update CHANGELOG 2014-09-29 17:52:10 +08:00
minggo df0bfddcd5 Merge pull request #6984 from zhouxiaoxiaoxujian/improvement/COC-4 
Improvement ImageViewReader don't necessary loadTexture when imageFilePa...
 2014-09-29 17:49:38 +08:00
songchengjiang 9ba70ec7bf Sprite3DHitTest use BoundingBox 2014-09-29 16:57:45 +08:00
honghui 82eb6eeff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-29 16:28:18 +08:00
honghui 7a7a83020d change script file modified time will cause Cocos Code IDE reload file. 2014-09-29 16:27:13 +08:00
Frank.Xu 1c1d917620 Fix pull request #6894 merge conflicts 2014-09-29 16:22:55 +08:00
Dhilan007 65a14a6d3f Improved thread safety 2014-09-29 14:17:51 +08:00
minggo c4fac7b37d Merge pull request #8193 from andyque/improveCocostudioReader 
replace raw string literal with const external variables to keep consistence.
 2014-09-29 13:49:28 +08:00
minggo 6583bf6b1f Merge pull request #8179 from MSOpenTech/wp8-v3-fix 
WP8 fixes for v3.3 app certification tests
 2014-09-29 13:42:40 +08:00
songchengjiang a2a52348fd Finished Sprite3DHitTest 2014-09-29 11:43:52 +08:00
andyque c9b959ec82 replace raw string literal with const external variables to keep consistence. 2014-09-29 11:35:03 +08:00
samuele3hu 87fccd7881 Remove manaul lua-bindings for Armature::getOffsetPoints 2014-09-29 10:37:19 +08:00
samuele3hu cb38f6bd5b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-29 10:27:46 +08:00
samuele3hu 6ea43a60b0 Update cocos2dx.ini to skip Node::setAdditionalTransform 2014-09-29 10:19:32 +08:00
Dhilan007 f2f1331026 New Audio Engine[Win32] 2014-09-29 10:15:41 +08:00
minggo 804aa18bcf Merge pull request #8191 from CocosRobot/update_lua_bindings_1411953820 
[AUTO]: updating luabinding automatically
 2014-09-29 10:06:46 +08:00