61 Commits

Author SHA1 Message Date
pharan
9c21942482 [unity] Updated examples, modules and editors. 2016-11-26 03:05:23 +08:00
pharan
5779d0e09a [unity] Simplified Sprite shader GUI. 2016-11-19 09:19:01 +08:00
pharan
18e1f9a976 [unity] ToddRivers Sprite Shader 2016-11-18 16:52:07 +08:00
pharan
752516e00f [unity] SkeletonRagdoll fix for 3.5 AnimationState 2016-11-18 06:10:50 +08:00
pharan
2c46ad7d5c [unity] SkeletonTint as optional shader. 2016-11-18 05:44:33 +08:00
NathanSweet
36000e3c55 Updated to v3.5 (merge dev branch).
# Conflicts:
#	spine-c/src/spine/AnimationState.c
2016-11-15 23:10:23 +01:00
pharan
3bcf399227 [unity] Added some multi-editing support. 2016-10-19 09:04:10 +08:00
NathanSweet
4a8d02a144 Cleaned up contribution comments. 2016-10-16 00:25:08 +02:00
NathanSweet
0df3eea08b Added some missing license header comments. 2016-10-16 00:19:26 +02:00
pharan
2f0d80f0dc [unity] Fixed stray character. 2016-10-16 06:03:42 +08:00
NathanSweet
c0fdc454a2 Fixed inconsistent newlines.
License header was followed by \n\n and files ended with \n. Changed to \r\n.
2016-10-15 23:45:16 +02:00
badlogic
5aa27771c3 [runtimes] Updated ALL sources to use latest Spine Runtimes License v2.5. Manually checked all the things... 2016-10-13 15:12:05 +02:00
Mario Zechner
f84ae17615 Updated License Headers 2016-10-13 10:27:54 +02:00
John
d98ea1c45e [unity] Remove unused BoundingBoxFollower field
Closes issue: https://github.com/EsotericSoftware/spine-runtimes/issues/717
2016-10-03 23:30:41 +08:00
pharan
fbd8e32c06 [unity] Fix PMA for SkeletonRenderSeparator. 2016-09-08 20:43:03 +08:00
John
5da73d9f1b [unity] SpriteAttacher basic SkeletonGraphic support. 2016-09-05 13:58:10 +08:00
John
f539742300 [unity] SpriteAttacher better PMA behavior. 2016-09-05 13:34:08 +08:00
pharan
13f433d13d [unity] Fix compatibility with Unity 5.1. 2016-08-29 17:10:52 +08:00
pharan
c9ffdc7eae [unity] Fix SkeletonGraphic not applying PMA to vertex colors. 2016-08-27 11:38:22 +08:00
pharan
384889cf7a [unity] Fix Drag and Drop menu for SkeletonGraphic + hierarchy icons. 2016-08-09 19:51:50 +08:00
pharan
35a7a7be76 [unity] Fix SkeletonRenderSeparator edit mode refresh. 2016-08-05 18:30:14 +08:00
pharan
18d7229b5d [Unity] Fix SkeletonGraphic incompatible version fallback. 2016-08-02 16:30:21 +08:00
pharan
0434398b36 [unity] Drag n drop now uses RectTransform plane if selected (for UI) + minor fixes. 2016-08-01 09:12:40 +08:00
pharan
395dc5b345 [unity] Drag n drop to Scene View context menu for all types. 2016-07-31 22:09:28 +08:00
pharan
11a6717db2 [unity] Handle changed API in Unity 5.4 2016-07-31 09:33:13 +08:00
pharan
e23bec8ddb [unity] Unified interfaces for Skeleton instance components. Used by SpineAttributeDrawers. 2016-07-27 05:40:33 +08:00
pharan
c744c9a7d7 [unity] Minor editor changes. 2016-07-21 22:32:33 +08:00
Alexander Brazie
5532ca290d [Unity] Added BoundingBoxFollower.isTrigger (#635)
* Added isTrigger variable to bounding box followers

IsTrigger added to bounding box follower.

* Added isTrigger variable to bounding box followers

Same as the last one.
2016-07-21 22:24:20 +08:00
John
77c4cdc1e4 [unity] SkeletonRenderer Update (Tangents, MeshGeneration) (#646) 2016-07-21 22:23:21 +08:00
pharan
5611de296d [unity] Minor SkeletonGraphic fixes. 2016-07-15 14:44:23 +08:00
John
5e08751fb8 [spine-unity] Fix BoundingBoxFollower type check.
Slots that are set to an `Attachment` that is not a `BoundingBoxAttachment` will treat it as null instead of ignoring it or throwing an exception.
2016-07-11 10:13:57 +08:00
John
d6dc425817 [spine-unity] Clarify BoundingBoxFollower behavior in editor. (#630) 2016-07-11 09:40:38 +08:00
John
bde07221b3 [spine-unity] Fix SkeletonGhostRenderer namespace. 2016-07-05 05:15:17 +08:00
pharan
ebd8831a17 [spine-unity] 3.3 changes to TK2D code + better default scale. 2016-07-04 13:58:34 +08:00
John
1c19365325 [csharp][monogame][unity][xna] Updated to 3.3.x (#623)
* [spine-csharp] Ported 3.3 changes of Animation and inner classes. Added MathUtils.Clamp

* [spine-csharp] Ported 3.3 changes of AnimationStateData. Updated .gitignore to exclude .meta files from spine-csharp

* [spine-csharp] Ported 3.3 changes of Bone

* [spine-csharp] Ported 3.3 changes of BoneData

* [spine-csharp] Ported 3.3 changes of Event

* [spine-csharp] Ported 3.3 changes to IKConstraint. Also got rid of the hideous labeled break. Replaced with while and sprinkled continues and break :D

* [spine-csharp] Mario is not good with labeled breaks. Fixed with goto

* [spine-csharp] Ported more 3.3 changes, only SkeletonJson and SkeletonBinary left. Unity runtime also needs updating with new changes

* [spine-csharp] fixed compilation errors initially not reported by Mono CS

* Minor clean up.

Every space has its place.™

* Match csharp 3.3 refactorings.

* [Unity] Minor cleanup in SkeletonBaker.

* Better exception messages.

* Removed extra usings. Matched whitespace style.

* Fixed Bone.cs method PascalCase and xml documentation.

* Fixed Exception ctor arguments.

* Fixed single bone IK mixing.

Matched libgdx commit:
e0ee18a088

* [spine-csharp] Port of 3.3 changes to SkeletonJson, incomplete

* [Unity] Ragdoll: account for shear and new constraints.

* [spine-csharp] Ported 3.3 changes to SkeletonJson

* [spine-csharp] Ported 3.3 changes to SkeletonBinary. Time for testing and debugging

* [spine-csharp] Fixed up XNA runtime

* Added simple example data in new exports/ folder

* [spine-csharp] Fixed bug in Slot construtor, wasn't assigning index. Fixed bug in CurveTimeline, argument guard was wrong. Fixed bugs in SkeletonJson, indexing to get duration of a timeline was wrong. Added simple example to spine-xna for easier debugging

* [spine-csharp] Fixed porting bug in ColorTimeline#apply, indexing was wrong

* [spine-csharp] Fixed SkeletonJson#ReadVertices, calling resize on temp lists was wrong. Updated goblin sample in spine-xna, fixed mesh attachment rendering in spine-xna.

* [spine-xna] Added binary exports, modified XNA game

* [spine-xna] Added tank example

* Some cleanup. Relabeled generic todos.

* Prevent SpineEditorUtilities from orphaning failed instantiations.

* Ignore PathAttachment when checking for required atlas regions.

* [spine-csharp] the great spaces to tabs battle

* [spine-csharp] Fixed inherit deform.

* [spine-csharp] Match Skeleton.java properties and stuff.

* [spine-csharp] Fixed enums, all upper cased now, using Enum.ParseType in case-insensitive mode

* [csharp] Ported 206e7f983c4df4d27fee6cac05d152eb2295c8b0 to csharp runtime. Fixes attachment keys on different tracks

* [csharp] Updated README.md

* [xna] [monogame] [unity] Updated README.md

* Revert "[csharp] Ported 206e7f983c4df4d27fee6cac05d152eb2295c8b0 to csharp runtime. Fixes attachment keys on different tracks"

This reverts commit 175216868dd00b4ae31cc717022242308c150f6a.

* [csharp] Fix to AttachmentTimeline#apply, fix for the fix for the fix for the revert for the fix

* [csharp] Matched and fixed more comments, summaries, exception messages and formatting.

* [csharp] Fix deformed weighted vertices condition + match libgdx closer.

* [csharp] Use internal ExposedList array for critical methods.

* [csharp] SkeletonJson and SkeletonBinary minor formatting and fixes.

* [unity] Match changes and fixes in spine-csharp 3.3 + better editor messages.

* [unity] Updated sample scenes and files.

* [csharp] Some formatting got left behind.

* [unity] New readme links + Removed redundant info.

* [exports] Remove dummy project.
2016-06-30 04:29:33 +08:00
Denis Novozhilov
290538752a [Unity] Fix SpriteAttacher for pivots outside sprite.
The case here is as follows:
 - create random unity sprite prefab
 - place sprite's pivot point outside of the sprite (say, pivot U is 2.53 and pivot V is -1.22)
 - try to attach this sprite via the SpriteAttacher script

Expected result here would be seeing the sprite sticking with it's pivot point to the placeholder.
Actual result here looks like the sprite's pivot point is somewhere in U: 1 and V: 0.

The bug is caused by Mathf.InverseLerp - it just cannot return values outside of [0; 1] range.

So the solution would be to make our own version of InverseLerp, which handles such situations correctly.
2016-06-25 00:10:08 +08:00
John
5cceb22406 [unity/tk2d] Update editor code. Some cleanup and fixes. (#608)
* Initial cleanup and review.

* More cleanup and review.

* Removed missing atlas warnings for TK2D. Better button labels. Separated specialized/utility shaders.

* Clearer wording. More checks.

* Fix for Inspector reflowing between GUI events.

* Basic TK2D warning message.

* Fix play buttons. Removed useless reimport button for TK2D. Minor fixes.
2016-06-10 16:40:10 +08:00
John
4b9d1b4f69 [Unity] Ragdoll fix (#596)
* Initial cleanup.
* More cleanup and debugging. Not fixed yet, but core task identified (probably).
* [Unity] Fixed Ragdoll2D and copied to 3D.
2016-06-01 00:05:08 +08:00
John
e5b36f4180 [Unity] Update serialized custom materials
* SkeletonRendererCustomMaterials: correctly reapply changes when slot name changes (#554)
* Made sure private methods are private. Editor uses reflection.
* Also removed public properties.
2016-05-13 12:47:02 +08:00
John
e493054028 [Unity] Cleanup SkeletonUtilityKinematicShadow. 2016-05-04 19:22:34 +08:00
pharan
f14e898d2d [Unity] Fix extra renderers check. 2016-04-19 05:45:10 +08:00
pharan
bf35d4979e [Unity] Workflow cleanup for serialized custom materials module. 2016-04-14 03:36:36 +08:00
Serhii Yolkin
a634d39765 Improved material overrides (#536)
* per-material material overrides, separate MonoBehaviour for setting overrides from inspector

* clean-up and fix SkeletonRendererMaterialOverride

* SkeletonRendererCustomMaterials: initialize SkeletonRenderer to ensure skeletonRenderer.skeleton != null

* rename SkeletonRendererCustomMaterials folder for consistency
2016-04-14 00:56:32 +08:00
pharan
cc95db8e6c All scripts now in Spine.Unity and Spine.Unity.Modules namespace 2016-03-24 01:53:22 +08:00
pharan
fdf07aed92 Removed Mesh Generation Samples. 2016-03-24 00:36:08 +08:00
pharan
46ee116ee3 RenderSeparator update. 2016-03-24 00:35:19 +08:00
pharan
9254e18801 Spine.Unity and Spine.Unity.Editor namespace 2016-03-24 00:34:22 +08:00
pharan
80d8e9e276 Cleanup and improved inspector workflow. 2016-03-20 00:49:13 +08:00
pharan
9e8fdeef6c Spine.Unity namespace and some editor tweaks. 2016-03-19 16:54:43 +08:00
pharan
50a0960a7d Arrays Mesh Generators now share code. 2016-03-16 22:22:24 +08:00