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

29284 Commits

Author SHA1 Message Date
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
minggo f38bfdf212 Merge pull request #11478 from WenhaiLin/v3-label-fix 
Label:Fixed the shadow effect of system font might not be shown.
 2015-04-17 17:53:52 +08:00
minggo 768d2bdb48 Merge pull request #11481 from andyque/remove-all-lz-in-android 
remove system zlib dependency since we use our own prebuilt version
 2015-04-17 17:49:14 +08:00
minggo b595401efc Merge pull request #11483 from minggo/release-note 
[ci skip] update release note
 2015-04-17 17:47:21 +08:00
minggo 503aac0bec update release note 2015-04-17 17:46:44 +08:00
samuele3hu 9aadc2a993 Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B, 2015-04-17 17:40:28 +08:00
zhangbin e5672b6e1f Update js bindings. 2015-04-17 17:27:47 +08:00
andyque d3a06de6d6 remove system zlib dependency since we use our own prebuilt version of 
zlib now.
 2015-04-17 17:24:33 +08:00
minggo e3463d23a8 Merge pull request #11479 from samuele3hu/v3_remove_useless 
Remove the reference of quick module
 2015-04-17 17:13:51 +08:00
minggo dc2de4b803 add releate note for v3.6beta0 2015-04-17 16:53:50 +08:00
samuele3hu b300701ec4 Remove the reference of quick module 2015-04-17 15:52:45 +08:00
WenhaiLin 9c2e39dd49 Label:Fixed the shadow color of system font may be incorrect. 2015-04-17 15:42:41 +08:00
yinjimmy 5589796029 Merge branch 'v3' into lua_runtime 2015-04-17 15:27:04 +08:00
WenhaiLin 5a438ed9a1 Label:Fixed the shadow effect of system font might not be shown. 2015-04-17 15:26:43 +08:00
minggo 5606610b32 [ci skip]update CHANGELOG 2015-04-17 15:24:50 +08:00
minggo 08df26f36a Merge pull request #11477 from WenhaiLin/v3-label-fix 
Label:disableEffect(LabelEffect::XXXX) support disable all effect.
 2015-04-17 15:22:56 +08:00
zhangbin 57805737d1 Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb 2015-04-17 14:59:47 +08:00
zhangbin b8b49a387e Update the js template. 2015-04-17 14:59:12 +08:00
WenhaiLin 0ac99002d5 Label:disableEffect(LabelEffect::XXXX) support disable all effect. 2015-04-17 14:39:52 +08:00
Bin Zhang 7500423bda Merge pull request #30 from WenhaiLin/v3-jsb-merge 
Add js-tests
 2015-04-16 23:26:02 -07:00
samuele3hu b72034a3f6 Add Lua bindings for WebView and related test case 2015-04-17 14:08:47 +08:00
Wenhai Lin 7860f57ef0 Fixed compile errors 2015-04-17 14:00:53 +08:00
Wenhai Lin 03ef9b962a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge 2015-04-17 11:47:09 +08:00
Wenhai Lin bcb3afd98f Merge branch 'v3-jsb-merge' of https://github.com/WenhaiLin/cocos2d-x into v3-jsb-merge 2015-04-17 10:47:55 +08:00
lvlong f55af40016 fix bug: label action in multiple cameras. 2015-04-17 10:19:20 +08:00
Milos Jakovljevic a33d775b51 Adding linear interpolation convenient method in MathUtils. 2015-04-16 15:17:25 +02:00
Milos Jakovljevic b3ee529a8c Adding Lerp for Vec3 2015-04-16 14:43:12 +02:00
minggo 5d5fa3d618 Merge pull request #11468 from andyque/fix-v3-readme-jenkins-status 
remove wp8 jenkins status from README
 2015-04-16 18:25:42 +08:00
minggo d24247a833 [ci skip]update CHANGELOG 2015-04-16 18:21:56 +08:00
andyque 3ff18b0c3e remove wp8 jenkins status from README 2015-04-16 18:20:02 +08:00