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

28806 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
WenhaiLin 0ac99002d5 Label:disableEffect(LabelEffect::XXXX) support disable all effect. 2015-04-17 14:39:52 +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
minggo 83b9975578 [ci skip]update CHANGELOG 2015-04-16 18:17:37 +08:00
minggo 3c7d5afce2 Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix 
Fix crash when play streamed MP4 file.
 2015-04-16 18:16:28 +08:00
minggo 814cb9224b Merge pull request #11462 from andyque/disable-v2-build-trigger 
Disable v2 build trigger
 2015-04-16 18:01:26 +08:00
minggo d7c4ca6102 Merge pull request #11467 from andyque/fix-wp8-compile-error 
remove unneeded wp8 related files
 2015-04-16 18:00:14 +08:00
andyque 74e762cf94 remove unneeded wp8 related files 2015-04-16 17:45:15 +08:00
minggo bb7679979c [ci skip]update CHANGELOG 2015-04-16 16:34:41 +08:00
WenhaiLin fc75f46abb Fix crash when play streamed MP4 file. 2015-04-16 16:27:09 +08:00