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

175 Commits

Author SHA1 Message Date
leeda 8f1459b8ef fix spine crash (#18582) 2018-01-10 14:34:24 +08:00
Greg Rynkowski 78f2d9940a Fix typo in the SkeletonAnimation::createWithFile (#18542) 2017-12-08 17:23:08 +08:00
crazyhappygame 03066ff47d Windows 10 update compiler to Visual Studio 10 PlatformToolset v141 (#18511) 2017-11-27 17:10:52 +08:00
minggo 289668015d
fix warnings (#18499) 2017-11-24 10:41:37 +08:00
minggo 19bd8e3835
Spine update (#18438) 
* update spine runtime and resource license

* apply patch to fix crash

* fix python path
 2017-11-03 13:44:13 +08:00
minggo cfaa77be28
Update spine (#18427) 2017-11-02 09:06:13 +08:00
Ole Herman Schumacher Elgesem 1c55ad104d Use cocos2d::Rect to avoid ambiguity (#18048) 
Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
 2017-07-10 10:29:30 +08:00
minggo 3208120ff9 fix warnings (#17971) 2017-06-23 17:47:20 +08:00
Kameiha e45cb88ead Support ETC1 Alpha Channel in the Spine Library (#17692) 
* Update SkeletonBatch.cpp

* Update SkeletonBatch.h

* Update SkeletonRenderer.cpp
 2017-04-27 10:04:59 +08:00
rh101 f8eccb9608 Added VS2017 support in project files (#17548) 
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file

* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.

* Changed extension of CCStencilStateManager.hpp to .h

* Added support for VS2017 in project files.
 2017-03-20 09:36:07 +08:00
Bin Zhang b7f8dacd7c Solve the error logic in spine runtime. (#17448) 
Sync the runtime to the state of this commit (both js & cpp runtime):
3ced1e1daf
 2017-03-07 09:36:42 +08:00
minggo 8825a091bb update spine to 3.5.35 (#17331) 
* update spine to 3.5.35

* fix jsb compiling error

* fix lua compiling error
 2017-02-09 16:57:42 +08:00
Dale Stammen 9381152ef1 removed support for Windows 8.1 store and phone (#17311) 2017-02-08 09:46:47 +08:00
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM (#16812) 
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
 2016-11-16 09:48:37 +08:00
Dale Stammen 58414f85a1 disable /Zw on .c file (#16697) 2016-10-14 17:49:03 +08:00
Ricardo Quesada e4be87a059 Adds Spine binary-file format support (#16629) 
* Adds Spine binary-file format support

fixes issue #10438

* ignore SkeletonBinary.c from linter

* add another file to the exclude list

* lua manual fixes for spine

* SkeletonBinary.c and not .cpp

* missing files for win8.1

* don't compile it as crt

* new updates from spine
 2016-10-11 10:56:14 -07:00
Wilson E. Alvarez 59574f95e0 Fix mismatched memory deallocators (#16596) 
* Fix mismatched memory deallocator in CCFastTMXLayer.cpp

* Fix mismatched memory deallocator on SkeletonRenderer.cpp

* Fix mismatched memory deallocator in CCTMXLayer.cpp
 2016-09-26 14:18:48 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522) 
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
 2016-09-06 10:14:14 +08:00
James Chen 50a1e75373 fixed #16502: SPINE color bug (temporary storage of color was wrong in SkeletonRenderer) (#16503) 2016-09-06 10:11:54 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
mogemimi 6c3f5e6d6b Fix variable shadowing warnings caused by Spine 3.4 (#16445) 2016-08-29 09:42:34 +08:00
Ricardo Quesada 87f6dd3c97 v3.13 branch: spine updates (#16340) 
related to:

* Github issue #16263
* Github issue #16294
 2016-08-11 23:30:15 +08:00
Dale Stammen a124213777 disabled /ZW option for .c files for all platforms/configurations (#16338) 2016-08-11 23:03:58 +08:00
Ricardo Quesada e5b14733c8 from spine source code (#16330) 
Related to:

* Github issue #16263
* Github issue #16294
 2016-08-08 09:47:05 +08:00
minggo 2bd325ab92 Revert "fixes issue #16263 correctly" (#16321) 2016-08-05 14:06:03 +08:00
Ricardo Quesada 143317871d fixes issue #16263 correctly (#16294) 
no stackoverflow when converting int to ssize_t
 2016-08-03 09:23:06 +08:00
mogemimi 269bdbed85 Fix compiler warnings caused by Spine 3.4 (#16286) 2016-08-01 09:34:20 +08:00
Ricardo Quesada a82e52ffd6 Revert "#Use Data::takeBuffer replace deep copy data." (#16277) 2016-07-29 15:35:29 -07: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
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 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
pandamicro 896aeb2d0c Fix android compilation issue with thumb mode 2016-05-25 18:35:38 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
XiaoFeng 0a657cd219 Remove cocos2dx.h reference from all cocos studio related files 2016-03-16 14:02:08 +08:00
mogemimi 44d2a161dc Remove unnecessary c_str() calls 2016-02-04 11:52:14 +09:00
mogemimi d4233dd63a Fix deprecation warning in SkeletonRenderer 2015-12-03 00:09:47 +09:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
Dale Stammen 161954da87 fixed pdb file output location 2015-08-26 09:41:23 -07:00
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
pandamicro cb143963ce Upgrade Spine runtime 2015-08-12 18:07:28 +08:00
Ricardo Quesada 789da4edd8 compiles on xcode7 2015-08-07 14:00:18 -07:00
Ricardo Quesada 301b55c686 Adds support for Spine runtime 2.3 2015-07-20 10:39:34 -07:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
pandamicro 707e9d4d7b Merge pull request #12205 from ffskyfan/v3 
Update extension.h, amend a really  dangerous macros that may cause memory allocation error
 2015-06-14 20:09:57 +08:00
ffskyfan b8a022238f Update extension.h 
#define MALLOC(TYPE,COUNT) ((TYPE*)_malloc(sizeof(TYPE) * COUNT, __FILE__, __LINE__))

It is a really dangerous macros here.
If use it like this "MALLOC(Type, n+2)", it will alloc sizeof(TYPE) * COUNT + 2 byte memory.but I want it alloc sizeof(TYPE) * (COUNT + 2) byte. It is a typical macro unwind error.
 2015-06-05 12:14:27 +08:00
Dale Stammen dadbbc18d6 added Windows 10 UWP project files 2015-05-28 13:51:25 -07:00
Dale Stammen 46a69cf00b ignore warning 4996 2015-05-20 07:59:17 -07:00