Mike Wuetherick
|
871654b428
|
Merge pull request #15 from Unity-Technologies/features/ig.multiscene
Features/ig.multiscene
|
2020-01-13 16:59:12 -08:00 |
|
Mike Wuetherick
|
fe51d05d26
|
linked the images into the multi-scene docs
|
2020-01-13 14:44:42 -08:00 |
|
Mike Wuetherick
|
8457fe8035
|
added a samples.json as per vlad - also added a note in the docs about adding scenes to build settings for the runtime api as per jean
|
2020-01-13 14:33:13 -08:00 |
|
Mike Wuetherick
|
ec83672f56
|
Merge remote-tracking branch 'origin/dev' into features/ig.multiscene
|
2020-01-13 14:26:34 -08:00 |
Vlad Lazar
|
dbea2d5149
|
Merge pull request #16 from Unity-Technologies/yamatoCIFlavorFix
Yamato CI flavor fix
|
2020-01-13 16:55:16 -05:00 |
|
Vlad-Andrei Lazar
|
1d763b2e65
|
Add 2019.3 and trunk to the test versions
|
2020-01-13 15:31:57 -05:00 |
|
Vlad-Andrei Lazar
|
dfa3364c79
|
Fix Yamato build machine flavours
|
2020-01-13 15:17:46 -05:00 |
|
Mike Wuetherick
|
3fe721e00b
|
Merge branch 'features/ig.multiscene' of github.com:Unity-Technologies/film-tv-toolbox into features/ig.multiscene
# Conflicts:
# com.unity.film-tv.toolbox/Editor/MultiScene/MultiSceneLoaderEditor.cs
|
2020-01-01 18:08:04 -08:00 |
|
Mike Wuetherick
|
4544cc1464
|
attempting fix for SO not saving itself
|
2020-01-01 18:07:36 -08:00 |
|
Mike Wuetherick
|
9e62c1736f
|
attempting fix for SO not saving itself
|
2020-01-01 18:04:51 -08:00 |
|
Mike Wuetherick
|
fb61ebbc0b
|
moved all text strings to loc class, cleaned up formatting & messages
|
2019-12-29 14:18:13 -08:00 |
|
Mike Wuetherick
|
1e64a95830
|
added config sorting
|
2019-12-22 12:07:44 -08:00 |
|
Mike Wuetherick
|
d21a6f7fbf
|
update meta file so it doesn't conflict with new project sample scene
|
2019-12-20 08:33:50 -08:00 |
|
Mike Wuetherick
|
c7e9a791e3
|
updated help labels on the inspector (from wordWrappedLabel to helpBox style)
|
2019-12-17 16:54:03 -08:00 |
|
Mike Wuetherick
|
35c5300c96
|
Merge branch 'features/ig.multiscene' of https://github.com/Unity-Technologies/film-tv-toolbox into features/ig.multiscene
# Conflicts:
# com.unity.film-tv.toolbox/Documentation~/multisceneloader.md
|
2019-12-17 16:37:49 -08:00 |
|
Mike Wuetherick
|
8c84cc4536
|
First pass documentation for multi-scene loader
|
2019-12-17 16:37:33 -08:00 |
|
Mike Wuetherick
|
3a2e36c393
|
First pass documentation for multi-scene loader
|
2019-12-17 16:31:19 -08:00 |
|
Mike Wuetherick
|
008538b11a
|
added 'unload existing' flag to loading individual scene configs so you can load a set of scenes additively instead of replacing all existing scenes. also replaced the defaultinspector with a custom inspector for editing the scene configs
|
2019-12-17 16:15:50 -08:00 |
|
Mike Wuetherick
|
7edf93ed6e
|
Merge branch 'features/ig.multiscene' of https://github.com/Unity-Technologies/film-tv-toolbox into features/ig.multiscene
# Conflicts:
# com.unity.film-tv.toolbox/Editor/MultiScene/MultiSceneLoaderEditor.cs
# com.unity.film-tv.toolbox/Runtime/MultiScene/MultiSceneLoader.cs
# com.unity.film-tv.toolbox/Samples/MultiScene/RuntimeLoadSample/TestRuntimeLoader.cs
|
2019-12-17 14:41:00 -08:00 |
|
Mike Wuetherick
|
f33e909d95
|
Multi-scene loading system - edit mode & runtime mode
|
2019-12-17 14:39:57 -08:00 |
|
Mike Wuetherick
|
46eb8f56d7
|
Multi-scene loading system - edit mode & runtime mode
|
2019-12-17 14:35:48 -08:00 |
Marie FETIVEAU
|
1731a3e22a
|
Merge pull request #13 from Unity-Technologies/dev
Merge dev into master
|
2019-05-23 14:58:59 -04:00 |
|
Marie FETIVEAU
|
158d15e194
|
Merge pull request #12 from Unity-Technologies/release_0.2.0-preview
Release 0.2.0 preview.1
|
2019-05-23 14:28:40 -04:00 |
Marie Fetiveau
|
c152f37226
|
Update AudioRecorder doc
|
2019-05-23 13:56:33 -04:00 |
|
Marie Fetiveau
|
f64383c6fb
|
Update CI to add promotion
|
2019-05-23 13:52:39 -04:00 |
|
Marie Fetiveau
|
1cf8ccceff
|
Bump version and changelog to 0.2.0-preview.1
|
2019-05-23 13:46:52 -04:00 |
|
Marie FETIVEAU
|
8a6e3a6acd
|
Merge pull request #10 from Unity-Technologies/alembicmaterialmapper
New Alembic Material Mapper component
|
2019-05-23 13:11:03 -04:00 |
|
Mike Wuetherick
|
bd8e845e73
|
Merge pull request #11 from Unity-Technologies/fix_CI_ABCMatMapper
Format package and fix CI for Alembic Material Remapper
|
2019-05-09 14:25:22 -07:00 |
|
Marie Fetiveau
|
ac2f658719
|
Remove useless dependency that makes CI fails
|
2019-05-09 14:14:40 -04:00 |
|
Marie Fetiveau
|
020a8d545c
|
Update README
|
2019-05-08 15:38:37 -04:00 |
|
Marie Fetiveau
|
69246b8d15
|
Update main doc
|
2019-05-08 15:33:26 -04:00 |
|
Marie Fetiveau
|
c9699d5e1a
|
Convert doc images into png
Jpg are not authorized in packages
|
2019-05-08 15:20:17 -04:00 |
|
Marie Fetiveau
|
3ffe4db91d
|
Update npmignore
|
2019-05-08 15:10:03 -04:00 |
|
Marie Fetiveau
|
e138a15673
|
Create and populate Runtime folder
|
2019-05-08 15:09:25 -04:00 |
|
Mike Wuetherick
|
88f9f16165
|
getting rid of linq, just using arrays instead
|
2019-05-08 08:27:47 -07:00 |
|
Mike Wuetherick
|
ac84a07fcc
|
fix paths to images in docs
|
2019-05-07 08:48:28 -07:00 |
|
Mike Wuetherick
|
6cb2e157d2
|
Added some docs
|
2019-05-07 08:46:53 -07:00 |
|
Mike Wuetherick
|
05bda6eb7e
|
new Alembic Material Mapper component
|
2019-05-07 08:29:30 -07:00 |
|
Marie Fetiveau
|
56ef1ac88f
|
Merge branch 'dev'
|
2019-04-11 13:43:34 -04:00 |
|
Marie FETIVEAU
|
fef6765b7f
|
Merge pull request #8 from Unity-Technologies/dev_fixYamato
upm-ci: pack on OSX to avoid \ (FTV-19)
|
2019-04-11 13:43:07 -04:00 |
|
Marie Fetiveau
|
c5c4bcfcfd
|
Bump version and changelog (FTV-19)
|
2019-04-11 13:23:43 -04:00 |
|
Marie Fetiveau
|
0dbb30af35
|
upm-ci: use stable upm-ci (FTV-19)
|
2019-04-11 13:02:49 -04:00 |
|
Marie Fetiveau
|
0f08c23e18
|
upm-ci: pack on OSX to avoid \ (FTV-19)
|
2019-04-11 10:11:34 -04:00 |
|
Marie Fetiveau
|
860bf9ce41
|
Merge branch 'dev'
|
2019-04-10 16:23:07 -04:00 |
|
Marie FETIVEAU
|
bc3958eb1e
|
Merge pull request #7 from Unity-Technologies/dev_Package_FTV-19
Integrate Shotgun CSV example as a package samples (FTV-19)
|
2019-04-10 16:21:31 -04:00 |
|
Marie Fetiveau
|
155c2cac01
|
Update package README (FTV-19)
|
2019-04-10 14:56:16 -04:00 |
|
Marie Fetiveau
|
bc74a39f1a
|
ShotgunSamples: initial commit (FTV-19)
Needed for Unity < 2019.1 where samples are not easily accessible
|
2019-04-10 14:54:00 -04:00 |
|
Marie Fetiveau
|
2107a0eeb9
|
Update doc (FTV-19)
|
2019-04-10 14:48:08 -04:00 |
|
Marie Fetiveau
|
44186c76b5
|
Fix PackageUtils tests on Windows (FTV-19)
|
2019-04-10 11:40:26 -04:00 |
|
Marie Fetiveau
|
af2a74866c
|
ShotgunCSVImportExport: linting pass (FTV-19)
|
2019-04-10 08:54:57 -04:00 |