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

33185 Commits

Author SHA1 Message Date
CocosRobot da9e8548a0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 17:29:11 +00:00
Ricardo Quesada b8f43f334d Merge pull request #14420 from xiaofeng11/v3_combine_particle3d 
Combine Studio change for particle 3d
 2015-11-25 09:20:47 -08:00
zilongshanren 4ce328212b Merge pull request #14481 from CocosRobot/update_lua_bindings_1448443401 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-25 17:29:52 +08:00
CocosRobot 06c7b94440 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-25 09:28:43 +00:00
zilongshanren 92649c539b Merge pull request #14480 from CocosRobot/update_cocosfiles_1448443303 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-25 17:23:33 +08:00
CocosRobot 82feb314f6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-25 09:21:44 +00:00
zilongshanren b0d88a552a Merge pull request #14419 from xiaofeng11/v3_combine_ui 
Combine Studio change for UI components
 2015-11-25 17:19:54 +08:00
XiaoYang 4ba6279a98 Merge pull request #14469 from super626/terrain 
fix bug: Terrain::getIntersectionPoint when there is offset
 2015-11-25 09:53:47 +08:00
zilongshanren 3cc3325df8 Merge pull request #14414 from WenhaiLin/v3-win32-audiofix 
AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes.
 2015-11-24 21:08:46 +08:00
zilongshanren 2c87211dba Merge pull request #14468 from CocosRobot/update_lua_bindings_1448348167 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-24 20:34:46 +08:00
XiaoFeng 27f6d6a6ba Remove condition macro check. 2015-11-24 19:17:38 +08:00
yangxiao 1ac82fa273 fix terrain ray trace bug when there is offset 2015-11-24 15:13:52 +08:00
CocosRobot ded045ae26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-24 07:01:07 +00:00
pandamicro 378cfa35b6 Merge pull request #14394 from super626/v3 
Terrain: char* to string
 2015-11-24 14:53:00 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
zilongshanren dfe4999a06 Update README.md 2015-11-23 16:53:18 +08:00
yangxiao e8d853934b terrain lua bindings 2015-11-23 14:33:39 +08:00
zilongshanren 361daf7f5f fix wrong indentation 2015-11-23 11:50:04 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
XiaoFeng 23d8b63fca update header file to fix studio UI js binding compile error 2015-11-23 11:41:42 +08:00
zilongshanren 689c0f4af3 Merge pull request #14327 from wohaaitinciu/editbox-win32 
Fix a fatal bug in EditBox implement for platform win32
 2015-11-23 11:35:40 +08:00
zilongshanren 51e2e369d1 Merge pull request #14443 from zilongshanren/fix-scalesprite-opacity 
fix scalesprite opacity issue.
 2015-11-23 09:50:23 +08:00
zilongshanren 9328a7c1d0 fix scalesprite opacity issue. 
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
 2015-11-20 17:35:29 +08:00
zilongshanren a789e31605 Merge pull request #14441 from neokim/fix-14440 
Fix #14440
 2015-11-20 16:49:12 +08:00
Neo Kim 4829a037f7 Fix #14440 2015-11-20 15:57:26 +09:00
zilongshanren 386c734b25 Merge pull request #14423 from xpol/fixes-boring-warnings 
Fixes boring deprecated warning.
 2015-11-19 18:29:12 +08:00
pandamicro dfe2fb1c29 Merge pull request #14433 from pandamicro/v3 
Merged v3.8.1 into v3 and fix some issues
 2015-11-19 18:20:10 +08:00
pandamicro 21d0ff846c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-19 17:20:42 +08:00
pandamicro eccde9fe11 Fix PhysicsSprite not working with moveTo action issue 2015-11-19 17:17:59 +08:00
pandamicro 0893d7d4ff Fix text color parser for TextField widget 2015-11-19 17:17:17 +08:00
pandamicro ea372d7a91 Merge pull request #14432 from CocosRobot/update_cocosfiles_1447924073 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-19 17:12:19 +08:00
CocosRobot 74050b6595 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-19 09:07:54 +00:00
pandamicro fbcf0680ae Merge pull request #14430 from cocos2d/V3.9 
V3.9
 2015-11-19 17:06:07 +08:00
XiaoFeng b6b35e0c74 Fix name space. 2015-11-19 15:47:36 +08:00
XiaoFeng 32f21ca5be Binding ResouceData structure to js to fix auto compile error 2015-11-19 14:31:39 +08:00
肖峰 d0c3275281 Change version in change log 2015-11-19 13:33:05 +08:00
pandamicro b8ebd51561 Merge pull request #14427 from CocosRobot/update_lua_bindings_1447902515 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-19 11:25:38 +08:00
CocosRobot d5b07e5b60 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-19 03:14:03 +00:00
zilongshanren 7ea90c2d41 Merge pull request #14033 from m-yukio/feature/fixed-richtext 
Support the new line element. Fixed a problem of UIRichText.
 2015-11-19 11:05:08 +08:00
XiaoFeng 5369f9a84d Add header file to make this pr can pass jenkins auto build 2015-11-19 10:14:27 +08:00
Jeff Wang efeae1eae9 add a test case for pr 14327 2015-11-18 22:52:47 +08:00
Jeff Wang 9cbcd00798 some properties should be set 2015-11-18 22:47:26 +08:00
zilongshanren 27a5cdb295 Merge pull request #14421 from zilongshanren/fixIssue14332 
Fix onEndEditing issue in script.
 2015-11-18 18:13:33 +08:00
Xpol Wan 0b5a3465bc Remove duplicated code by introduce a private doSetResponseCallback. 2015-11-18 17:52:24 +08:00
Xpol Wan b33aa00109 Fixes boring deprecated warning. 
I know I duplicated the code but there is no cpp for me to move body into.
 2015-11-18 17:47:07 +08:00
zilongshanren 02b59f020e Fix onEndEditing issue in script. 
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
 2015-11-18 15:05:13 +08:00
zilongshanren bf08b5b16d Merge pull request #14405 from CocosRobot/update_lua_bindings_1447730847 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-18 14:56:07 +08:00
zilongshanren 61614d64a3 Merge pull request #14408 from CocosRobot/update_lua_bindings_1447733106 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-18 14:55:55 +08:00
XiaoFeng fb7b92915c Combine Studio change for particle 3d 2015-11-18 14:34:14 +08:00
XiaoFeng bb83fe4596 Combine Studio change for UI components 2015-11-18 13:38:29 +08:00