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

28789 Commits

Author SHA1 Message Date
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
minggo 408d164fea Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization 
fix side effect of ui::button clone
 2015-04-16 16:15:25 +08:00
andyque df1703375c fix wrong indentation 2015-04-16 15:51:08 +08:00
andyque 68f86adab1 disable comment job trigger for v2 branch 2015-04-16 15:28:09 +08:00
andyque fdb03f150d don't trigger for v2 build 2015-04-16 15:28:08 +08:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
minggo 0e7c096201 Merge pull request #11455 from xiaofeng11/v3 
Fix won't load child bug
 2015-04-16 14:37:22 +08:00
minggo 7c85db9288 Merge pull request #11456 from CocosRobot/update_cocosfiles_1429166057 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-16 14:36:57 +08:00
minggo b4acf1beb8 [ci skip]update CHANGELOG 2015-04-16 14:35:10 +08:00
CocosRobot 870eb7519b [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-16 06:34:18 +00:00
minggo 97f150a89f Merge pull request #11452 from MSOpenTech/v3-remove-wp8 
V3 remove WP8 project files
 2015-04-16 14:32:11 +08:00
xiaofeng11 54dd0651ff Merge pull request #18 from pipu/Serialize_attribute_children 
Modify that serialize attribute "Children".
 2015-04-16 14:04:56 +08:00
pipu d1dcf3f620 Modify that serialize attribute "Children". 2015-04-16 13:58:01 +08:00
minggo d9d379bcc1 Merge pull request #11454 from CocosRobot/update_lua_bindings_1429150658 
[AUTO]: updating luabinding automatically
 2015-04-16 13:57:31 +08:00
CocosRobot f1bd23aa32 [AUTO]: updating luabinding automatically 2015-04-16 02:19:38 +00:00
minggo 29de9d397f Merge pull request #11445 from andyque/improve-the-arguments 
make scrollview time arguments more meaningful
 2015-04-16 10:14:11 +08:00
minggo 1803822465 Merge pull request #11446 from super626/v3 
Fix PU clone bug
 2015-04-16 10:13:37 +08:00
minggo d04e05e943 [ci skip]update CHANGELOG 2015-04-16 10:12:12 +08:00