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

35453 Commits

Author SHA1 Message Date
CocosRobot dea3a83efc [AUTO][ci skip]: updating cocos2dx_files.json (#16272) 2016-07-29 17:39:32 +08:00
minggo 04868dc489 update deps (#16266) 
* update deps

* update to deps-107
 2016-07-29 17:36:44 +08:00
minggo 9a8f577095 fix some typos (#16269) 2016-07-29 17:20:42 +08:00
halx99 3a3f6bd385 #Use Data::takeBuffer replace deep copy data. (#16263) 
see: https://github.com/EsotericSoftware/spine-runtimes/pull/650
 2016-07-29 15:27:16 +08:00
minggo 7131451f1b change to use api 19 (#16248) 
* change to use api 19

* update deps version
 2016-07-29 13:57:01 +08:00
CocosRobot c5923e00ca [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16261) 2016-07-29 13:40:46 +08:00
minggo 88eb533f9d Revert "#improve node sort performance by std::sort + long long (_localZOrder) for 64-bit" (#16260) 2016-07-29 10:58:31 +08:00
minggo adf9e80bd7 Merge pull request #16258 from CocosRobot/update_cocosfiles_1469756321 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-07-29 10:06:26 +08:00
minggo 7b5535fc3d Merge pull request #16259 from CocosRobot/update_lua_bindings_1469756435 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-29 10:05:59 +08:00
CocosRobot af1783364b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-29 01:43:11 +00:00
CocosRobot fbf74a49d5 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-29 01:38:42 +00:00
Vladimir Perminov 817ab329f2 Win32 MessageBox correct show utf8 and LuaLog convert utf8 by common unicode api. (#16249) 
* Win32 MessageBox correct show utf8

Support MessageBox utf8 string
based on pr #16234

* LuaLog convert utf8 by common unicode api.

* Add CCStdC.h
 2016-07-29 09:36:39 +08:00
minggo a8ce513f6c Merge pull request #16228 from dumganhar/fix/iss14148-ios-no-sound 
fixed #14148: Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will be mute.
 2016-07-29 09:28:37 +08:00
Ricardo Quesada 2945968614 Upgrades to Spine v3.4 (#16242) 
* Upgrades to Spine v3.4

Github issue #16115

* compiles and works on windows

tested on:

* win32
* win10
* win8.1

* include-linter: don't test spine files

we need them unmodified

* spine bindings fixes

also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
 2016-07-28 07:25:50 -07:00
minggo ddc5a90686 Merge pull request #16247 from minggo/js-template 
[ci skip]fix JS template
 2016-07-28 15:55:03 +08:00
minggo 57e4963502 Merge pull request #15963 from Drakon-Cocos/PageViewIndicator 
Fix PageViewIndicator opacity for 'inactive' pages
 2016-07-28 14:44:35 +08:00
minggo 8344a0c7e8 Merge pull request #16246 from minggo/change-to-gcc 
use gcc 4.9 instead
 2016-07-28 13:57:29 +08:00
James Chen 66fac82f00 fixed #16169: new android project crash in android 5.0.2 device (Nexus 7) when use 3.12 (#16214) 
* fixed #16169: new android project crash in android 5.0.2 device (Nexus 7) when use 3.12

* fixed #16169: Adds comments for why we should not use `assignment operator` of `std::u16string`.
 2016-07-28 11:19:22 +08:00
minggo 295f0716dc use gcc 4.9 instead 2016-07-28 10:56:52 +08:00
minggo fc36ce3c92 copy script 2016-07-28 10:40:08 +08:00
minggo 493b74ab7e Merge pull request #16243 from CocosRobot/update_cocosfiles_1469671178 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-07-28 10:05:16 +08:00
minggo cac05fefd1 Merge pull request #16241 from mogemimi/avoid-casting-overhead 
Avoid overhead of casting between float and double
 2016-07-28 10:04:34 +08:00
CocosRobot 9096e19ec7 [AUTO][ci skip]: updating cocos2dx_files.json 2016-07-28 01:59:39 +00:00
Vladimir Perminov 09aa7d9cf4 Win32 move unicode utils global. (#16234) 
* Win32 move unicode utils global.

It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.

* Move to CCUtils-win32

Also in WinRT version.

* Copyright
 2016-07-28 09:57:29 +08:00
minggo b8f530afd0 Merge pull request #16240 from CocosRobot/update_lua_bindings_1469651785 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-07-28 08:24:00 +08:00
mogemimi bf35e0f6b5 Avoid overhead of casting between float and double 2016-07-28 06:49:41 +09:00
CocosRobot 6b3454e9c6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-27 20:38:57 +00:00
Ricardo Quesada 47e6b0cf3d Merge pull request #16237 from ricardoquesada/issue_16220 
Compile on macOS 10.10 and lower
 2016-07-27 13:30:59 -07:00
Ricardo Quesada 1e1fad8b04 Merge pull request #16232 from perminovVS/gl-program-link-status 
GLProgram::link always check link status
 2016-07-27 10:48:02 -07:00
Vladimir Perminov 5498bdb32b Add ricardoquesada info 2016-07-27 18:48:10 +03:00
Ricardo Quesada 9dcc1f8193 Compile on macOS 10.10 and lower 2016-07-27 07:44:00 -07:00
Vladimir Perminov 3734668d17 GLProgram::link always check link status 
Fix issues #16231
 2016-07-27 15:31:32 +03:00
halx99 3a14388087 #improve node sort performance by std::sort + long long (_localZOrder) (#16126) 
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)

* Use bit field for make _localZOrder storage more clearly.

* #Comment _localZOrder members for meaningful.

* fix issues

* #use explicit bits integer of localZOrder storage

* #Fix compile error, add include <cstdint> to CCNode.h

* use the optimization for 64bit and no optimization solution for 32bit
 2016-07-27 16:58:51 +08:00
minggo b74900fe70 fix js template 2016-07-27 16:57:03 +08:00
minggo 30118aff6b Merge pull request #16226 from dumganhar/fix/iss16192-smallaudio-crash 
fixed #16192: Crash while decoding small MP3 file on Android.
 2016-07-27 15:39:57 +08:00
minggo e6b42d486b Merge pull request #16218 from cezheng/fix/etc_premultiplied_alpha_value 
fix CCImage premultipliedAlpha for ETC format
 2016-07-27 15:38:48 +08:00
yanli.huang 3e33b7a1ca update cocos2d-console commit (#16222) 
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
 2016-07-27 15:37:12 +08:00
minggo 1a1241c3fc Merge pull request #16221 from Microsoft/winrt-v3.13 
WinRT: update libcocos2d version to v3.13
 2016-07-27 15:36:43 +08:00
minggo a0d099f87a Merge pull request #16219 from halx99/patch-1 
Update AUTHORS
 2016-07-27 15:36:21 +08:00
James Chen 6efcf87b93 fixed #14148: Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will not be mute. 
The error is: ERROR: [0x19e5fa000] >aurioc> 807: failed: '!pla' (enable 2, outf< 2 ch, 44100 Hz, Float32, non-inter> inf< 2 ch, 0 Hz, Float32, non-inter>)
 2016-07-27 15:33:02 +08:00
Ricardo Quesada 4e278183ad Merge pull request #16122 from ricardoquesada/issue_16100 
testcase: add test case for issue #16100
 2016-07-26 23:21:25 -07:00
James Chen 8eb30769a1 Adds test case. 2016-07-27 14:00:34 +08:00
James Chen bd1d630f93 fixed #16192: Crash while decoding small MP3 file on Android. 2016-07-27 13:54:39 +08:00
minggo ad25873821 Merge pull request #16223 from minggo/template-compiling-issue 
[ci skip]explicitly set app-abi to armeabi
 2016-07-27 10:11:17 +08:00
minggo 67ec4521e5 explicitly set app-abi to armeabi 2016-07-27 10:10:09 +08:00
Ricardo Quesada b336aa3219 testcase: add test case for issue #16100 
delays camera creation

fix issue #16100
 2016-07-26 19:03:54 -07:00
Dale Stammen d5809129c4 update libcocos2d version to v3.13 2016-07-26 12:34:36 -07:00
halx99 00f0f72bef Update AUTHORS 2016-07-26 21:55:06 +08:00
Ce Zheng 9903d31031 fix CCImage premultipliedAlpha for ETC format 
translucent part of ETC format textures are rendered too bright due to
the fact that v3.12 sets PremultipliedAlpha to true by default. This
commit sets default value of _hasPremultipliedAlpha = false, deletes
unnecessary `_hasPremultipliedAlpha = false` code in multiple places,
making ETC format's _hasPremultipliedAlpha false while keeping other
formats unchanged.
 2016-07-26 19:17:10 +09:00
minggo 6109ca6e4b Merge pull request #16216 from mogemimi/remove-unnecessary-extern 
Remove unnecessary 'extern' to prevent compiler warnings
 2016-07-26 15:19:11 +08:00