Commit Graph

5286 Commits

Author SHA1 Message Date
Wojtek Figat
b1b1b88982 Merge branch 'Swiggies-input-phases' 2023-05-12 14:13:24 +02:00
Wojtek Figat
17b95e3ee5 Merge branch 'input-phases' of https://github.com/Swiggies/FlaxEngine into Swiggies-input-phases 2023-05-12 14:13:18 +02:00
Wojtek Figat
3d36d1ce71 Merge branch 'Tryibion-style-org' 2023-05-12 14:09:17 +02:00
Olly Rybak
b8ed115f63 More renames 2023-05-12 09:30:35 +10:00
Menotdan
f94ae3f3fd Add mouse hook to the color picker. 2023-05-11 13:20:43 -04:00
Olly Rybak
4b4bf833a9 Rename Phase > State 2023-05-12 00:25:03 +10:00
Olly Rybak
d5237715a5 Removed unused field 2023-05-11 21:12:03 +10:00
Olly Rybak
395a72b7d4 Added comments / reformat 2023-05-11 21:10:40 +10:00
Olly Rybak
f80ded2057 Initial setup 2023-05-11 17:30:20 +10: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
Menotdan
1855ff133e Tweak a few classes, add the Base classes. 2023-05-10 12:46:54 -04:00
Menotdan
51004bbd9d Learned about filter folders and now VS likes me :) 2023-05-10 11:03:05 -04:00
Menotdan
873d42344b remove files as visual studio is bugging. 2023-05-10 10:39:25 -04:00
Menotdan
27b6ba83a6 Added Windows Base Class for getting screen pixels and other screen-wide utilities 2023-05-10 10:31:44 -04:00
Chandler Cox
eeaf7eb733 Move BoxSize 2023-05-10 08:04:47 -05:00
Chandler Cox
2b59cbf0f1 Organize the style groups of UI controls 2023-05-10 07:44:54 -05:00
Wojtek Figat
0c2c643ea8 Follow up #1085 with expendable type description for content items 2023-05-10 10:29:59 +02:00
Wojtek Figat
3bff65d6b6 Minor fix 2023-05-10 10:03:13 +02:00
Wojtek Figat
1069ff0c60 Merge branch 'Menotdan-master' 2023-05-10 10:02:14 +02:00
Wojtek Figat
03ab243f9b Merge branch 'master' of https://github.com/Menotdan/FlaxEngine into Menotdan-master 2023-05-10 10:02:06 +02:00
Wojtek Figat
b9d8e2b336 Merge branch 'GoaLitiuM-optimize_profiler_asset_sort' 2023-05-10 09:56:29 +02:00
Menotdan
59c54db275 Implement C# callback for pixels finished reading 2023-05-10 00:58:38 -04:00
Menotdan
1ebf4d49e5 trying to get the correct window 2023-05-09 16:49:03 -04:00
Menotdan
c73ab05d70 Rather odd attempt to screenshot the view 2023-05-09 16:14:37 -04:00
c1fa9e595c Sort profiler window assets when the view is active 2023-05-08 23:27:02 +03:00
Menotdan
ec60c90963 Implement basic design of the eyedropper button. 2023-05-08 15:59:19 -04:00
Wojtek Figat
8edc154501 Fix UIControl linkage to Prefab window when creating UI within prefab Editor
#1007
2023-05-08 19:22:23 +02:00
Menotdan
86d0ccb210 Mark SetColors() virtual to override it in IconButton 2023-05-08 12:51:34 -04:00
Menotdan
74af2e53a8 Add IconButton for this branch. 2023-05-08 12:50:33 -04:00
Wojtek Figat
3ea771fe22 Fix crash on engine exit when asset fails to load due to serialized version mismatch 2023-05-08 17:06:13 +02:00
Wojtek Figat
ec6e459aa7 Fix CPU profiler events extraction when buffer is full 2023-05-08 17:05:40 +02:00
Wojtek Figat
959fa185c3 Fix compilation error from fa2171503b 2023-05-08 14:30:22 +02:00
Wojtek Figat
fa2171503b Fix locale on Linux 2023-05-08 13:57:11 +02:00
Wojtek Figat
2c2b403da1 Revert aeda759086 2023-05-08 13:57:02 +02:00
Wojtek Figat
a5afa04f8f Fix model screen size calculation in orthographic view projections
#980
2023-05-08 12:44:01 +02:00
Wojtek Figat
aeda759086 Minor tweak 2023-05-08 12:32:42 +02:00
Wojtek Figat
0508d5a987 Merge branch 'GoaLitiuM-tracy_v09' 2023-05-08 11:56:31 +02:00
Wojtek Figat
31a000b2b6 Merge branch 'tracy_v09' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-tracy_v09 2023-05-08 11:56:15 +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
f6ee5123d7 Revert "Use shorter, relative path for displaying Asset Tooltips."
This reverts commit 4c906f4040.

Revert changes I don't want anymore, after making a new branch for the changes I've done.
2023-05-07 23:10:07 -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
Menotdan
e7249d9d94 Merge branch 'FlaxEngine:master' into master 2023-05-07 15:38:07 -04:00
Menotdan
f3d7ad0aa9 Add better tooltips to all files and folders. 2023-05-07 14:03:27 -04:00
Menotdan
cffc3f7f5d Better formatting for type names. 2023-05-07 13:44:15 -04:00