GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,284 Commits 14 Branches 0 Tags
2f48521ce7527cdd3bb06b0dc65ce5ebf2a57cc6
Commit Graph

480 Commits

Author SHA1 Message Date
Wojtek Figat
19ad91d5d8 Merge remote-tracking branch 'origin/master' into 1.9 2024-05-31 22:12:03 +02:00
Wojtek Figat
949057b1c3 Fix some html tags parsing to be safer 2024-05-30 17:22:43 +02:00
Chandler Cox
94884fc39a Run control update even when UiCanvas skips events. 2024-05-22 14:52:30 -05:00
Wojtek Figat
12cf7f0f92 Merge remote-tracking branch 'origin/master' into 1.9 
# Conflicts:
#	Flax.flaxproj
 2024-05-22 16:15:14 +02:00
Wojtek Figat
cb878294ea Minor fixes 2024-05-20 17:09:59 +02:00
Ari Vuollet
58351d1989 Fix RichTextBox not drawing the last character 2024-05-18 00:00:27 +03:00
Wojtek Figat
0a4e89e29b Fix UI navigation when using multiple canvases 
#2574
 2024-05-16 16:12:53 +02:00
Wojtek Figat
97be8ee8cc Merge remote-tracking branch 'origin/master' into 1.9 
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	Source/Engine/Renderer/GBufferPass.cpp
 2024-05-15 23:49:05 +02:00
Wojtek Figat
b4a4a8a591 Minor code cleanup 2024-05-15 12:40:08 +02:00
Wojtek Figat
c670887b1a Merge branch 'font-case' of https://github.com/Tryibion/FlaxEngine into Tryibion-font-case 2024-05-15 12:30:39 +02:00
Wojtek Figat
57084b3d6c Merge branch 'tooltip-text-padding' of https://github.com/Tryibion/FlaxEngine into Tryibion-tooltip-text-padding 2024-05-15 12:23:47 +02:00
Wojtek Figat
1f2456fc67 Merge branch 'scroll-colors' of https://github.com/Tryibion/FlaxEngine into Tryibion-scroll-colors 2024-05-15 12:23:08 +02:00
Wojtek Figat
2e59c35a44 Merge branch 'textbox-add' of https://github.com/Tryibion/FlaxEngine into Tryibion-textbox-add 2024-05-15 12:22:40 +02:00
Chandler Cox
17de6388ca Code fix 2024-05-13 17:42:37 -05:00
Chandler Cox
e028d263f1 Remove unused include. 2024-05-13 16:38:38 -05:00
Chandler Cox
6962ed6730 Fix case spelling 2024-05-13 16:38:10 -05:00
Chandler Cox
b66d50ae1b Add font and case options to Label and Textbox 2024-05-13 16:34:23 -05:00
Chandler Cox
2e3e4959d6 Add width padding for tooltip 2024-05-10 17:18:10 -05:00
Chandler Cox
533902d185 Change panel scroll bar style editor order. 2024-05-10 15:04:27 -05:00
Chandler Cox
dc0aa61a14 Add scrollbar colors to Panel 2024-05-09 22:14:08 -05:00
Chandler Cox
a2a3926aee Expose colors in scrollbar 2024-05-09 21:53:04 -05:00
Chandler Cox
9a70344c1f Fix carrot location on text box with no text. Add vertical and horizontal alignment options to textbox. 2024-05-09 21:31:54 -05:00
Wojtek Figat
2edb9cc4d8 Fix compilation warnings when using 64-bit coords 2024-05-08 23:24:23 +02:00
Wojtek Figat
e7508538e0 Merge remote-tracking branch 'origin/master' into 1.9 
# Conflicts:
#	Flax.flaxproj
 2024-05-08 19:27:56 +02:00
Chandler Cox
9683868767 Add shift scroll for panels and textbox 2024-05-01 16:12:53 -05:00
Wojtek Figat
0d8c9f6626 Add Video module 2024-05-01 01:25:16 +02:00
Wojtek Figat
7e8f20bd9b Merge branch 'controls-toolbox' of https://github.com/Tryibion/FlaxEngine into Tryibion-controls-toolbox 
# Conflicts:
#	Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
 2024-04-29 16:56:30 +02:00
Wojtek Figat
12344cf725 Merge branch 'watermark-attribute' of https://github.com/Tryibion/FlaxEngine into Tryibion-watermark-attribute 2024-04-29 12:23:01 +02:00
Chandler Cox
18660140b0 Add controls to the ActorToolbox in the GUI tab. Add dragging and dropping controls from toolbox into scene and prefab trees. 2024-04-27 15:55:25 -05:00
Chandler Cox
d8bb831dd9 Add watermark attribute to add watermark to string fields in editor. Have watermark show even when textbox is focused . 2024-04-27 11:07:20 -05:00
Chandler Cox
3641886ebf Fix textbox caret showing on empty string. 2024-04-27 09:16:03 -05:00
Wojtek Figat
e5d700692f Merge branch 'underline-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-underline-fix 2024-04-12 13:01:10 +02:00
Chandler Cox
2e643347ec Fix selection height 2024-04-11 10:16:20 -05:00
Chandler Cox
fb1685fe81 Fix underline being in wrong spot on different DPIs 2024-04-11 09:56:59 -05:00
Wojtek Figat
294b4c4006 Add CPU profiler events for UI drawing 2024-03-30 22:20:41 +01:00
Wojtek Figat
1f35f9536d Merge branch 'text-stuff' of https://github.com/Tryibion/FlaxEngine into Tryibion-text-stuff 2024-03-24 20:24:29 +01:00
Wojtek Figat
9a27ba3cdc Merge branch 'fix-splitters' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-splitters 2024-03-24 20:18:15 +01:00
Wojtek Figat
b821bb7a54 Simplify code 2024-03-24 20:17:42 +01:00
Chandler Cox
e5e675f089 Fix splitters not working. 2024-03-23 17:46:46 -05:00
Chandler Cox
495de38c48 Make TargetViewOffset only go to bottom of text. Add Scroll to Carrot for new lines. 2024-03-22 12:09:41 -05:00
Chandler Cox
4b9f50add0 Fix carrot and selection height based on dpi scale to correctly scale with interface options. 2024-03-21 21:23:05 -05:00
Chandler Cox
8398b35b0d Add visibility check to begin play on uicontrol 2024-03-20 12:22:01 -05:00
Wojtek Figat
2b824ce22a Fix UI Canvas double scale apply 2024-03-18 21:50:08 +01:00
Wojtek Figat
3b502086f8 Fix UI coordinate convertion in CanvasScaler 2024-03-18 17:38:05 +01:00
Wojtek Figat
c60244878d Add **UI Control gizmo for editing UIs** 2024-03-16 22:00:40 +01:00
Wojtek Figat
3ba6867cd2 Minor fixes 2024-03-14 17:30:54 +01:00
Wojtek Figat
0a9f746abb Refactor UI Control actor active state mirroring in UI via Visible properties rather than unlinked from parent 
#2242 #851
 2024-03-11 19:10:13 +01:00
Wojtek Figat
1bbb2727b8 Further improve 4a5ded0849 to use cached json serializer for UI 2024-03-11 12:47:29 +01:00
Wojtek Figat
4a5ded0849 Reuse various serialization code 2024-03-10 23:28:16 +01:00
Wojtek Figat
584c073df1 Reuse various serialization code 2024-03-08 14:26:48 +01:00