Граф коммитов

1686 Коммитов

Автор SHA1 Сообщение Дата
Alex Lian f0d0639cac Incorrect file path fix up 2018-02-20 12:55:38 +01:00
Alex Lian 6e167dfcff Package validation test fixups
- Add appropriate files and meta files
- Add first level doc
2018-02-20 12:29:24 +01:00
Alex Lian 89f311850f Update build automation for changes to directory structures
Re-aligning to new organization
2018-02-20 10:37:34 +01:00
Peter Bay Bastian 9894c6ecfd
Merge pull request #249 from Unity-Technologies/submodularize
Submodularize
2018-02-19 14:02:56 +01:00
Peter Bay Bastian 6e616e1b96 Remove old integration test graphs 2018-02-19 12:08:20 +01:00
Peter Bay Bastian 29ff237515 Move tests outside package folder 2018-02-19 12:06:50 +01:00
Peter Bay Bastian 32b40be3af TestAssets -> TestbedAssets 2018-02-19 11:59:05 +01:00
Peter Bay Bastian c5a6539055 Fix paths for integration tests 2018-02-19 11:54:51 +01:00
Peter Bay Bastian c2dfc07dd9 Fix shader include paths, update gitignore, add meta files and replace UNITY_SHADERGRAPH_DEVMODE with an optional DebugOutput directory 2018-02-19 11:32:17 +01:00
Peter Bay Bastian 9e8c94238b Remove unneeded files 2018-02-19 09:58:41 +01:00
Peter Bay Bastian 20973441d7 Move files from Assets to top-level 2018-02-19 09:57:48 +01:00
Peter Bay Bastian 9176d6aafc Remove redundant .editorconfig 2018-02-19 09:54:33 +01:00
Peter Bay Bastian 7ebbb5f6d9 Move some test assets inside the TestAssets folder 2018-02-19 09:53:54 +01:00
Peter Bay Bastian 467abacb92 Remove old, unused folders and files 2018-02-19 09:51:45 +01:00
Peter Bay Bastian cf4d92b913 Rename package folder to match package name 2018-02-19 09:36:50 +01:00
Martin Thorzen 3593f0eb9d
Merge pull request #247 from keijiro/fix-null-preview
Fix for NullReferenceException in master preview.
2018-02-19 09:00:55 +01:00
Keijiro Takahashi 7b89f68646 Added null-checks to master preview. 2018-02-17 10:28:37 +09:00
jensgholm15@gmail.com 2d8bc7b199
Merge pull request #246 from Unity-Technologies/devmode-define
Devmode define
2018-02-16 16:14:23 +01:00
Peter Bay Bastian 41c5039a9e
Merge pull request #245 from Unity-Technologies/fix-242
Fixes #242 by initalizing the color space field properly
2018-02-16 16:01:41 +01:00
Peter Bay Bastian abc934f809 Hide debug outputs behind a define 2018-02-16 16:00:28 +01:00
Peter Bay Bastian 5de3d78234 Fixes #242 by initalizing the color space field properly 2018-02-16 15:10:05 +01:00
Peter Bay Bastian 2d3998daee
Merge pull request #239 from Unity-Technologies/double-click-to-open-subgraph
Added functionality to double click on a subgraph node to open it up …
2018-02-16 14:38:21 +01:00
jensgholm15@gmail.com eb6df595b3
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
2018-02-16 14:37:25 +01:00
Peter Bay Bastian e7eff7a87b Remove unused imports in entire solution 2018-02-16 14:21:53 +01:00
Peter Bay Bastian 2c828593b7 Merge with master 2018-02-16 13:30:38 +01:00
Peter Bay Bastian 2b1bbd8be7 Remove unused variables and classes and rework how master preview resizing is handled 2018-02-16 12:41:08 +01:00
Peter Bay Bastian c46bd9e5da
Merge pull request #240 from Unity-Technologies/fix-217
Fixes #217
2018-02-15 16:15:35 +01:00
Peter Bay Bastian 6636dcf3fa Fixes #217 by searching all assemblies in the app domain 2018-02-15 16:14:40 +01:00
Martin Thorzen 07518acdc2 Updated so it is only left mouse click that can open using the double click 2018-02-15 16:08:44 +01:00
Martin Thorzen 91220c0ca9 Added Right click context menu to open sub graph 2018-02-15 15:46:04 +01:00
Peter Bay Bastian 6387c4351d
Merge pull request #238 from Unity-Technologies/master-preview-fixes
Master preview missing RenderTexture fixes
2018-02-15 14:32:14 +01:00
Martin Thorzen 3790b7b6be Added functionality to double click on a subgraph node to open it up in a new shader graph window 2018-02-15 14:27:22 +01:00
Jens Holm 528bbc93c9 Add hide flags to master preview rendertexture (fixed #225) 2018-02-15 14:20:42 +01:00
Jens Holm 2583508c36 Make master preview refresh rendertexture on play mode change and check if rendertexture is null 2018-02-15 14:05:10 +01:00
Peter Bay Bastian c782b41bda
Merge pull request #230 from Unity-Technologies/master-preview-rendertexture-rescale
Master preview rendertexture rescale
2018-02-15 14:03:42 +01:00
Peter Bay Bastian c6e7cafe94
Merge pull request #224 from Unity-Technologies/node-matrix
Node Matrix
2018-02-15 13:43:36 +01:00
Jens Holm aaa5c96cfa Make master preview dirty after rendertexture is resized (fixes #235) 2018-02-15 13:27:18 +01:00
Jens Holm 14fa95dbc6 Make master preview dirty when mouse wheel is scrolled (zoom changes) 2018-02-15 13:20:53 +01:00
Peter Bay Bastian 10cb54190a
Merge pull request #233 from Unity-Technologies/node-bugfixes
Node bugfixes
2018-02-15 12:00:58 +01:00
Peter Bay Bastian 58c338648f Merge branch 'master' into node-bugfixes
# Conflicts:
#	MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
2018-02-15 11:59:25 +01:00
Martin Thorzen 2936780b0f
Merge pull request #237 from Unity-Technologies/disable-resizing-in-preview-node
[FIX] Disabled the resizing of preview node.
2018-02-15 11:24:11 +01:00
Martin Thorzen 6dcb5e8fd6 [FIX] Disabled the resizing of preview node. 2018-02-15 11:21:50 +01:00
Peter Bay Bastian 557b611cf8
Merge pull request #236 from Unity-Technologies/splitting-up-uss-files
Splitting up uss files
2018-02-15 11:10:31 +01:00
Martin Thorzen 6ec6df1e70 Split up ScreenPositionSlotControl into its own .USS file 2018-02-15 10:50:35 +01:00
Martin Thorzen d163ec780e Merge with master 2018-02-15 09:48:18 +01:00
Martin Thorzen 7ad3d1bbee Split up MaterialGraph.USS file into multiple USS files for better organization. 2018-02-15 08:59:58 +01:00
Matt Dean 8f13a8ceda Fix Transform node bitangent usage 2018-02-14 14:05:03 +00:00
Matt Dean f87eb4cfcc Transform Triplanar normal output to tangent space 2018-02-14 14:04:48 +00:00
Matt Dean b75513928f Whiteout blend method for Triplanar node normal mode 2018-02-14 12:05:49 +00:00
Matt Dean ca0f133be9
Merge pull request #232 from keijiro/step-args
Easy-to-understand slot names for Step node.
2018-02-13 17:31:09 +00:00