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

28008 Commits

Author SHA1 Message Date
minggo 73a39d0966 Merge pull request #9688 from pipu/modify_warning 
Modify warning code.
 2014-12-30 10:07:41 +08:00
minggo f3d91f8b79 Merge pull request #9692 from dabingnn/v3_perf 
optimize rendering code
 2014-12-30 10:07:17 +08:00
yusheng.lu 505a4e8ab0 Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file. 
Removed the version compatible control code before.
 2014-12-29 19:37:53 +08:00
Huabing.Xu 2348e5c247 optimize rendering code 2014-12-29 18:45:55 +08:00
pipu d3783cba95 Modify warning code. 2014-12-29 17:04:23 +08:00
XiaoYang e8c5e74759 Merge pull request #198 from sifenzhu/v3 
Merge pull request #2 from super626/v3
 2014-12-29 15:47:47 +07:00
Thomas Hou cfa9f039ec change light direct for good look. 2014-12-29 16:43:48 +08:00
Thomas Hou 1502d32aac use std math library M_PI instead of pi. 2014-12-29 16:24:31 +08:00
minggo 6cac4dd512 Merge pull request #9685 from CocosRobot/update_lua_bindings_1419832193 
[AUTO]: updating luabinding automatically
 2014-12-29 16:04:35 +08:00
minggo 7db279220c Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3 2014-12-29 15:04:43 +08:00
yangxiao 060c6ee0b7 add quaternion test 2014-12-29 14:36:25 +08:00
minggo 3f5c089106 Merge pull request #9684 from CocosRobot/update_cocosfiles_1419832109 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-29 14:13:03 +08:00
CocosRobot 75436db583 [AUTO]: updating luabinding automatically 2014-12-29 05:51:45 +00:00
CocosRobot e7a7ee750f [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 05:48:30 +00:00
minggo f673664851 Merge pull request #9683 from dualface/v3_origin 
add UIWidget support, fix typo
 2014-12-29 13:46:50 +08:00
dualface 82c40ca5e8 add Cocos Studio support 2014-12-29 13:41:21 +08:00
dualface 653b15b4b8 add UIWidget support, fix typo 2014-12-29 13:37:20 +08:00
minggo 7ab4e0de3a Merge pull request #9634 from andyque/fixIssue9628 
fix setTitleColor calls method setColor instead of setTextColor of title label.
 2014-12-29 11:24:36 +08:00
minggo 216f0d5a31 [ci skip] Update CHANGELOG 2014-12-29 11:20:02 +08:00
minggo f1b014327f Merge pull request #9678 from dualface/update_lua_templates 
Update lua templates
 2014-12-29 11:01:14 +08:00
dualface 40acc98f14 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates 2014-12-29 10:58:42 +08:00
minggo 24fc26fb5d Merge pull request #9679 from super626/frustum 
Release note for Frustum
 2014-12-29 10:57:24 +08:00
dualface 0acdd4f4a3 cleanup lua-template-runtime 2014-12-29 10:55:05 +08:00
yangxiao 0963b3d86e add comment 2014-12-29 10:51:16 +08:00
yangxiao d34927f9da add frustum to release note 2014-12-29 10:50:57 +08:00
dualface 954f170e9e remove chinese comments 2014-12-29 10:44:16 +08:00
minggo b915bf7a76 Merge pull request #9677 from CocosRobot/update_cocosfiles_1419820318 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-29 10:34:11 +08:00
minggo d7dfdc9124 Merge pull request #9417 from lite3/spriteretainframe 
retain the sprite frame in sprite
 2014-12-29 10:33:42 +08:00
CocosRobot b385ce58d0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 02:31:59 +00:00
minggo 67ae66a90e Merge pull request #9663 from dualface/update_lua_corelib 
update lua corelib
 2014-12-29 10:30:50 +08:00
minggo 9d993fbbd4 Merge pull request #9676 from CocosRobot/update_lua_bindings_1419818723 
[AUTO]: updating luabinding automatically
 2014-12-29 10:09:43 +08:00
CocosRobot 35774cc0f6 [AUTO]: updating luabinding automatically 2014-12-29 02:07:20 +00:00
minggo 87a9039065 Merge pull request #9660 from yinjimmy/newLuaRuntime 
add new lua runtime
 2014-12-29 10:04:02 +08:00
minggo d95d8d98e3 Merge pull request #9672 from CocosRobot/update_lua_bindings_1419817593 
[AUTO]: updating luabinding automatically
 2014-12-29 10:03:00 +08:00
minggo 212684fcd4 Merge pull request #9665 from andyque/fixLibpngWarning 
Fix libpng warning
 2014-12-29 10:00:43 +08:00
minggo 06cd28f524 Merge pull request #9618 from yinjimmy/bindAddress 
support bind address for console
 2014-12-29 09:52:01 +08:00
CocosRobot 4172e7ad7f [AUTO]: updating luabinding automatically 2014-12-29 01:49:00 +00:00
minggo 9c5df0a5cf Merge pull request #9671 from CocosRobot/update_cocosfiles_1419817500 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-29 09:48:46 +08:00
minggo 206aa94ff2 Merge pull request #9667 from SunLightJuly/fix_crash_when_display_FPS 
fixed bug which caused crash when display FPS
 2014-12-29 09:45:30 +08:00
CocosRobot 0a4785d6fc [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 01:45:01 +00:00
minggo b01b25e17e Merge pull request #9558 from super626/frustum 
Frustum Culling
 2014-12-29 09:43:14 +08:00
minggo ae416decd4 Merge pull request #9659 from misoclub/v3 
README typo
 2014-12-29 09:42:33 +08:00
minggo a8ac3df48c Merge pull request #9651 from CocosRobot/update_lua_bindings_1419581293 
[AUTO]: updating luabinding automatically
 2014-12-29 09:17:15 +08:00
minggo 2b0e287b5f Merge pull request #9656 from geron-cn/v3_actionline_animationlist 
fix: auto add search path for armaturenodereader
 2014-12-29 09:17:01 +08:00
yinjimmy e75d283455 1. do not setFrameSize when resetDesignResolution 
2. read config.json when ConfigParser init
 2014-12-29 09:16:07 +08:00
dualface a4d17998d3 update lua-template-runtime 2014-12-29 05:55:56 +08:00
dualface 2ba25a473f update lua-default-template 2014-12-29 05:51:49 +08:00
dualface 8d99d8a78e fix typo 2014-12-29 05:47:37 +08:00
dualface 9684d6e164 update corelib 2014-12-29 05:41:13 +08:00
dualface 74daae1c39 update framework 2014-12-29 01:58:16 +08:00