GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,735 Commits 14 Branches 0 Tags
e0d97486ec37b7b22d11dc607bc098af5bd28124
Commit Graph

1845 Commits

Author SHA1 Message Date
Wojtek Figat
e0d97486ec Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 19:34:02 +02:00
Wojtek Figat
b65c84c02e Fix compilation issue from 62946f6359 2023-05-28 16:57:38 +02:00
Wojtek Figat
81ae687238 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 16:34:38 +02:00
Wojtek Figat
62946f6359 Cleanup and improve code from #1109 2023-05-28 16:12:32 +02:00
Wojtek Figat
482d516c2e Merge branch 'color-picker' of https://github.com/Menotdan/FlaxEngine into Menotdan-color-picker 2023-05-28 13:38:37 +02:00
Wojtek Figat
583a5d9223 Minor fixes to content window navigation 2023-05-28 13:17:43 +02:00
Wojtek Figat
997dc53a49 Merge branch 'content_copy_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-content_copy_fix 2023-05-28 13:05:08 +02:00
Chandler Cox
c9d48d00e7 Change default script name to MyScript and make the name invalid if it is called Script. 2023-05-27 11:15:54 -05:00
Ari Vuollet
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
e10aa1ff58 Add support for editing dictionary keys that are structures 2023-05-24 22:58:07 +02:00
Wojtek Figat
7efb3e3f3d Add SoftTypeReference<T> to scripting API for lazy-load type references (via typename) 2023-05-24 22:56:29 +02:00
Wojtek Figat
982639f215 Fix syncing Custom Editor value when using it to edit value-type 2023-05-24 22:55:02 +02:00
Wojtek Figat
47f9bc2017 Fix regression in Content Item tooltip #1085 2023-05-24 09:47:27 +02:00
Wojtek Figat
2ae20c5fc4 Add formatting to network profiler bytes values 2023-05-21 22:36:14 +02:00
Menotdan
306cedeb39 stopped being stupid and just copied dependencies from the other implementations. 2023-05-19 00:54:49 -04:00
Menotdan
66f66c5481 Whoops forgot includes. Hopefully this builds, but I don't have a mac to test so... 2023-05-19 00:11:29 -04:00
Menotdan
8c20ba83de Lay out what needs to be implemented for Mac 2023-05-18 22:10:35 -04:00
Menotdan
cdee91f258 Color Picker FINALLY works 2023-05-18 21:48:47 -04:00
Menotdan
8f6ceece10 Change XGrabPointer call a bit. 2023-05-18 19:40:39 -04:00
Menotdan
f5d3e30972 XGrabPointer doesn't seem to be doing what I want. 2023-05-18 15:42:04 -04:00
Menotdan
408d620b17 Removed more unneeded logs. 2023-05-18 00:00:06 -04:00
Menotdan
1d079842f6 Add Mac screen utilities, and removed an unneeded log. 2023-05-17 23:57:23 -04:00
Menotdan
b6395cf6f1 Trying to implement XGrabPointer... 2023-05-17 23:51:24 -04:00
Menotdan
d0f5d3270f Implement GetPixelAt and GetCursorPosition. 2023-05-17 23:16:44 -04:00
Menotdan
6e6a427488 refactor the code to not include BlockAndReadMouse() as a public API_FUNCTION() 2023-05-17 21:44:26 -04:00
Menotdan
48f890dd80 Merge branch 'color-picker' of https://github.com/menotdan/flaxengine into color-picker 
Pull down
 2023-05-17 21:21:30 -04:00
Menotdan
d4bd2d372c Merge branch 'FlaxEngine:master' into color-picker 2023-05-17 21:12:37 -04:00
Menotdan
7a6c1b8b86 Add linux implementation definitions. 2023-05-17 20:59:42 -04:00
Wojtek Figat
b244ffedd2 Fix output log text ranges to handle line ending 2023-05-17 12:23:01 +02:00
Menotdan
a870513086 Color picker finally works, refactored the code. 2023-05-16 13:54:25 -04:00
Menotdan
5cf3803860 Add ScreenUtilities class, to replace ScreenUtils in the Engine, so it is being moved to the Editor. 2023-05-16 10:50:53 -04:00
Wojtek Figat
e045f096a9 Add network debugging panel to actors and scripts 
#1066
 2023-05-16 14:59:15 +02:00
Wojtek Figat
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
Wojtek Figat
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
Menotdan
818ee98b27 Merge branch 'FlaxEngine:master' into color-picker 2023-05-15 20:46:39 -04:00
Menotdan
2a7a07d2fc Add a delegate, unfortunately it doesn't work? 2023-05-15 20:44:18 -04:00
Wojtek Figat
1dd8aa3db8 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-12 18:43:03 +02:00
Wojtek Figat
1af69421fa Fix actor scene tree dragging regression from d813078e91 
#1104
 2023-05-12 18:41:58 +02:00
Wojtek Figat
b43196cd1a Add missing implementation for #987 2023-05-12 14:56:19 +02:00
Wojtek Figat
b57018f55c Merge remote-tracking branch 'origin/master' into 1.6 2023-05-12 14:41:21 +02:00
Wojtek Figat
eab14e28da Add play/pause/stop buttons to particle effect editor while in play-mode 2023-05-12 14:39:57 +02:00
Wojtek Figat
92b155dbb3 Fix creating C# scripts in Editor with private ctor method 
#1018
 2023-05-12 13:58:39 +02:00
Menotdan
f94ae3f3fd Add mouse hook to the color picker. 2023-05-11 13:20:43 -04:00
Menotdan
a2d4207504 Fix compile errors. 2023-05-10 19:30:58 -04:00
Menotdan
627b1cee10 Resolve issues that came through when attempting to merge previously. 2023-05-10 17:49:45 -04:00
Menotdan
eb75f8a8ad Merge remote-tracking branch 'upstream/master' into color-picker 2023-05-10 17:33:07 -04:00
Menotdan
5bc76de7d6 Merge branch 'master' into scale-icon-change 2023-05-10 17:16:44 -04:00
Menotdan
4144c22dc4 Working demo of colorpicker eyedropper 2023-05-10 13:41:24 -04:00
Menotdan
2ce727d994 Correctly implement the ScreenUtils class 2023-05-10 13:34:28 -04:00