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

24734 Commits

Author SHA1 Message Date
minggo 2ecfcee2a6 Merge pull request #8216 from Dhilan007/v3-audio-fix 
fix audio issues(log output:Too Many Objects) after play audio many times on Android
 2014-09-30 15:19:46 +08:00
minggo da01d67bc6 Merge pull request #8217 from CocosRobot/update_cocosfiles_1412061015 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-30 15:14:47 +08:00
minggo 769fd26196 Merge pull request #8218 from CocosRobot/update_lua_bindings_1412061095 
[AUTO]: updating luabinding automatically
 2014-09-30 15:14:08 +08:00
CocosRobot a96a2a992d [AUTO]: updating luabinding automatically 2014-09-30 07:13:25 +00:00
minggo f9005868d4 [ci skip] Update CHANGELOG 2014-09-30 15:11:51 +08:00
CocosRobot 181ef40285 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 07:10:16 +00:00
minggo d1a0adf1a9 Merge pull request #8200 from Dhilan007/v3-audio-win32 
New Audio Engine[Win32]
 2014-09-30 15:09:00 +08:00
Dhilan007 ed9c8b2693 fix audio issues(log output:Too Many Objects) after play audio many times. 2014-09-30 15:00:52 +08:00
Sergey Perepelitsa d9204b009e scale9Sprite without scale9enabled scale fix 
scale9Sprite crop >  border tile bug fix
 2014-09-30 10:59:20 +04:00
Dhilan007 90769ef242 fix compile error on win32 2014-09-30 14:40:24 +08:00
minggo e0169a8e37 Merge pull request #8214 from SunLightJuly/fix_lua_loader 
Fix lua loader
 2014-09-30 14:35:25 +08:00
Dhilan007 02fcb6488a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj
 2014-09-30 14:19:27 +08:00
SunLightJuly c108616a01 standardized codes 2014-09-30 13:17:03 +08:00
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
lite3 21081b9e1a use reference 2014-09-30 01:07:19 +08:00
Ricardo Quesada 7a1dac5aa6 Fixes audio issues when using CMake on Mac 2014-09-29 14:07:11 -03:00
lite3 240b922271 remove '../' at path on android. 
because AAssetManager_open do not support '../' in path.
 2014-09-29 19:31:05 +08: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