Commit Graph

59 Commits

Author SHA1 Message Date
Wojtek Figat
5507fea29d Merge branch 'convertactor' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-convertactor 2021-02-18 10:18:25 +01:00
Wojtek Figat
978ee84aea Add support for debug shapes preview in prefab editor window 2021-02-17 17:23:43 +01:00
Jean-Baptiste Perrier
cd0a1a5fdd Merge branch '1.1' of https://github.com/FlaxEngine/FlaxEngine into convertactor 2021-02-17 14:30:11 +01:00
Wojtek Figat
d88335c51f Add support for audio clip playback preview in editor window 2021-02-17 12:31:30 +01:00
Jean-Baptiste Perrier
f4a587faf9 Support undo. 2021-02-16 17:36:23 +01:00
Wojtek Figat
f66b7ff785 Add support for Custom Define in Game Cooker for build scripts configuration 2021-02-16 13:54:57 +01:00
Jean-Baptiste Perrier
44afa732f1 Merge branch 'master' of https://github.com/FlaxEngine/FlaxEngine into convertactor 2021-02-15 21:43:46 +01:00
Wojtek Figat
b6557cb15c Fix showing shader source code window over a calling window 2021-02-15 12:02:25 +01:00
Wojtek Figat
312e4ad010 Merge branch 'master' into 1.1
# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00
Wojtek Figat
4c673bec9b Add BAGUETTE 2021-02-10 22:59:40 +01:00
Wojtek Figat
42393eb316 Merge branch 'FolderDeleteFix' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-FolderDeleteFix 2021-02-05 21:17:49 +01:00
Wojtek Figat
6b660c846b Fix updating prefab object reference values after apply in prefab editor 2021-02-05 21:12:14 +01:00
W2.Wizard
2fbfe61f2c Restore comment
Co-Authored-By: VNC <52937757+VNNCC@users.noreply.github.com>
2021-02-05 15:59:35 +01:00
W2.Wizard
0e57b32082 Fixed issue #210
This will fix the issue described in #210.

Co-Authored-By: VNC <52937757+VNNCC@users.noreply.github.com>
2021-02-05 15:49:01 +01:00
Wojtek Figat
3661b19d6c Fix some prefabs issues 2021-02-04 23:34:44 +01:00
Wojtek Figat
8e4a0e9e97 Fix drawing UI Control outline in Game Window (#194) 2021-02-03 19:09:41 +01:00
Wojtek Figat
c00b32364a Add SceneGraphNode.OnContextMenu for customizations 2021-02-02 12:51:36 +01:00
Wojtek Figat
23652d1bc5 Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts:
#	Source/Engine/Input/Input.cpp
2021-02-02 10:29:52 +01:00
Wojtek Figat
b22805f866 Add support for custom duplicate of SceneGraphNode 2021-02-01 16:03:33 +01:00
Wojtek Figat
bab236c081 Add support for custom SceneGraphNode to handle delete with undo 2021-02-01 13:51:32 +01:00
stefnotch
164da0f87a Fix spelling error 2021-01-28 16:24:36 +01:00
Wojtek Figat
876a728b41 Fix scene animation rendering issue with game window is not selected tab
Fixes #170
2021-01-27 23:27:19 +01:00
stefnotch
c820e87d4a Slightly tweak the key processing code 2021-01-27 22:08:17 +01:00
stefnotch
f00ae7fb21 Disable CTRL+W during the game
Fix #96
2021-01-27 21:30:22 +01:00
Wojtek Figat
1d19d38c38 Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts:
#	Source/Editor/Surface/SurfaceNode.cs
2021-01-27 10:39:44 +01:00
Wojtek Figat
cb8ba2d757 Fix WindowsFileSystem::ShowBrowseFolderDialog path length 2021-01-27 00:27:32 +01:00
Wojtek Figat
fe78fa7575 Add Spline 2021-01-25 10:41:53 +01:00
Wojtek Figat
f6085c7479 Fix crash when reloading scripts with opened custom json asset 2021-01-24 23:31:24 +01:00
Wojtek Figat
6cbeac6537 Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts:
#	Source/Engine/Navigation/NavMesh.cpp
#	Source/Engine/Navigation/NavMeshBuilder.cpp
2021-01-22 11:31:22 +01:00
Wojtek Figat
0a0c856a64 Add more splash screen quotes 2021-01-19 21:10:45 +01:00
Wojtek Figat
c4e6d013c1 Add more splash screen quotes 2021-01-18 22:47:31 +01:00
Wojtek Figat
c02faf51a0 Merge branch 'AboutFlaxAdjustment' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-AboutFlaxAdjustment 2021-01-18 21:07:49 +01:00
W2.Wizard
8fd0af3f39 Fixed Typos and padding 2021-01-17 10:18:30 +01:00
Wojtek Figat
01a30faa62 Add NavMesh Modifier Volume actor type 2021-01-15 16:46:40 +01:00
Jean-Baptiste Perrier
d2888d0007 Adding Convert feature to Actor context menu. 2021-01-09 23:21:31 +01:00
VNC
6ab300025b Fixed a ton of typos 2021-01-05 02:13:15 +01:00
Wojtek Figat
bf9204f146 Add IconsScale to editor interface options 2021-01-03 22:13:31 +01:00
Wojtek Figat
add539392a Merge branch 'IconScaling' of git://github.com/DaveTheGameDev/FlaxEngine into DaveTheGameDev-IconScaling 2021-01-03 21:06:25 +01:00
Wojtek Figat
c39b201d3a Add more updates for copyright year 2021-01-03 21:00:32 +01:00
Wojtek Figat
cc399b51f0 Merge branch 'copyright' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-copyright 2021-01-03 20:27:08 +01:00
Wojtek Figat
20969b5d3d Merge branch 'fix-shortcuts-in-play-mode' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-shortcuts-in-play-mode 2021-01-03 20:25:11 +01:00
Wojtek Figat
fee0a458d0 Adjust AboutDialog bounds 2021-01-03 20:24:03 +01:00
stefnotch
f59fe297ea Fix shortcuts (F5, F6, F11) in play mode 2021-01-03 11:35:43 +01:00
Jean-Baptiste Perrier
096d6297fe Adding contributors names to AboutDialog. 2021-01-02 14:46:06 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
5e469a0ae3 Remove deprecated and unsued OpenGL backend 2020-12-30 11:27:37 +01:00
Wojtek Figat
826c0206cb Fix model collision data generate option to be in ModelProxy 2020-12-29 23:11:00 +01:00
Wojtek Figat
8dd915ec01 Merge branch 'collisiondata-from-model' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-collisiondata-from-model 2020-12-29 23:06:26 +01:00
David Conway
c0cc89201e Move icon settings to styles 2020-12-24 20:04:43 +11:00
David Conway
16fab80f86 Change how settings are accessed in ToolBox Window 2020-12-24 20:04:38 +11:00