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

30113 Commits

Author SHA1 Message Date
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
XiaoFeng 93e36001a6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-20 10:13:18 +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
XiaoFeng 72cd26d6e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-04-20 09:08:58 +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
Vladimir Perminov 694b9adc1e Add FileUtils::getSuitableFOpen 
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.

Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename

all fopen use FileUtils::getSuitableFOpen
 2015-04-19 14:00:27 +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
Milos Jakovljevic a13c519882 Adding FloatAction to animate any property over time. 2015-04-18 14:35:14 +02: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
Dale Stammen 79f312d101 call pause on correct thread 2015-04-17 09:31:02 -07:00
Dale Stammen 2ccff5671a fix for encoding images with WIC 2015-04-17 09:20:23 -07:00
yinjimmy 7a228cd79f Merge branch 'v3' into lua_runtime 2015-04-17 18:28:42 +08:00
yinjimmy 1e32322350 revert runtime files 2015-04-17 18:26:47 +08:00
minggo 425b2b62e1 [ci skip]update CHANGELOG 2015-04-17 17:59:13 +08:00
minggo cfb232f2b0 [ci skip]update CHANGELOG 2015-04-17 17:58:52 +08:00
minggo 2656f766c9 [ci skip]update CHANGELOG 2015-04-17 17:57:20 +08:00
minggo f210fadb00 Merge pull request #11472 from milos1290/v3 
Adding Lerp for Vec3
 2015-04-17 17:56:10 +08:00
minggo e133f81226 Merge pull request #11482 from samuele3hu/v3_remove_useless 
[ci skip]Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B
 2015-04-17 17:54:53 +08:00