Wojtek Figat
|
10180de9c6
|
Merge remote-tracking branch 'origin/master' into 1.8
# Conflicts:
# Source/Editor/Utilities/EditorUtilities.cpp
# Source/Editor/Utilities/EditorUtilities.h
|
2024-02-19 22:26:16 +01:00 |
|
Wojtek Figat
|
e12446e951
|
Merge branch 'rkrahn-patch-2'
|
2024-02-19 22:17:11 +01:00 |
|
Wojtek Figat
|
528c51cf6a
|
Merge branch 'patch-2' of https://github.com/rkrahn/FlaxEngine into rkrahn-patch-2
|
2024-02-19 22:17:06 +01:00 |
|
Wojtek Figat
|
d0dfff1287
|
Merge branch 'rkrahn-patch-1'
|
2024-02-19 22:16:58 +01:00 |
|
Wojtek Figat
|
45c331ba58
|
Merge branch 'patch-1' of https://github.com/rkrahn/FlaxEngine into rkrahn-patch-1
|
2024-02-19 22:16:52 +01:00 |
|
Wojtek Figat
|
db65b8037d
|
Fix crash due to font changes refactor
#2260
|
2024-02-19 22:14:39 +01:00 |
|
rkrahn
|
8aaf7417cc
|
Fix NextUnitCircleVector2 degree to radian
Fixes the use of degrees when radians should be used.
|
2024-02-19 13:04:26 -08:00 |
|
rkrahn
|
4ad5eb26d6
|
Fix NextUnitVector2 degree to radian
Fixes the use of degrees when radians should be used.
|
2024-02-19 13:00:38 -08:00 |
|
Wojtek Figat
|
504a997f12
|
Merge branch 'nothingTVatYT-slider'
|
2024-02-19 20:45:38 +01:00 |
|
Wojtek Figat
|
668b03a409
|
Use #2234 for all platforms by default
|
2024-02-19 20:40:30 +01:00 |
|
Wojtek Figat
|
eedc348032
|
Merge branch 'slider' of https://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-slider
|
2024-02-19 20:38:50 +01:00 |
|
Wojtek Figat
|
c1400748b0
|
Fix debug draw lists allocation
#2259
|
2024-02-19 20:36:41 +01:00 |
|
Wojtek Figat
|
0c0c4e6136
|
Merge branch 'nothingTVatYT-rubberband'
|
2024-02-19 19:13:25 +01:00 |
|
Wojtek Figat
|
ec0849c908
|
Add Ctrl for additive selection in rubberband
|
2024-02-19 19:12:53 +01:00 |
|
Wojtek Figat
|
d1f0a52967
|
Merge branch 'rubberband' of https://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-rubberband
|
2024-02-19 19:05:00 +01:00 |
|
Wojtek Figat
|
b9a503c3bd
|
Merge branch 'nothingTVatYT-refresh-selection'
|
2024-02-19 19:04:38 +01:00 |
|
Wojtek Figat
|
832151223b
|
Merge branch 'refresh-selection' of https://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-refresh-selection
|
2024-02-19 19:03:29 +01:00 |
|
Wojtek Figat
|
e985d10b62
|
Fix nested prefabs instance building logic
|
2024-02-19 19:03:11 +01:00 |
|
Wojtek Figat
|
f8d9817911
|
Fix terrain paint crash refression
|
2024-02-19 18:23:14 +01:00 |
|
Wojtek Figat
|
0035c347f4
|
Add safety check for splatmap sampling
|
2024-02-19 18:11:57 +01:00 |
|
Wojtek Figat
|
eba2dc295e
|
Merge branch 'Tryibion-reload-project'
|
2024-02-19 17:49:01 +01:00 |
|
Wojtek Figat
|
643fc78dd4
|
Merge branch 'reload-project' of https://github.com/Tryibion/FlaxEngine into Tryibion-reload-project
|
2024-02-19 17:48:56 +01:00 |
|
Wojtek Figat
|
91ba8458ee
|
Merge branch 'envision3d-master'
|
2024-02-19 17:48:25 +01:00 |
|
Wojtek Figat
|
056deb58ad
|
Fix compilation in #2257
|
2024-02-19 17:48:18 +01:00 |
|
Wojtek Figat
|
dd9733fdf1
|
Merge branch 'master' of https://github.com/envision3d/FlaxEngine into envision3d-master
|
2024-02-19 17:38:09 +01:00 |
|
Wojtek Figat
|
5cada42842
|
Fix missing engine api expose in Font.h
#2245
|
2024-02-19 17:37:59 +01:00 |
|
Wojtek Figat
|
4ebfe5a38e
|
Merge branch 'NoriteSC-Collections'
|
2024-02-19 17:36:45 +01:00 |
|
Wojtek Figat
|
2fd47f91e2
|
Fix codestyle #2179
|
2024-02-19 17:36:37 +01:00 |
|
Wojtek Figat
|
e8e52da51c
|
Merge branch 'Collections' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-Collections
|
2024-02-19 17:34:23 +01:00 |
|
Wojtek Figat
|
47d266a713
|
Merge branch 'RuanLucasGD-add_spline_snap'
|
2024-02-19 17:33:41 +01:00 |
|
Wojtek Figat
|
2de890ca6a
|
Codecleanup for #1482
|
2024-02-19 17:33:21 +01:00 |
|
Wojtek Figat
|
0d1dbd8845
|
Merge branch 'add_spline_snap' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-add_spline_snap
|
2024-02-19 15:51:02 +01:00 |
|
Wojtek Figat
|
cb0969893d
|
Fix build with older C# compiler
|
2024-02-19 15:12:37 +01:00 |
|
Wojtek Figat
|
4c082ef17f
|
Codestyle fixes
|
2024-02-19 14:59:02 +01:00 |
|
Wojtek Figat
|
ed30cd0238
|
Merge branch 'NoriteSC-Debug'
|
2024-02-19 14:53:40 +01:00 |
|
Wojtek Figat
|
7e10baf5ea
|
Fixes to code
|
2024-02-19 14:53:34 +01:00 |
|
Wojtek Figat
|
d2b8d14ca7
|
Merge branch 'Debug' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-Debug
# Conflicts:
# Source/Engine/Debug/DebugDraw.h
|
2024-02-19 14:28:28 +01:00 |
|
Wojtek Figat
|
324b2e7f66
|
Merge branch 'Chikinsupu-Visject-ImprovedNodeSearching'
|
2024-02-19 13:59:55 +01:00 |
|
Wojtek Figat
|
ed3d2c2748
|
Merge branch 'Visject-ImprovedNodeSearching' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-ImprovedNodeSearching
|
2024-02-19 13:57:55 +01:00 |
|
Wojtek Figat
|
52642d4d6c
|
Merge branch 'MineBill-new-script'
|
2024-02-19 10:54:39 +01:00 |
|
Wojtek Figat
|
a061afd840
|
Cleanup for #1827
|
2024-02-19 10:54:29 +01:00 |
|
envision3d
|
a5a16c3192
|
Fix issue with CharacterController initialization
|
2024-02-18 20:32:32 -06:00 |
|
Wojtek Figat
|
71627f1bbd
|
Merge branch 'new-script' of https://github.com/MineBill/FlaxEngine into MineBill-new-script
|
2024-02-18 20:32:27 +01:00 |
|
Wojtek Figat
|
4b24b79e90
|
Merge branch 'RuanLucasGD-optimize-actors-search'
|
2024-02-18 20:31:44 +01:00 |
|
Wojtek Figat
|
2cce7522de
|
Merge branch 'optimize-actors-search' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-optimize-actors-search
|
2024-02-18 20:31:04 +01:00 |
|
Wojtek Figat
|
ab07bab958
|
Merge branch 'RuanLucasGD-add-activeOnly-to-getactors'
|
2024-02-18 20:26:36 +01:00 |
|
Wojtek Figat
|
dad3d185f1
|
Merge branch 'add-activeOnly-to-getactors' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-add-activeOnly-to-getactors
|
2024-02-18 20:17:33 +01:00 |
|
Wojtek Figat
|
f344c68f48
|
Merge branch 'Menotdan-getprefabroot'
|
2024-02-18 20:16:33 +01:00 |
|
Wojtek Figat
|
9335925b48
|
Simplify code #1949
|
2024-02-18 20:16:20 +01:00 |
|
Wojtek Figat
|
0d6f85ba6c
|
Merge branch 'getprefabroot' of https://github.com/Menotdan/FlaxEngine into Menotdan-getprefabroot
|
2024-02-18 20:13:30 +01:00 |
|