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

28966 Commits

Author SHA1 Message Date
Bin Zhang b0ab12e0e7 Merge pull request #31 from WenhaiLin/v3-jsb-merge 
Split the project files of JSB into separate files.
 2015-04-20 02:28:26 -07:00
Wenhai Lin ed79f66b9f Fixed compile errors 2015-04-20 17:19:58 +08:00
minggo 15fe283c2e Merge pull request #11515 from xiaofeng11/v3 
update compatibility for upgraded node3d come with 2.2.5 version
 2015-04-20 17:05:32 +08:00
andyque 6fb29ad1b0 remove uishader settings 2015-04-20 17:04:49 +08:00
andyque e02dad3489 fix ui grayscale shader memory release issue 2015-04-20 17:00:40 +08:00
xiaofeng11 2c0350c1a6 Merge pull request #20 from pipu/parse_Node3DReader_position 
Modify that parse position for Node3DReader.
 2015-04-20 16:11:31 +08:00
minggo cdf00408a7 Merge pull request #11513 from andyque/fix-wp8.1-include-path 
fix freetype include path on win-8.1
 2015-04-20 16:01:55 +08:00
minggo d87b175167 Merge pull request #11512 from CocosRobot/update_cocosfiles_1429516413 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-20 16:00:34 +08:00
pipu 388e4b3a93 Modify that parse position for Node3DReader. 2015-04-20 15:56:36 +08:00
andyque 1e514f0a2b fix freetype include path on win-8.1 2015-04-20 15:54:31 +08:00
CocosRobot ebd76defe6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-20 07:53:34 +00:00
minggo 76613fc85f Merge pull request #11506 from CocosRobot/update_lua_bindings_1429508341 
[AUTO]: updating luabinding automatically
 2015-04-20 15:51:57 +08:00
minggo 8f88afa123 Merge pull request #11510 from xiaofeng11/v3 
Bug fix
 2015-04-20 15:50:44 +08:00
WenhaiLin f453235ce3 Add missing resource 2015-04-20 15:38:56 +08:00
WenhaiLin 480f9179fa Split the project files of JSB into separate files. 2015-04-20 15:37:00 +08:00
xiaofeng11 829da53773 Merge pull request #19 from pipu/fixed_shadow_outline 
Modify that parse text shadow and outline.
 2015-04-20 15:04:33 +08:00
CocosRobot 87e29db218 [AUTO]: updating luabinding automatically 2015-04-20 05:40:58 +00:00
minggo 6ec3930bcb Merge pull request #11505 from CocosRobot/update_cocosfiles_1429508263 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-20 13:39:08 +08:00
CocosRobot 9b09fb1f6a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-20 05:37:44 +00:00
minggo e55e19923b [ci skip]update CHANGELOG 2015-04-20 13:37:19 +08:00
minggo fc16bc6154 Merge pull request #11501 from samuele3hu/v3_studio2 
Add Lua bindings for WebView and related test case
 2015-04-20 13:36:08 +08:00
samuele3hu 9477e89723 Fix the compile error on the win32 2015-04-20 11:46:48 +08:00
pipu 4b320a1677 Modify that parse text shadow and outline. 2015-04-20 11:39:43 +08:00
minggo bb4e749a93 Merge pull request #11489 from dumganhar/clean-order 
[Director FIX]: Clean all schedulers and remove all eventlisteners after exiting scene
 2015-04-20 10:47:37 +08:00
minggo e7e6a4c8ff Merge pull request #11503 from CocosRobot/update_cocosfiles_1429497502 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-20 10:40:10 +08:00
CocosRobot fb9cdc28e3 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-20 02:38:23 +00:00
minggo d792e3dc94 [ci skip]update AUTHORS 2015-04-20 10:38:19 +08:00
minggo 707c7170b1 [ci skip]update CHANGELOG 2015-04-20 10:37:40 +08:00
minggo c7fe7704d4 Merge pull request #11499 from perminovVS/v3-dev-user-default-only-delegate 
UserDefault::setDelegate
 2015-04-20 10:36:56 +08:00
minggo 5e79f79b4a Merge pull request #11500 from andyque/update-deps-v3-to-42 
update deps to 42
 2015-04-20 10:35:04 +08:00
samuele3hu 4f22a1470b Update the project setting 2015-04-20 10:11:39 +08:00
WenhaiLin dc768dbd8c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-20 10:06:48 +08:00
samuele3hu 067ad6ad60 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2 
Conflicts:
	cocos/scripting/lua-bindings/proj.android/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
 2015-04-20 10:05:02 +08:00
minggo 133ca38513 [ci skip]update CHANGELOG 2015-04-20 09:56:10 +08:00
andyque 5f030c4c4c update deps to 42 2015-04-20 09:55:38 +08:00
Dale Stammen 5f263968ae Merge branch 'v3' into v3-winrt-backbutton 2015-04-19 18:55:02 -07:00
minggo 1a9febcbed [ci skip]update CHANGELOG 2015-04-20 09:54:45 +08:00
minggo 5b5d9f1337 Merge pull request #11498 from perminovVS/v3-dev-optimize-vec2 
Optimize Vec2
 2015-04-20 09:53:28 +08:00
Dale Stammen ec378b612e added listener if back button event not handled by app 2015-04-19 18:53:10 -07:00
minggo 0c2059bfe0 Merge pull request #11485 from MSOpenTech/v3-winrt-wic 
V3 WinRT fixes for WIC image encode
 2015-04-20 09:36:16 +08:00
Dale Stammen a97d5c5370 added support for hardware back button on Windows Phone 8.1 2015-04-19 16:31:30 -07:00
Dale Stammen e3e79475f7 added ExitApp() for winrt 2015-04-19 16:30:51 -07:00
Dale Stammen aae82c24f9 removed CC_PLATFORM_WP8 2015-04-19 16:28:54 -07:00
Vladimir Perminov 87d0d4f677 UserDefault::setDelegate 
UserDefault very slow, each call need read / write and parse xml file.
Delegate makes it possible to use other variants.
 2015-04-19 22:07:48 +03:00
Dale Stammen 178c241cdd added back buttom function 2015-04-19 11:36:14 -07:00
Vladimir Perminov 4c33050536 Optimize Vec2 
small function Vec2 move to Vec2.inl
Added:
setZero();

Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
 2015-04-19 20:40:52 +03:00
Jimmy Yin 185435a388 Add missing file for win32 2015-04-19 00:09:52 +08:00
Jimmy Yin a9542813f4 Add missing file for android 2015-04-18 23:20:41 +08:00
James Chen 6864a4a7bb [Director FIX]: Clean all scheduler and remove all eventlisteners after exiting scene 2015-04-18 15:06:09 +08:00
Dale Stammen f1f0c5a653 start of back button support 2015-04-17 15:47:52 -07:00