GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,270 Commits 14 Branches 0 Tags
32614daebd2bc128f7374d2bbdeb3c2d043a4113
Commit Graph

136 Commits

Author SHA1 Message Date
Wojtek Figat
09f2be907e Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Flax.flaxproj
 2023-10-09 12:40:47 +02:00
Ruan Lucas
95f40ecc0c clean code 2023-10-07 16:27:14 -04:00
Ruan Lucas
56c3080b10 fix edit text box 2023-10-07 11:06:23 -04:00
Wojtek Figat
a8f6a90a2f Merge branch 'control-double-click' of https://github.com/MineBill/FlaxEngine into MineBill-control-double-click 2023-10-06 17:20:46 +02:00
MineBill
8a34ae3ece Handle double clicking to eliminate perceived lag. 2023-10-01 18:41:32 +03:00
Wojtek Figat
dd21020297 Merge remote-tracking branch 'origin/master' into 1.7 2023-10-01 13:17:41 +02:00
Edu Garcia
8eed667d5a Makes BaseLinesGapScale configurable for Label 2023-09-28 22:41:24 +01:00
Wojtek Figat
2f9c601678 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-27 17:32:47 +02:00
Wojtek Figat
a919130434 Merge branch 'ui-adds' of https://github.com/Tryibion/FlaxEngine into Tryibion-ui-adds 2023-09-26 10:47:24 +02:00
Wojtek Figat
212a2e1ded Format code from recent PRs 2023-09-25 15:42:23 +02:00
Chandler Cox
84ecd49439 Fix slider clipping left most pixel of fill bar. 2023-09-24 15:40:56 -05:00
Chandler Cox
8a2272b825 Add has border and border thickness options. 2023-09-24 15:40:40 -05:00
Nils Hausfeld
df23174deb - Added proper control backspace support 2023-09-22 19:23:16 +02:00
Wojtek Figat
a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
Chandler Cox
dabbd7bc6a Add highlighting when mouse is over slider thumb. 2023-09-16 11:46:36 -05:00
Wojtek Figat
fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +02:00
Chandler Cox
d96f19e5c6 Change exposed positionns to float 2 2023-09-05 08:44:59 -05:00
Chandler Cox
65a02f032f Expose helpful slider data. 2023-09-05 08:25:25 -05:00
Chandler Cox
20f35e332f Add slider control 2023-09-04 20:15:59 -05:00
Wojtek Figat
6a5e660c2e Merge remote-tracking branch 'origin/master' into 1.7 2023-09-02 19:02:52 +02:00
Chandler Cox
a98458be1f Small improvements. 2023-08-31 14:14:01 -05:00
Chandler Cox
e4dfda7202 Add method enum. 2023-08-31 14:07:17 -05:00
Chandler Cox
d7112dc534 Improve progress bar to add switch between clipping and stretch and add direction. 2023-08-30 17:59:39 -05:00
Wojtek Figat
17cbd66aed Fix Label to draw text under children 2023-08-29 11:41:29 +02:00
Chandler Cox
5354063129 Add simple way to remove button border. 2023-08-19 10:43:04 -05:00
Wojtek Figat
b57a3165fa Fix textbox submit when it's nav focused 2023-06-16 10:56:17 +02: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
3fa9f9e9cf Follow up 4482fc0bcf 
#1086
 2023-05-16 12:14:52 +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
Wojtek Figat
b57018f55c Merge remote-tracking branch 'origin/master' into 1.6 2023-05-12 14:41:21 +02:00
Wojtek Figat
b5117af4b8 Format code 2023-05-12 14:19:40 +02: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
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
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
Wojtek Figat
0112f70c05 Merge remote-tracking branch 'origin/master' into dotnet7 2023-03-01 19:50:22 +01:00
Chandler Cox
037ad94ae7 Small Fix 2023-02-22 17:37:03 -06:00
Chandler Cox
34aff4a2b6 Added a change cursor boolean to TextBoxBase and made it so the cursor changes to default when hovering over the cancel button. 2023-02-22 17:34:33 -06:00
Wojtek Figat
0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
Chandler Cox
2592841793 Code style cleanup 2023-02-01 18:28:00 -06:00
Chandler Cox
b862126209 Changed to only show ibeam when editing 2023-02-01 18:25:40 -06:00
Chandler Cox
ade0450c0e Add cursor to change to Ibeam in text boxes. 2023-02-01 09:32:58 -06:00
Wojciech Figat
7b20bc38a4 Merge branch '1.5' into dotnet7 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
 2023-01-17 11:52:52 +01:00
Wojciech Figat
fc65e5a7a6 Fix leftover UI control state when it gets disabled/hidden/reparented 2023-01-16 15:08:57 +01:00
Wojciech Figat
eebc4951de Merge branch '1.5' into dotnet7 
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
 2023-01-10 15:49:44 +01:00
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
Wojtek Figat
c48a81a068 Merge branch '1.5' into dotnet7 
# Conflicts:
#	Source/Editor/Managed/ManagedEditor.Internal.cpp
#	Source/Engine/Core/Config/LayersAndTagsSettings.cs
 2022-12-28 18:49:14 +01:00
Wojtek Figat
6b0ead59d2 Fix code style 2022-12-27 20:24:01 +01:00
Wojtek Figat
1d359d9ed2 Merge branch 'add-button-hover-events' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-button-hover-events 2022-12-27 20:23:04 +01:00
Wojtek Figat
cb6590e7ef Format code 2022-12-27 18:50:08 +01:00