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

33 Commits

Author SHA1 Message Date
Wojtek Figat
3a5c3cabba Add missing doc comment 2021-04-02 16:51:12 +02:00
Wojtek Figat
c930d32b2b Add support for cooking game for Switch 2021-03-15 14:32:10 +01:00
Wojtek Figat
146dffa732 Merge branch 'patch-declarationSort' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-patch-declarationSort 2021-03-14 19:29:02 +01:00
Wojtek Figat
81f3a65a5f Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi 
# Conflicts:
#	Source/Editor/Utilities/Utils.cs
#	Source/Editor/Windows/Assets/MaterialWindow.cs
#	Source/Editor/Windows/Assets/ParticleEmitterWindow.cs
#	Source/Engine/Platform/Linux/LinuxWindow.cpp
#	Source/Engine/Platform/Windows/WindowsWindow.cpp
 2021-03-08 20:50:31 +01:00
honzapatCZ
4593e4c669 declaration order sorting 2021-03-04 19:46:27 +01:00
Wojtek Figat
d6b566a3fe Add support for accessing Game Settings and related assets in C# API in game build 2021-03-01 16:17:01 +01:00
Wojtek Figat
4d73b271b8 Fix some minor issues with materials previews in Editor 2021-02-25 16:38:05 +01:00
Wojtek Figat
5a9ca6f130 Merge remote-tracking branch 'origin/1.1' into linux-editor 
# Conflicts:
#	Source/Engine/Core/Math/BoundingSphere.cs
#	Source/Engine/Debug/DebugDraw.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
#	Source/Engine/Platform/Win32/Win32Platform.h
 2021-02-23 22:32:17 +01:00
Wojtek Figat
cf3ac7a26e Merge remote-tracking branch 'origin/master' into linux-editor 
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
 2021-02-23 22:29:07 +01:00
W2.Wizard
89734760fa Revert previous checks, revert switch intend 2021-02-21 19:48:23 +01:00
W2.Wizard
35b687bf3d Additional cleanup 
Cleaned up some additional stuff that I found
 2021-02-21 18:17:35 +01:00
W2.Wizard
694b20148d Cleanup 5 2021-02-21 11:50:30 +01:00
W2.Wizard
20ba37e223 Cleanup 3 2021-02-21 11:09:04 +01:00
W2.Wizard
52bc268ee7 Cleanup 1 2021-02-21 10:05:47 +01:00
Wojtek Figat
161917977c Add reusing created collision data for model when UI requests it 2021-02-18 11:12:36 +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
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
stefnotch
c7feeb624d Tweaks 2021-02-08 09:48:46 +01:00
Wojtek Figat
04bb83fe31 Fixes 2021-02-07 20:19:10 +01:00
Wojtek Figat
d27edbf5a9 Format code 2021-02-05 21:18:21 +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
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
4042d466d3 Add support for Events in Scripting API reflection in Editor 2021-01-21 14:40:53 +01:00
W2.Wizard
8fd0af3f39 Fixed Typos and padding 2021-01-17 10:18:30 +01:00
Wojtek Figat
be319c446d Refactor settings types to use scripting API 2021-01-05 14:14:34 +01:00
Wojtek Figat
cc8e78b505 Merge remote-tracking branch 'origin/master' into navigation-features 
# Conflicts:
#	Source/Editor/Content/Settings/NavigationSettings.cs
#	Source/Engine/Engine/PhysicalMaterial.cs
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
 2021-01-04 14:31:56 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
7b7ba7d73e Merge branch 'enha-point-from-to-screen' of git://github.com/stefnotch/FlaxEngine into stefnotch-enha-point-from-to-screen 2020-12-29 23:13:21 +01:00
Wojtek Figat
826c0206cb Fix model collision data generate option to be in ModelProxy 2020-12-29 23:11:00 +01:00
stefnotch
65ab9cac50 Change ClientFrom/ToScreen to PointFrom/ToScreen 
Fix #67
 2020-12-29 18:10:26 +01:00
Jean-Baptiste Perrier
d0e509a8fc Adding "Generate collision data" from Model context menu. 2020-12-21 23:20:42 +01:00
Wojtek Figat
41b938b3cd Refactor NavigationSettings to use API bindings 2020-12-21 14:53:54 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00