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

33034 Commits

Author SHA1 Message Date
zhangcheng 39f68e9885 Update ccs-res submodule to the latest. 2015-11-03 13:08:56 +08:00
hugo 0dd0233ba7 update sdkbox console 2015-11-03 13:06:09 +08:00
pandamicro 873f83579f Merge pull request #14296 from geron-cn/v3 
update submodule cocos2d-console
 2015-11-03 10:52:54 +08:00
mogemimi 8f632365c3 Fix typos in documentation 2015-11-03 04:43:44 +09:00
geron-cn c6feb3d34d update submodule cocos2d-console 2015-11-02 17:49:26 +08:00
XiaoFeng 218b5625bf Fix can not start js project with simulator in CodeIDE 2015-11-02 17:36:47 +08:00
pandamicro f76b941415 Merge pull request #14293 from xiaofeng11/v3_23634 
Remove redundancy code
 2015-11-02 17:00:18 +08:00
XiaoFeng 8e6e46d596 Fix "BillBoard Test->Rotation Test" won't resume after switch back from background. 2015-11-02 14:50:45 +08:00
XiaoFeng 0c8aed8a1a Remove redundancy code 2015-11-02 13:40:08 +08:00
pandamicro be02cbdf2c Merge pull request #14283 from pandamicro/v3 
Improve js templates with noCache and cc.view.setRealPixelResolution docs
 2015-11-01 18:49:47 +08:00
pandamicro 841bfc75d8 Merge pull request #14280 from jwvg0425/v3 
CREATE_FUNC macro NULL -> nullptr
 2015-11-01 18:40:55 +08:00
pandamicro 0d6bf3263b Improve js templates with noCache and cc.view.setRealPixelResolution docs 2015-11-01 18:33:05 +08:00
namhyeonuk 7fe2b87574 CREATE_FUNC macro NULL -> nullptr 2015-10-31 20:18:39 +09:00
pandamicro 6115e92284 Merge pull request #14273 from pandamicro/v3 
[ci skip] Solve auto bindings conflict
 2015-10-30 18:20:37 +08:00
pandamicro ceac154d6d Merge branch 'update_lua_bindings_1446197699' of https://github.com/CocosRobot/cocos2d-x into v3 
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
 2015-10-30 18:19:22 +08:00
CocosRobot 8d06cee512 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-30 09:40:12 +00:00
pandamicro 5cbd3e04ef Merge pull request #14271 from pandamicro/v3 
[ci skip]Update web engine ref
 2015-10-30 17:31:35 +08:00
pandamicro 6ff39ec56e Update web engine ref 2015-10-30 17:30:46 +08:00
pandamicro c80f523637 Merge pull request #14269 from pandamicro/v3 
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
 2015-10-30 17:20:58 +08:00
pandamicro 246eab11a1 Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser 2015-10-30 17:19:21 +08:00
pandamicro b58e656620 Merge pull request #14264 from super626/v3 
Fix: Mesh::setGLProgramState may modify state block
 2015-10-30 10:11:23 +08:00
yangxiao 11f5e6cf96 setGLProgramState should not modify state block 2015-10-29 14:22:13 +08:00
yangxiao 16d9cf1af9 setStateBlock implement 2015-10-29 14:21:25 +08:00
pandamicro c0ecf7f7aa Merge pull request #14262 from liamcindy/3.9_light_js 
update for light3d js reader
 2015-10-29 13:52:33 +08:00
pandamicro 617f5265f1 Merge pull request #14256 from pandamicro/v3 
Use generational gc friendly API in JSTouchDelegate
 2015-10-29 12:34:42 +08:00
pandamicro ac54c9b7de Merge pull request #14261 from liamcindy/3.9_light 
update for light3d reader
 2015-10-29 10:08:32 +08:00
unknown f2f6d25408 update for light3d js reader 2015-10-29 10:04:56 +08:00
unknown 917edbcf62 update for light3d reader 2015-10-29 09:53:54 +08:00
pandamicro b66fa04c21 Merge pull request #14255 from xiaofeng11/v3_23634 
Fix "UItest->UicheckBox" display status, make it same as C++ version
 2015-10-28 18:32:49 +08:00
pandamicro 2dde476aa5 Update web engine reference 2015-10-28 18:11:29 +08:00
XiaoFeng 53d2874507 Fix "UItest->UicheckBox" display status, make it same as C++ version 2015-10-28 17:38:17 +08:00
pandamicro 7d832b0753 Merge pull request #14238 from pandamicro/v3 
Add cc.Director.EVENT_BEFORE_UPDATE
 2015-10-28 15:50:37 +08:00
pandamicro 15e400fb2e Merge pull request #14248 from xiaofeng11/v3_23634 
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
 2015-10-28 15:49:52 +08:00
pandamicro 06b828250a Merge pull request #14241 from yuyangame/patch-1 
fix cc.game.config['showFPS'] bug
 2015-10-28 15:48:21 +08:00
pandamicro 893edbaf24 Merge pull request #14246 from WenhaiLin/v3.9 
Fixed text may display of incomplete when Label create with system font on Mac.
 2015-10-28 15:47:45 +08:00
pandamicro b6b9364a84 Merge pull request #14232 from xiaofeng11/v3 
Fix FadeOutDownTilesTest won't show last tile
 2015-10-28 15:44:28 +08:00
XiaoFeng 80b2def648 Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status. 2015-10-28 14:12:24 +08:00
pandamicro 5a963c66cd Merge pull request #14240 from neokim/android_test_app_landscape_reversible 
Change the android test app to be landscape reversible.
 2015-10-28 13:03:33 +08:00
pandamicro 13f26728a8 Merge pull request #14244 from CocosRobot/update_lua_bindings_1446002663 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-28 13:01:36 +08:00
WenhaiLin 7b758fd780 Fixed text may display of incomplete when Label create with system font on Mac. 2015-10-28 12:06:58 +08:00
pandamicro 68d75a519a Use generational gc friendly API in JSTouchDelegate 2015-10-28 11:55:28 +08:00
CocosRobot 09cbc2145d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-28 03:29:16 +00:00
pandamicro 4dff2c90e4 Merge pull request #14243 from xiaofeng11/v3_23634 
Bug fix
 2015-10-28 11:21:31 +08:00
XiaoFeng c55f030218 Fix "Test change animation intenal" under js test can not change back to 60fps 2015-10-28 11:18:12 +08:00
Kvial 27773b6f1a fix cc.game.config['showFPS'] bug 
```javascript
//project.json
{
...
'showFPS' : false,
...
}
```

```javascript
//CCBoot.js
...
config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true
...
```
 2015-10-27 20:36:05 +08:00
Neo Kim 11b46a7b04 Change the android test app to be landscape reversible. 2015-10-27 20:43:56 +09:00
XiaoFeng 6029635493 Remove comment out codes 2015-10-27 18:43:51 +08:00
pandamicro 616eae2b6d Add cc.Director.EVENT_BEFORE_UPDATE 2015-10-27 17:32:57 +08:00
pandamicro 0dc42bd9a7 Merge pull request #14237 from CocosRobot/update_lua_bindings_1445937936 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-27 17:32:12 +08:00
pandamicro 535c4bcd1d Merge pull request #14236 from CocosRobot/update_lua_bindings_1445937846 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-27 17:31:43 +08:00