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

33304 Commits

Author SHA1 Message Date
zilongshanren ed55d41858 fix label clamp when scaled with bmfont 2015-12-02 13:48:20 +08:00
pandamicro 70dd2af5d5 Merge pull request #14518 from mogemimi/fix-memory-leak-texture-cache 
Fix memory leak when initWithImage() failed
 2015-12-02 10:20:04 +08:00
pandamicro 0efc186412 Merge pull request #14541 from CocosRobot/update_lua_bindings_1449021640 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-02 10:13:28 +08:00
CocosRobot 0c67171b9d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-02 02:05:32 +00:00
xiaofeng11 18666a9b41 Merge pull request #14393 from xiaofeng11/v3_combine_3d 
Combine Studio change for 3d components
 2015-12-02 09:47:12 +08:00
pandamicro b15935b999 Merge pull request #14537 from pandamicro/v3 
Correct bindings generator ref
 2015-12-02 00:21:08 +08:00
pandamicro df62e92d7b Correct bindings generator ref 2015-12-01 23:50:52 +08:00
pandamicro 34429f63a7 Merge pull request #14535 from CocosRobot/update_cocosfiles_1448984232 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-12-01 23:45:58 +08:00
CocosRobot c0393ece7d [AUTO][ci skip]: updating cocos2dx_files.json 2015-12-01 15:37:14 +00:00
pandamicro 83630d17c9 Merge pull request #14534 from xiaofeng11/v3_combine_JsLuaSim 
V3 combine lua-binding, jsb, and simulator
 2015-12-01 23:34:05 +08:00
XiaoFeng e5d57b4fa2 update binding-generator sub module & code 2015-12-01 22:30:36 +08:00
XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim 
Conflicts:
	cocos/scripting/js-bindings/manual/js_manual_conversions.h
 2015-12-01 15:12:32 +08:00
XiaoFeng 167aa9b648 Update console sub-module, update project template.json to meet file position change 2015-12-01 15:00:45 +08:00
zilongshanren 6db6e596bb Merge pull request #14527 from CocosRobot/update_lua_bindings_1448944051 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-01 13:42:55 +08:00
CocosRobot e891b03eee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-01 04:32:19 +00:00
pandamicro 81f590e52a Merge pull request #14478 from pandamicro/v3 
Improved JS bindings with more secured memory management
 2015-12-01 12:24:21 +08:00
mogemimi d539e6c797 Fix memory leak when initWithImage() failed 2015-12-01 12:48:54 +09:00
pandamicro 08837955a7 Skip Useless MenuItemToggle::initWithCallback to fix windows compilation issue 2015-11-30 23:54:42 +08:00
xiaofeng11 ea5463927e Merge pull request #24 from liamcindy/pull_14393 
fix compile error
 2015-11-30 17:37:29 +08:00
Liam 34da2aabb2 fix compile error 2015-11-30 17:34:49 +08:00
xiaofeng11 423726995c Merge pull request #23 from liamcindy/pull_14393 
update sprite 3d test
 2015-11-30 16:56:33 +08:00
pandamicro 17bdfb4050 Fix android compilation issue 2015-11-30 15:20:57 +08:00
Liam 4d379ed9bd revert ccplane 2015-11-30 14:53:37 +08:00
Liam e0349ae975 update sprite 3d test 2015-11-30 14:48:19 +08:00
XiaoFeng cbbfc69ad4 Add missing studio change for Director::drawScene 2015-11-30 11:19:02 +08:00
zilongshanren 9ff7069d2e Merge pull request #14514 from zilongshanren/fixIssue14477 
fix Keyboard fails to hide on iOS.
 2015-11-28 16:22:30 +08:00
zilongshanren e1751db195 Update CHANGELOG 2015-11-28 15:41:42 +08:00
zilongshanren 60624b8fd5 fix Keyboard fails to hide on iOS. 
ticket: https://github.com/cocos2d/cocos2d-x/issues/14477
 2015-11-28 15:37:58 +08:00
zilongshanren fdfff2205b Merge pull request #14512 from CocosRobot/update_cocosfiles_1448692208 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-28 14:33:43 +08:00
zilongshanren 6939e61397 Merge pull request #14511 from CocosRobot/update_cocosfiles_1448692139 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-28 14:33:34 +08:00
zilongshanren d4f932953f Merge pull request #14513 from CocosRobot/update_cocosfiles_1448692279 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-28 14:33:18 +08:00
CocosRobot 467177f45c [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-28 06:31:21 +00:00
CocosRobot a839e8d307 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-28 06:30:10 +00:00
zilongshanren 4fbe8a62bf Update CHANGELOG 2015-11-28 14:29:40 +08:00
CocosRobot 3510228659 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-28 06:29:01 +00:00
zilongshanren 5e02b7f20a Update CHANGELOG 2015-11-28 14:28:44 +08:00
zilongshanren 01e619f686 Merge pull request #14476 from cesarpachon/linuxAudioEngine 
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudio…
 2015-11-28 14:27:15 +08:00
xiaofeng11 fdd3bacde1 Merge pull request #14509 from pmaloman/v3_Wrong_assert_in_ComponentContainer 
Fixed assert statement. Added name to physic component.
 2015-11-28 13:33:38 +08:00
zilongshanren 2571b87bda Merge pull request #14505 from xiaofeng11/v3_iOSFix 
Fix keyboard won't dismiss on iOS issue
 2015-11-28 11:41:41 +08:00
pandamicro 43c68aa16b Fix Chipmunk bindings issue 2015-11-27 22:38:16 +08:00
PavlOm 6e0525156b no message 2015-11-27 23:33:20 +10:00
XiaoFeng 150d907636 Add missing changes to Particle 3d 2015-11-27 19:01:30 +08:00
zilongshanren f1ddef6fd9 Merge pull request #14508 from CocosRobot/update_lua_bindings_1448616961 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-27 18:37:05 +08:00
zilongshanren 2109ef8d56 Merge pull request #14507 from CocosRobot/update_lua_bindings_1448616906 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-27 18:36:54 +08:00
CocosRobot 1d581264df [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-27 09:42:17 +00:00
CocosRobot 5c9084fd7d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-27 09:41:59 +00:00
zilongshanren 9639208ce3 Update CHANGELOG 2015-11-27 17:32:31 +08:00
zilongshanren 0f8c3e0c1c Merge pull request #14435 from zilongshanren/improve-label-layout-v2 
Add Overflow to Label
 2015-11-27 17:31:40 +08:00
xiaofeng11 0ce66160c0 Merge pull request #14503 from xpol/remove-log-in-ccs-loader 
Remove boring logs in cocos studio supporting module.
 2015-11-27 17:20:54 +08:00
XiaoFeng 71871bacf9 Add aabb dirty mark when load from file 2015-11-27 15:53:26 +08:00