Commit Graph

575 Commits

Author SHA1 Message Date
Wojtek Figat
8f7da81621 Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Flax.flaxproj
#	Source/Editor/Content/Items/AssetItem.cs
2023-06-13 15:41:07 +02:00
Wojtek Figat
13b1c16213 Add asset reload option via context menu in Editor 2023-06-13 14:58:14 +02:00
Wojtek Figat
979168e82c Refactor various Editor APIs to use auto-generated bindings instead of manual code 2023-06-12 14:34:07 +02:00
Wojtek Figat
f552dd0c28 Merge remote-tracking branch 'origin/master' into 1.6 2023-06-10 23:29:22 +02:00
Wojtek Figat
3bbfe9de8a Code cleanup, add tooltip and cache property option in layout #1140 2023-06-09 17:32:57 +02:00
Wojtek Figat
a0d6f3c22b Merge branch 'ui-resize-update' of https://github.com/Swiggies/FlaxEngine into Swiggies-ui-resize-update 2023-06-09 17:23:00 +02:00
Wojtek Figat
007edb4651 Merge commit '2c809389ad7d8953b10e7ab3b1b29aca4d072116' into 1.6 2023-06-01 01:06:27 +02:00
Olly Rybak
fce41b95f6 Added bool to properties window to carry value between controls 2023-05-29 20:55:55 +10:00
Wojtek Figat
44036a26d0 Fix UI Control selection highlights when using Canvas Scaler
#977
2023-05-28 21:35:56 +02:00
Wojtek Figat
81ae687238 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 16:34:38 +02:00
Wojtek Figat
583a5d9223 Minor fixes to content window navigation 2023-05-28 13:17:43 +02:00
bca5e908f1 Copy content files using Content Database instead of Content Importing
Fixes an issue where copying asset files does not change the asset ID,
causing the copied assets to remain linked to the original files.
2023-05-27 00:41:19 +03:00
Wojtek Figat
694980160b Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Editor/CustomEditors/CustomEditorsUtil.cs
#	Source/Engine/Networking/NetworkReplicator.cpp
#	Source/Engine/Scripting/ManagedCLR/MUtils.cpp
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
2023-05-24 23:28:38 +02:00
Wojtek Figat
2ae20c5fc4 Add formatting to network profiler bytes values 2023-05-21 22:36:14 +02:00
Wojtek Figat
b244ffedd2 Fix output log text ranges to handle line ending 2023-05-17 12:23:01 +02:00
Wojtek Figat
fe4e8f3dd2 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-10 12:13:45 +02:00
Wojtek Figat
3bff65d6b6 Minor fix 2023-05-10 10:03:13 +02:00
c1fa9e595c Sort profiler window assets when the view is active 2023-05-08 23:27:02 +03:00
Wojtek Figat
80e6853f44 Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
2023-05-08 22:22:32 +02:00
Wojtek Figat
ec6e459aa7 Fix CPU profiler events extraction when buffer is full 2023-05-08 17:05:40 +02:00
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
159fb8f5ee Fix folders delete regression issue from dbd5c71344
#1084
2023-05-07 18:22:58 +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
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
Wojtek Figat
37e8fa7b76 Fix creating localization table on blank project
#1060
2023-05-05 14:54:42 +02:00
Wojtek Figat
3a3e8e2ad5 Fix actors spawning in prefab editor 2023-05-05 14:18:32 +02:00
Wojtek Figat
22239bc2d1 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-05 11:41:32 +02:00
Wojtek Figat
b98d3ae572 Update splash screen quotes 2023-05-05 09:36:32 +02:00
Wojtek Figat
53223bb2ab Update splash screen quotes 2023-05-05 09:35:19 +02:00
Wojtek Figat
71a5d56105 Add support for importing skeleton-only as Skinned Model (eg. from animation file to have skeleton for retargeting) 2023-05-04 15:43:44 +02:00
Wojtek Figat
273b6c0228 Various minor improvements 2023-05-04 11:55:22 +02:00
Wojtek Figat
05ffaf7cef Add **skeleton retargeting** to play animations on different skeletons 2023-05-04 11:54:17 +02:00
Ruan Lucas
299ca398fa small change in particle window 2023-04-29 18:44:54 -04:00
Wojtek Figat
915f6a719d Add automatic skeleton retargeting when playing Anim Graph on other skeletal model 2023-04-26 20:03:27 +02:00
Wojtek Figat
12f5157bfb Add debug drawing selected skeleton node in Skinned Model window viewport 2023-04-26 17:28:58 +02:00
Wojtek Figat
968e1328dc Add skeleton node or bone copy context menu in Editor 2023-04-26 16:20:30 +02:00
Wojtek Figat
390460907d Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
2023-04-22 18:59:41 +02:00
Wojtek Figat
97e2e9a61d Fix content view items refresh (eg. after delete) when using search field 2023-04-22 11:51:18 +02:00
Wojtek Figat
8c638e7947 Improve audio clip window usability in Editor 2023-04-20 11:13:20 +02:00
Wojtek Figat
6ec35e5175 Add audio clip preview refresh on asset reimport in Editor 2023-04-20 10:50:29 +02:00
Wojtek Figat
787414451e Add current playback position preview with seeking functionality to Audio Clip window in Editor 2023-04-19 15:17:01 +02:00
Wojtek Figat
67b373c6df Merge remote-tracking branch 'origin/master' into 1.6 2023-04-17 13:18:08 +02:00
Wojtek Figat
c3ef9f993b Merge branch 'change-profilier-play-icon' of https://github.com/Tryibion/FlaxEngine into Tryibion-change-profilier-play-icon 2023-04-17 13:08:46 +02:00
Wojtek Figat
6562a8769e Merge branch 'master' of https://github.com/Withaust/FlaxEngine into Withaust-master 2023-04-17 12:34:23 +02:00
Wojtek Figat
b7dcf9576e Merge branch 'content-bug-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-content-bug-fix 2023-04-17 12:29:03 +02:00
Wojtek Figat
2eea7abc27 Add Create collision data action to be performed for each model selected in the Content Window 2023-04-17 12:20:02 +02:00
Wiktor Kocielski
dbd5c71344 Fix RMB deletion to take selection into account 2023-04-15 22:32:52 +03:00
Chandler Cox
acecda482d Changes the play icon to a stop icon and vice versa when clicked for the profiler. 2023-04-14 15:29:02 -05:00
Chandler Cox
c420318267 Fix bug with path name preventing the item to be renamed when duplicated. 2023-04-14 09:18:06 -05:00
Wojtek Figat
91c017713c Merge remote-tracking branch 'origin/master' into 1.6 2023-04-13 12:12:33 +02:00