Commit Graph

364 Commits

Author SHA1 Message Date
Wojtek Figat
ace8295ab7 Merge remote-tracking branch 'origin/master' into localization
# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
2021-04-22 16:10:36 +02:00
Wojtek Figat
af34bafc5a Improve LocalizedStringTable editor 2021-04-22 13:28:52 +02:00
Tayler Mauk
3410bd5380 Standardize variable names 2021-04-20 22:31:15 -07:00
Tayler Mauk
dc0f77ae2a Fix issue #468 2021-04-20 22:24:37 -07:00
Tayler Mauk
3e73f40c0f Fix issue #460 2021-04-20 21:23:42 -07:00
Wojtek Figat
480783b7fa Add LocalizedString to TextRender 2021-04-19 16:25:44 +02:00
stefnotch
08d08133c1 GetChildAt should do it in reverse order to respect z order 2021-04-18 09:49:25 +02:00
W2.Wizard
7877f77242 Add Scalar Icon, PS & XBox
A separate scalar icon for the value box
2021-04-13 10:41:04 +02:00
Wojtek Figat
ac1eb8d58d Merge branch 'master' into 1.2 2021-04-13 09:52:03 +02:00
Wojtek Figat
7e622a69a6 Fix AutoFocus saved in data for controls 2021-04-07 20:53:18 +02:00
Wojtek Figat
6001eb88fa Fix Dropdown control
#334
2021-04-07 20:52:22 +02:00
honzapatCZ
ff4f1277e7 invert preserveBounds back 2021-04-07 11:45:12 +02:00
Nejcraft
6fba1a4ab9 Delete Control.Bounds.cs.rej 2021-04-07 11:22:45 +02:00
Nejcraft
f24cb34e3f Merge branch '1.2' into ui-achorpopup-shiftctrl-modes 2021-04-07 11:20:20 +02:00
Wojtek Figat
772af752d2 Fix regression from dff1374378 2021-04-07 11:10:51 +02:00
Wojtek Figat
dff1374378 Post-merge tweaks
#417
2021-04-07 10:57:17 +02:00
honzapatCZ
41a873450e should work now 2021-04-06 16:54:22 +02:00
honzapatCZ
c4dd5ef5c8 anchor preset popup shift + ctrl 2021-04-02 17:47:39 +02:00
honzapatCZ
73e92e33fd local positions 2021-04-02 17:38:30 +02:00
stefnotch
12fd7274a9 Fix DPI regression: use the overrideable RootWindow instead of _root 2021-03-29 10:54:48 +02:00
Wojtek Figat
9f79d0e3c4 Add support for vertical and horizontal panels to arrange children based on the child anchor
#385
2021-03-25 21:45:29 +01:00
Wojtek Figat
d3bdc3cf8b Fix UI not being updated with particular panels used when changing child control anchors
#385
2021-03-25 21:27:42 +01:00
Wojtek Figat
5c495b987b Add Shift+Home shortcut to Text Boxes
#386
2021-03-25 21:14:37 +01:00
Wojtek Figat
934258aadb Fix UICanvas to face camera plane instead of camera position
#371
2021-03-23 10:25:31 +01:00
Wojtek Figat
16f81cc184 Fix updating Label layout after font change when using automatic size
#380
2021-03-23 09:32:12 +01:00
Wojtek Figat
e8c9856665 Fix Vertical/Horizontal panels issue with anchored child controls
#378
2021-03-23 09:24:56 +01:00
Wojtek Figat
22812ad21e Fix game build 2021-03-21 15:34:15 +01:00
Wojtek Figat
160dfa5dc7 Fix Label text alignment in auto size text
#308
2021-03-20 18:49:31 +01:00
Wojtek Figat
7dd67b5ae3 Fix Label auto-height and auto-width when text overflows the lines and it's wrapped
#358
2021-03-20 13:06:35 +01:00
Wojtek Figat
59b975499f Fix WorldSpaceFaceCamera bug
#370
2021-03-20 12:15:50 +01:00
Wojtek Figat
29e06eb696 Add WorldSpaceFaceCamera mode to UICanvas
#359
2021-03-19 15:46:33 +01:00
Wojtek Figat
f1b100841d Merge branch 'canvasculling' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-canvasculling 2021-03-19 10:15:42 +01:00
Wojtek Figat
8ef8b89fd5 Add constructor to BoundingBox for single point empty box construction 2021-03-18 21:50:05 +01:00
Jean-Baptiste Perrier
e0ae2984ae UICanvas frustum culling. 2021-03-18 18:59:32 +01:00
Wojtek Figat
ac511cbadc Improve documentation comments for Control properties that are based on Pivot property 2021-03-18 16:34:54 +01:00
Wojtek Figat
7a12a6c280 Fix updating UICanvas when using World/Camera Space
#361
2021-03-18 15:59:01 +01:00
Wojtek Figat
abe635ad9b Fix exception in Custom Editors UI due to invalid reference value processing
#325
2021-03-18 15:12:25 +01:00
Wojtek Figat
960a122550 Revert children clipping to be called outside DrawChildren (regression from #355) 2021-03-18 14:26:00 +01:00
Wojtek Figat
5c171c8b58 Fix control Offsets updating for control bounds when changing anchors
#312
2021-03-18 13:16:17 +01:00
Wojtek Figat
6a6eb96793 Fix code style 2021-03-18 11:15:27 +01:00
Wojtek Figat
8078b9543d Merge branch 'ui' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-ui 2021-03-18 11:09:28 +01:00
Wojtek Figat
845da14e6a Fix UIControl setup on IsActive changes
#326
2021-03-18 10:56:48 +01:00
Jean-Baptiste Perrier
c8b57d417c Convert Control to ContainerControl. 2021-03-17 20:53:42 +01:00
Jean-Baptiste Perrier
fb70368c8d Fix image ordering. 2021-03-17 20:22:27 +01:00
Jean-Baptiste Perrier
5af3a22fd0 Add DrawSelf. 2021-03-17 20:22:06 +01:00
Wojtek Figat
df497bf684 Fix UIControl invalid showing in prefab window using nested prefab with UI 2021-03-17 19:25:12 +01:00
Wojtek Figat
960268f756 Fix UICanvas state synchronization when working with prefabs 2021-03-17 19:23:54 +01:00
Wojtek Figat
518df5e62b Add skipping textbox scrolling if it has no selection 2021-03-17 13:44:38 +01:00
Wojtek Figat
e6d3242670 Fix invalid UIControl event blocking for prefab editor 2021-03-17 11:58:26 +01:00
Wojtek Figat
2a2d9f54de Fix UIControl location deserialization when using prefabs and anchors
#218
2021-03-17 11:55:17 +01:00