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

25494 Commits

Author SHA1 Message Date
yangxiao dd3a312eeb Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-09-19 11:24:47 +08:00
yangxiao 650f810815 add obb by default 2014-09-19 11:22:37 +08:00
yangxiao c4d25d318f light config 2014-09-19 11:11:23 +08:00
XiaoYang ab94739925 Merge pull request #131 from songchengjiang/light_new 
Move Light Uniforms into Meshcommand
 2014-09-19 11:07:11 +08:00
songchengjiang f052e45c04 Move Light Uniforms into Meshcommand 2014-09-19 10:54:07 +08:00
Jeff 2ffbe23c50 The files name: modify underline to hyphen 2014-09-19 10:24:17 +08:00
XiaoYang af217c498a Merge pull request #130 from songchengjiang/light_new 
Finished light reconstruction
 2014-09-19 09:45:49 +08:00
cpascal c527d7476b Fixed compile error when I turned off physics definitions. 
Fixed the following compile error.
cocos2d\extensions\physics-nodes\ccphysicssprite.cpp(305): error C4716:
'cocos2d::extension::PhysicsSprite::getRotation' : must return a value
and more..

Conditions:
CC_USE_PHYSICS = 0
CC_ENABLE_CHIPMUNK_INTEGRATION = 0
CC_ENABLE_BOX2D_INTEGRATION = 0
 2014-09-19 01:35:01 +09:00
Jeff e4e2cea97a link error 2014-09-18 19:59:22 +08:00
Jeff 476ede6ccb link error 2014-09-18 19:56:53 +08:00
songchengjiang 62777e9552 compile Android 2014-09-18 18:35:18 +08:00
songchengjiang b9ceccda74 Format 2014-09-18 18:07:20 +08:00
songchengjiang 3c67515378 Finished light reconstruction 2014-09-18 16:38:35 +08:00
Jeff 6152b70945 LE 2014-09-18 16:33:46 +08:00
minggo d997201473 Merge pull request #8100 from cocoscodeide/v3 
fix:runtime crash when upload file to Mac/Win32
 2014-09-18 16:08:21 +08:00
minggo 7c8e1c9de5 Merge pull request #8099 from super626/billboard 
Transparent Queue adjustment
 2014-09-18 16:07:54 +08:00
minggo d6e086d4dd Merge pull request #8098 from CocosRobot/update_lua_bindings_1411009391 
[AUTO]: updating luabinding automatically
 2014-09-18 16:06:52 +08:00
minggo daf5f65e86 Merge pull request #8102 from dabingnn/v3_optimiseParticleRendering 
optimise update of particle system for free mode
 2014-09-18 16:05:58 +08:00
Jeff 0ee4ee03c1 CE 2014-09-18 16:00:18 +08:00
SunLightJuly f9fbb1b789 call getCascadeBoundingBox() properly 2014-09-18 15:40:28 +08:00
SunLightJuly 855d8d7a72 moved getCascadeBoundingBox() to utils 2014-09-18 15:27:11 +08:00
Huabing.Xu cf4d0faad3 optimise update of particle system for free mode 2014-09-18 15:24:27 +08:00
Jeff 418ec69abf compile error 2014-09-18 15:18:30 +08:00
SunLightJuly 1af68e9274 replaced "NULL" with "nullptr" 2014-09-18 14:30:21 +08:00
Jeff ac6b83f8f9 fix compile error 2014-09-18 14:22:40 +08:00
Jeff c5cc16336a fix compile error 2014-09-18 14:04:54 +08:00
SunLightJuly ff776d813b added Node::getCascadeBoundingBox() 2014-09-18 13:11:10 +08:00
honghui 11c0d6ff25 fix:runtime crash when upload file to Mac/Win32 2014-09-18 12:40:26 +08:00
yangxiao 720264fb98 add comment 2014-09-18 12:04:42 +08:00
yangxiao 25091ca849 add transparent flag to render command 2014-09-18 12:00:44 +08:00
Jeff b9ec99d7f4 compile error & code spelling error 
1.fix compile error on win32
2.modify spelling error
 2014-09-18 11:52:23 +08:00
CocosRobot 7920ff425b [AUTO]: updating luabinding automatically 2014-09-18 03:05:04 +00:00
minggo 35acdc2284 Merge pull request #8089 from cocoscodeide/v3 
fix bug: response not been sent completely
 2014-09-18 11:00:38 +08:00
minggo 5e5129d0d1 Merge pull request #8085 from super626/v3 
Shared GLProgramState by default and Fix BillBoard Anchor Point
 2014-09-18 10:52:35 +08:00
minggo 442f30af1f Merge pull request #8091 from dabingnn/v3_PageTurnZFighting 
new version of avoid z fighting in pageTurn
 2014-09-18 10:50:31 +08:00
honghui 2027203d2e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-18 10:17:27 +08:00
Huabing.Xu 39c6f9bfbd remove setDepthTest(true) because it is not needed to be set for pageTurn 2014-09-18 10:00:36 +08:00
minggo 599903885f Merge pull request #8094 from slackmoehrle/patch-2 
Update README.md
 2014-09-18 09:22:44 +08:00
minggo 12299542ff Merge pull request #8095 from SteveKanter/patch-1 
Update CCDevice-ios.mm
 2014-09-18 09:22:02 +08:00
Steve Kanter 05f0f71cc5 Update CCDevice-ios.mm 
On iOS, Device::setKeepScreenOn(bool value) was ignoring the value and simply always disabling the timer.
 2014-09-17 14:52:30 -04:00
Jeff ed530454b2 fix compile error 2014-09-18 02:11:20 +08:00
Jeff 1dffbd0a7b fix link errors 2014-09-18 01:52:08 +08:00
slackmoehrle 2a54534291 Update README.md 
fixed spacing for Git instructions
 2014-09-17 10:36:00 -07:00
Jeff b5d481914f Merge branch 'v3_WebView_win32' of https://github.com/wohaaitinciu/cocos2d-x into v3_WebView_win32 2014-09-18 01:31:10 +08:00
Jeff e9c6f5d02b fix compile errors 2014-09-18 01:30:14 +08:00
Jeff Wang 9cb970be62 Update CocosGUI.h 2014-09-18 01:01:19 +08:00
Jeff 08e8963b1a fix compile errors 2014-09-18 00:04:48 +08:00
Jeff 27919dad77 add simple implement of WebView for win32 
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
 2014-09-17 22:30:15 +08:00
Jeff Wang 721311f106 Merge pull request #10 from cocos2d/v3 
update
 2014-09-17 19:19:19 +08:00
yangxiao 8c77130ae0 refactor light compile 2014-09-17 18:58:35 +08:00