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

24164 Commits

Author SHA1 Message Date
songchengjiang 39deb73c3a move light from 3d to base(Windows) 2014-09-28 17:23:25 +08:00
yangxiao e8904454e9 add to template 2014-09-28 16:08:05 +08:00
yangxiao 38873dd999 move light fix linux and android 2014-09-28 16:05:20 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
yangxiao 744e09c141 reset change to getDirectionInWorld 2014-09-28 11:03:18 +08:00
yangxiao 53dee7ef86 can ci android compile? 2014-09-28 10:21:47 +08:00
yangxiao 75e5ca30ee merge cocos 2014-09-28 09:55:31 +08:00
minggo 99064b091f Merge pull request #8164 from super626/v3 
move logic about camera from Director to scene
 2014-09-26 23:29:58 +08:00
yangxiao 1e5a02df2b add to template 2014-09-26 23:13:20 +08:00
minggo 0b0f2f2dad Merge pull request #8173 from samuele3hu/v3_check_lua 
Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement
 2014-09-26 22:30:42 +08:00
yangxiao abd960725a add to linux project 2014-09-26 16:54:01 +08:00
yangxiao c335df1071 fix normal flag check error 2014-09-26 16:46:15 +08:00
samuele3hu 2ac96ed06e Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement 2014-09-26 16:39:54 +08:00
yangxiao fd35d43510 remove unused resource 2014-09-26 15:57:18 +08:00
yangxiao 11a7bf8697 ligthmask to unsigned int 2014-09-26 15:52:04 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
minggo a61352f624 Merge pull request #8170 from CocosRobot/update_cocosfiles_1411714811 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-26 15:09:29 +08:00
yangxiao d69b6558c4 lua 2014-09-26 15:07:23 +08:00
CocosRobot 87c04a3e5d [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-26 07:00:12 +00:00
minggo 9631222680 Merge pull request #8169 from CocosRobot/update_lua_bindings_1411710233 
[AUTO]: updating luabinding automatically
 2014-09-26 14:57:49 +08:00
yangxiao db2ff49f26 adjust according to minggo 2014-09-26 14:13:26 +08:00
CocosRobot 963c02eb3d [AUTO]: updating luabinding automatically 2014-09-26 05:45:33 +00:00
minggo c9acea05ab Merge pull request #8168 from hongliang-goudou/dpi 
export lua function "cc.Device::getDPI()"
 2014-09-26 13:40:26 +08:00
Hong Liang 1c71234921 export lua function "cc.Device::getDPI()" 2014-09-26 11:52:52 +08:00
minggo 0cbe889030 [ci skip] Update CHANGELOG 2014-09-26 11:51:59 +08:00
minggo 7d33aef5cb Merge pull request #8156 from samuele3hu/v3_check_lua 
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
 2014-09-26 11:49:09 +08:00
minggo 3bcc3e014d Merge pull request #8166 from minggo/rename-macro 
CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION
 2014-09-26 11:15:31 +08:00
minggo 9ccc49494f Merge pull request #8152 from CocosRobot/update_lua_bindings_1411624004 
[AUTO]: updating luabinding automatically
 2014-09-26 11:02:22 +08:00
minggo 995b09cb28 [ci skip] Update CHANGELOG 2014-09-26 11:01:18 +08:00
minggo 963f9855fa Merge pull request #8165 from minggo/remove-armv7s 
remove armv7s support on iOS
 2014-09-26 10:58:41 +08:00
minggo bd56a71b1b CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION 2014-09-26 10:44:29 +08:00
minggo ebf0562b84 remove armv7s support on iOS 2014-09-26 10:35:50 +08:00
yangxiao 6626655308 move render logic from Director to scene 2014-09-26 09:36:43 +08:00
yangxiao e2f1b91117 remove unused variable 2014-09-25 22:25:43 +08:00
yangxiao 90523fc3d5 fix light check 2014-09-25 22:24:47 +08:00
yangxiao 02489ecad6 add light to cocos2d.h 2014-09-25 22:18:50 +08:00
minggo b0212ad62a Merge pull request #8159 from CocosRobot/update_cocosfiles_1411639554 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-25 18:37:03 +08:00
yangxiao ca9eb3d203 support ambient light without normal & optimaze code 2014-09-25 18:32:33 +08:00
CocosRobot 1f2fc054fe [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-25 10:05:55 +00:00
minggo 615b367277 Merge pull request #8158 from dabingnn/v3_neon 
V3 neon
 2014-09-25 18:02:46 +08:00
yangxiao 8f3f37c2bb auto switch shader according to light status 2014-09-25 17:13:46 +08:00
Huabing.Xu af0c9ce2fa reverse target=android-10 on android 2014-09-25 16:54:33 +08:00
yangxiao bf84aba47e do not add ambient color by default 2014-09-25 16:27:31 +08:00
yangxiao 2317720fd2 move uniformnames to cpp 2014-09-25 16:18:55 +08:00
Huabing.Xu ed9848a782 neon works on android(only on armeabi-v7a) 2014-09-25 16:09:28 +08:00
yangxiao eab0951c2d reset 2014-09-25 16:07:57 +08:00
yangxiao 567c632d98 config max support light number in shader 2014-09-25 15:29:32 +08:00
samuele3hu 3e5638fe91 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_lua 2014-09-25 15:17:55 +08:00
samuele3hu 23fb2062c9 Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector 2014-09-25 15:05:42 +08:00
minggo 22d27fca3b Merge pull request #8155 from CocosRobot/update_lua_bindings_1411627694 
[AUTO]: updating luabinding automatically
 2014-09-25 14:56:55 +08:00