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

33080 Commits

Author SHA1 Message Date
pandamicro 453b7ae68d Merge pull request #14062 from mogemimi/add-override-keyword 
Add missing override keyword
 2015-10-04 10:50:58 +08:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
Dale Stammen 548fc94eb8 added missing std includes 2015-10-02 18:17:11 -07:00
Dale Stammen 27f2397142 undefine ABSOLUTE for CC_PLATFORM_WINRT 2015-10-02 18:04:31 -07:00
Dale Stammen 6df43e60c0 fixed Windows 10 UWP app manifest by correcting image asset paths 2015-10-02 13:28:39 -07:00
KURA Shuichi 0469632cf8 Inprove addSpriteFramesWithDictionary 
- Moved initialization of image to an appropriate
  location, because it always called twice in
  SpriteFrameCache::addSpriteFramesWithFile()
 2015-10-03 03:18:07 +09:00
mogemimi 9f768bc1ab Add missing override keyword 2015-10-02 18:18:23 +09:00
Joachim Grill c49b60ae40 SpriteFrameCache: added plist file format documentation, fixed broken link 2015-10-01 10:36:18 +02:00
Joachim Grill 9a0ea79b61 remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue 2015-09-30 15:20:53 +02:00
dimon4eg 168b295b2e fix crash if csb file is missing 2015-09-30 14:44:30 +03:00
dimon4eg ec20b48775 fix crash in LoadingBar 2015-09-30 13:04:13 +03:00
dimon4eg fe8c1a12b5 Fix for text field 2015-09-30 12:39:44 +03:00
dimon4eg 2785a4313f Set focus for widgets 2015-09-30 12:31:33 +03:00
Neo Kim 423cbb83a9 Fix an issue that list view's Magnetic::CENTER is not working well around boundaries if it is non-bounceable. 2015-09-30 16:55:48 +09:00
Joachim Grill 79656ffe13 fixed typo, indentation 2015-09-29 16:50:14 +02:00
Joachim Grill b14b251628 added Sprite performance test: load sprite from sprite sheet, with rectangular frame as well as with polygon outline 2015-09-29 15:45:48 +02:00
Joachim Grill 80ca579a01 added Sprite test case which loads PolygonInfo of sprite from plist file 2015-09-29 15:44:13 +02:00
Joachim Grill ac24612e98 extend SpriteFrameCache to load PolygonInfo from plist file 2015-09-29 15:42:04 +02:00
Liam 8368762b37 update for light3D 2015-09-29 18:33:28 +08:00
pandamicro 4a2edc8ce8 Merge pull request #14044 from CocosRobot/update_cocosfiles_1443517693 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-29 17:09:52 +08:00
CocosRobot 0fc077d196 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 09:08:15 +00:00
pandamicro ec3660fd22 Merge pull request #14041 from natural-law/v3 
Solve the crash of performance-tests on windows.
 2015-09-29 17:06:28 +08:00
pandamicro b91b35971b Merge pull request #14043 from CocosRobot/update_lua_bindings_1443512424 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-29 15:46:12 +08:00
CocosRobot 246fa7ffd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-29 07:45:48 +00:00
pandamicro fb34fe585e Merge pull request #14042 from CocosRobot/update_cocosfiles_1443512343 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-29 15:41:32 +08:00
CocosRobot ebee5e9a26 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 07:39:05 +00:00
pandamicro b918a0f3e2 Merge pull request #14040 from pandamicro/v3 
Fix mistaken uploaded lua bindings
 2015-09-29 15:37:11 +08:00
zhangbin f715a93521 Solve the crash of performance-tests on windows. 2015-09-29 15:32:51 +08:00
pandamicro 4f6bdd6d74 Fix mistaken uploaded lua bindings 2015-09-29 14:52:47 +08:00
Liam 87a406febe update for light3d reader 2015-09-29 11:27:01 +08:00
XiaoFeng 84347bb056 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-09-29 09:35:35 +08:00
Danut Chereches 8944f9e1cd removed scale factor for label shadow 2015-09-28 16:27:20 +03:00
XiaoFeng 0bdb1b099d Fix particle test under performance test project memory overflow 2015-09-28 14:06:02 +08:00
pandamicro 0abe235323 Merge pull request #14030 from CocosRobot/update_lua_bindings_1443367205 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-27 23:30:14 +08:00
CocosRobot b082620d85 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-27 15:24:49 +00:00
pandamicro 0af7f29cfd Merge pull request #14024 from TheCodez/fix_refptr_testcase 
Fix : RefPtr test wasn't executed even in debug build
 2015-09-27 23:16:27 +08:00
pandamicro 17c78ad3b1 Merge pull request #14018 from natural-law/v3 
Solve the crash of performance-tests on windows.
 2015-09-27 23:11:19 +08:00
pandamicro a43f56e9da Merge pull request #14027 from CocosRobot/update_cocosfiles_1443366641 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-27 23:11:01 +08:00
CocosRobot 4185715c06 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-27 15:10:43 +00:00
pandamicro 45fc337733 Merge pull request #14023 from pandamicro/script-component2 
Script Component
 2015-09-27 23:08:57 +08:00
pandamicro 7b85211cfe Remove ScriptComponent 
Because windows platform can't successfully compile in previous architecture
 2015-09-27 22:18:59 +08:00
小沉 cfe076d59f Merge pull request #1 from cocos2d/v3 
update
 2015-09-27 13:56:08 +08:00
Michael Kösel 744b7f54c9 Fix wrong debug check 2015-09-26 16:58:26 +02:00
WenhaiLin f4c56e8605 Fixed compile errors 2015-09-26 19:43:36 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
pandamicro a1bbd43f9f Add component test to lua-tests and remove it from lua empty test 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
pandamicro 7e2b8c71a7 Improve lua script component 2015-09-26 19:43:35 +08:00
minggo 26632ec69a linjia demo finish 2015-09-26 19:43:35 +08:00