Wojtek Figat
|
5a66e90b56
|
Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
# .github/workflows/tests.yml
# Source/Engine/Content/JsonAsset.cs
|
2023-05-07 19:46:29 +02:00 |
|
Wojtek Figat
|
0a5d37fd9b
|
Add support for spawning multiple objects over network within a single group that is not from Prefabs
#1066
|
2023-05-07 19:40:31 +02:00 |
|
Wojtek Figat
|
531d005169
|
Fix accessing object ownership info locally before object gets fully spawned
#1066
|
2023-05-07 19:39:57 +02:00 |
|
Wojtek Figat
|
159fb8f5ee
|
Fix folders delete regression issue from dbd5c71344
#1084
|
2023-05-07 18:22:58 +02:00 |
|
Wojtek Figat
|
0c3d1e3ec6
|
Fix existing nested prefabs sync applying when updating base prefab changes
#1015
|
2023-05-07 18:12:06 +02:00 |
|
Wojtek Figat
|
dd7dc28828
|
Add automated unit test for nested prefab changes sync after base prefab apply #1015
|
2023-05-07 18:09:54 +02:00 |
|
Wojtek Figat
|
a99f792979
|
Disable unit test on Linux for now
|
2023-05-07 13:58:28 +02:00 |
|
Wojtek Figat
|
713cf0d4b2
|
Improve #1077 to use a single pixel shader with permutations
|
2023-05-07 11:01:30 +02:00 |
|
Wojtek Figat
|
10541ac743
|
Merge branch 'Withaust-debugshader'
|
2023-05-07 10:55:32 +02:00 |
|
Wojtek Figat
|
7c6148dfd8
|
Merge branch 'debugshader' of https://github.com/Withaust/FlaxEngine into Withaust-debugshader
|
2023-05-07 10:53:54 +02:00 |
|
Wojtek Figat
|
fae6a1ebe9
|
Merge branch 'Withaust-layermatrix'
|
2023-05-07 10:53:02 +02:00 |
|
Wojtek Figat
|
bc1cb402ab
|
Merge branch 'layermatrix' of https://github.com/Withaust/FlaxEngine into Withaust-layermatrix
|
2023-05-07 10:52:10 +02:00 |
|
Wojtek Figat
|
e973c3ee67
|
Merge branch 'Tryibion-ensure-prefab-staticflags'
|
2023-05-07 10:46:26 +02:00 |
|
Wojtek Figat
|
bcbbd98898
|
Merge branch 'ensure-prefab-staticflags' of https://github.com/Tryibion/FlaxEngine into Tryibion-ensure-prefab-staticflags
|
2023-05-07 10:46:20 +02:00 |
|
Wojtek Figat
|
4131e15f0e
|
Fix deprecation warnings
|
2023-05-07 10:46:13 +02:00 |
|
Wojtek Figat
|
e8ec5794d2
|
Simplify code #1034
|
2023-05-06 23:02:35 +02:00 |
|
Wojtek Figat
|
a9f1163743
|
Merge branch 'RuanLucasGD-master'
|
2023-05-06 23:01:47 +02:00 |
|
Wojtek Figat
|
4be02f5832
|
Merge branch 'master' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-master
|
2023-05-06 23:01:42 +02:00 |
|
Wojtek Figat
|
efab20e335
|
Fix compilation regression from 5d2a3482c7
|
2023-05-06 23:00:50 +02:00 |
|
Wojtek Figat
|
c47907c0c3
|
Fix C# serialization of reference to self (eg. script sub-object referencing owning script)
#55
|
2023-05-06 17:36:17 +02:00 |
|
Ruan Lucas
|
7faa9aa23a
|
Merge branch 'master' into master
|
2023-05-06 10:53:37 -04:00 |
|
Ruan Lucas
|
64515404e9
|
refactor again
|
2023-05-06 10:49:07 -04:00 |
|
Ruan Lucas
|
db14c8a0a6
|
refactor "GetSubTags"
|
2023-05-06 10:46:26 -04:00 |
|
Wojtek Figat
|
10bab59acc
|
Fix scene asset runtime contents when saving scene file in Editor
|
2023-05-06 14:58:10 +02:00 |
|
Wojtek Figat
|
2affebd375
|
Fix C# serialization of scene objects when property throws and exception
#88
|
2023-05-06 14:57:44 +02:00 |
|
Wojtek Figat
|
3f2f567364
|
Merge branch 'Withaust-customicons'
|
2023-05-05 16:28:28 +02:00 |
|
Wojtek Figat
|
dee445c32c
|
Fix compilation warnings
|
2023-05-05 16:27:57 +02:00 |
|
Wojtek Figat
|
d65fe3bae3
|
Merge branch 'customicons' of https://github.com/Withaust/FlaxEngine into Withaust-customicons
|
2023-05-05 16:23:42 +02:00 |
|
Wojtek Figat
|
04daf10a92
|
Merge branch 'Tryibion-random-range-visject'
|
2023-05-05 16:22:51 +02:00 |
|
Wojtek Figat
|
1a3c6bfc73
|
Merge branch 'random-range-visject' of https://github.com/Tryibion/FlaxEngine into Tryibion-random-range-visject
|
2023-05-05 16:22:46 +02:00 |
|
Wojtek Figat
|
b797d3b0f0
|
Merge branch 'Withaust-sceneunloading'
|
2023-05-05 16:19:53 +02:00 |
|
Wojtek Figat
|
bcefaea416
|
Merge branch 'sceneunloading' of https://github.com/Withaust/FlaxEngine into Withaust-sceneunloading
|
2023-05-05 16:19:16 +02:00 |
|
Chandler Cox
|
12a2a69ad7
|
Change to TryGetBox
|
2023-05-05 09:18:44 -05:00 |
|
Wiktor Kocielski
|
68151592a4
|
Make Level class to unload scenes in reversed order
|
2023-05-05 17:11:24 +03:00 |
|
Wojtek Figat
|
5d2a3482c7
|
Reduce compilation problems by moving FindObject fwd decl to be more commonly included
#1040
|
2023-05-05 16:10:09 +02:00 |
|
Wojtek Figat
|
e93eb6aae6
|
Merge branch 'Tryibion-collision-creation-fix'
|
2023-05-05 16:05:31 +02:00 |
|
Wojtek Figat
|
b7f269f9bd
|
Merge branch 'collision-creation-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-collision-creation-fix
|
2023-05-05 16:05:26 +02:00 |
|
Wojtek Figat
|
bb4c459296
|
Merge branch 'Tryibion-reopen-all-active-scenes'
|
2023-05-05 15:58:58 +02:00 |
|
Wojtek Figat
|
404340b02e
|
Improve #1025
|
2023-05-05 15:58:18 +02:00 |
|
Wojtek Figat
|
50c6b23e35
|
Merge branch 'reopen-all-active-scenes' of https://github.com/Tryibion/FlaxEngine into Tryibion-reopen-all-active-scenes
|
2023-05-05 15:47:41 +02:00 |
|
Chandler Cox
|
95d798f49e
|
Standardize to changing the folder for any proxy that can not be created in the current view.
|
2023-05-05 08:30:17 -05:00 |
|
Wiktor Kocielski
|
42a9eaf72e
|
Make DebugDraw render lines with unlit PS
|
2023-05-05 16:29:12 +03:00 |
|
Chandler Cox
|
86044fcc05
|
Change logic for Random Rang particle nodes
|
2023-05-05 08:17:07 -05:00 |
|
Wojtek Figat
|
285a824858
|
Fix crash when removing particle emitter from system that has old parameter override
#1044
|
2023-05-05 15:08:53 +02:00 |
|
Wojtek Figat
|
37e8fa7b76
|
Fix creating localization table on blank project
#1060
|
2023-05-05 14:54:42 +02:00 |
|
Wojtek Figat
|
315df12fbe
|
Favor passing Tag as value since it's just uint32 under the hood
|
2023-05-05 14:34:32 +02:00 |
|
Wojtek Figat
|
3a3e8e2ad5
|
Fix actors spawning in prefab editor
|
2023-05-05 14:18:32 +02:00 |
|
Wojtek Figat
|
ec2226f06e
|
Fixes for dotnet7 after #1061 and 5e31a678bd
|
2023-05-05 11:58:11 +02:00 |
|
Wojtek Figat
|
22239bc2d1
|
Merge remote-tracking branch 'origin/master' into 1.6
|
2023-05-05 11:41:32 +02:00 |
|
Wojtek Figat
|
238526bdc4
|
Merge branch 'GoaLitiuM-managed_handle_fix' into 1.6
|
2023-05-05 11:40:43 +02:00 |
|