Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
5,667 Commits 16 Branches 23 Tags
48b18bf84e6eb9b53863a59d70a90f8d2fc68cab
Commit Graph

1808 Commits

Author SHA1 Message Date
mafiesto4 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
mafiesto4 e10aa1ff58 Add support for editing dictionary keys that are structures 2023-05-24 22:58:07 +02:00
mafiesto4 7efb3e3f3d Add SoftTypeReference<T> to scripting API for lazy-load type references (via typename) 2023-05-24 22:56:29 +02:00
mafiesto4 982639f215 Fix syncing Custom Editor value when using it to edit value-type 2023-05-24 22:55:02 +02:00
mafiesto4 47f9bc2017 Fix regression in Content Item tooltip #1085 2023-05-24 09:47:27 +02:00
mafiesto4 2ae20c5fc4 Add formatting to network profiler bytes values 2023-05-21 22:36:14 +02:00
mafiesto4 b244ffedd2 Fix output log text ranges to handle line ending 2023-05-17 12:23:01 +02:00
mafiesto4 e045f096a9 Add network debugging panel to actors and scripts 
#1066
 2023-05-16 14:59:15 +02:00
mafiesto4 4482fc0bcf Cleanup #1086 
Reuse text for UI tooltip
Remove `IconButton` and use simple button instead
Cleanup code style
 2023-05-16 12:13:23 +02:00
mafiesto4 73ee5676c6 Merge branch 'scale-icon-change' of https://github.com/Menotdan/FlaxEngine into Menotdan-scale-icon-change 2023-05-16 12:01:10 +02:00
mafiesto4 1dd8aa3db8 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-12 18:43:03 +02:00
mafiesto4 1af69421fa Fix actor scene tree dragging regression from d813078e91 
#1104
 2023-05-12 18:41:58 +02:00
mafiesto4 b43196cd1a Add missing implementation for #987 2023-05-12 14:56:19 +02:00
mafiesto4 b57018f55c Merge remote-tracking branch 'origin/master' into 1.6 2023-05-12 14:41:21 +02:00
mafiesto4 eab14e28da Add play/pause/stop buttons to particle effect editor while in play-mode 2023-05-12 14:39:57 +02:00
mafiesto4 92b155dbb3 Fix creating C# scripts in Editor with private ctor method 
#1018
 2023-05-12 13:58:39 +02:00
Menotdan 627b1cee10 Resolve issues that came through when attempting to merge previously. 2023-05-10 17:49:45 -04:00
Menotdan 5bc76de7d6 Merge branch 'master' into scale-icon-change 2023-05-10 17:16:44 -04:00
mafiesto4 fe4e8f3dd2 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-10 12:13:45 +02:00
mafiesto4 0c2c643ea8 Follow up #1085 with expendable type description for content items 2023-05-10 10:29:59 +02:00
mafiesto4 3bff65d6b6 Minor fix 2023-05-10 10:03:13 +02:00
mafiesto4 03ab243f9b Merge branch 'master' of https://github.com/Menotdan/FlaxEngine into Menotdan-master 2023-05-10 10:02:06 +02:00
mafiesto4 b14f5f5cd6 Fix macOS build 2023-05-10 08:08:21 +02:00
mafiesto4 e03516e22e Optimize text formatting functions instantiation to favor manually called String::Format 2023-05-09 16:38:59 +02:00
mafiesto4 d13c722ce3 Optimize text formatting in various places 2023-05-09 13:44:32 +02:00
GoaLitiuM c1fa9e595c Sort profiler window assets when the view is active 2023-05-08 23:27:02 +03:00
mafiesto4 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
mafiesto4 8edc154501 Fix UIControl linkage to Prefab window when creating UI within prefab Editor 
#1007
 2023-05-08 19:22:23 +02:00
mafiesto4 ec6e459aa7 Fix CPU profiler events extraction when buffer is full 2023-05-08 17:05:40 +02:00
mafiesto4 95daff3e96 Run editor analytics in async 2023-05-08 11:40:50 +02:00
mafiesto4 04439d9dec Upgrade Editor analytics from deprecated Universal Analytics to the latest GA4 2023-05-08 11:40:20 +02:00
Menotdan 681564189f Finish implementing IconButton and use that to create a more intuitive scale linking interface. 2023-05-08 00:42:38 -04:00
Menotdan 296ac0b940 Revert "Use shorter, relative path for displaying Asset Tooltips." 
This reverts commit 4c906f4040.

undo changes from master branch which I don't want for this seperate change.
 2023-05-07 23:04:11 -04:00
Menotdan 141555377b Begin working on an IconButton class, and demoing the IconButton idea using the scale link icon. 2023-05-07 22:58:57 -04:00
mafiesto4 c0428c3316 Simplify Editor analytics code 2023-05-07 23:02:36 +02:00
Menotdan f3d7ad0aa9 Add better tooltips to all files and folders. 2023-05-07 14:03:27 -04:00
mafiesto4 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
Menotdan cffc3f7f5d Better formatting for type names. 2023-05-07 13:44:15 -04:00
Menotdan c717a102fc Add an option to toggle translating tooltip type names (not implemented yet) 2023-05-07 13:12:27 -04:00
Menotdan 4c906f4040 Use shorter, relative path for displaying Asset Tooltips. 2023-05-07 13:11:53 -04:00
mafiesto4 159fb8f5ee Fix folders delete regression issue from dbd5c71344 
#1084
 2023-05-07 18:22:58 +02:00
mafiesto4 bc1cb402ab Merge branch 'layermatrix' of https://github.com/Withaust/FlaxEngine into Withaust-layermatrix 2023-05-07 10:52:10 +02:00
mafiesto4 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
mafiesto4 dee445c32c Fix compilation warnings 2023-05-05 16:27:57 +02:00
mafiesto4 d65fe3bae3 Merge branch 'customicons' of https://github.com/Withaust/FlaxEngine into Withaust-customicons 2023-05-05 16:23:42 +02:00
mafiesto4 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
mafiesto4 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
mafiesto4 404340b02e Improve #1025 2023-05-05 15:58:18 +02:00
mafiesto4 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
Tryibion 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