Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
10,359 Commits 15 Branches 23 Tags
631f2c51074b59eabe886ab358a67c2b8fe18939
Commit Graph

62 Commits

Author SHA1 Message Date
Tryibion f37804ac49 Check and warn user if asset is being moved from content to source folders snd from source to content folders. 2024-10-30 15:46:16 -05:00
mafiesto4 9daddccbed Merge remote-tracking branch 'origin/master' into 1.9 
# Conflicts:
#	Source/Editor/Modules/ContentDatabaseModule.cs
#	Source/Editor/Surface/SurfaceUtils.cs
#	Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
#	Source/Engine/Foliage/Foliage.cpp
#	Source/Engine/Graphics/Models/MeshBase.h
#	Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp
 2024-09-12 13:38:20 +02:00
mafiesto4 26ad61c1ce Merge branch 'module-remove' of https://github.com/Tryibion/FlaxEngine into Tryibion-module-remove 2024-09-11 13:41:30 +02:00
mafiesto4 060dd748a7 Merge branch 'fix-spelling-virtual' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-spelling-virtual 2024-09-09 07:58:02 +02:00
Tryibion 65fd975b1a Add generic CSharpProxy. Add Empty C# template. 2024-09-02 12:57:23 -05:00
Tryibion fd7e04fd8c Fix spelling and comment description wording for GetAssetVirtualProxy 2024-09-01 14:00:50 -05:00
Tryibion e4e568ae6a Code style fix 2024-08-27 15:21:49 -05:00
Tryibion 3bffc927f6 Add cleaning up modules from target files when deleted. 2024-08-27 14:54:21 -05:00
mafiesto4 20456d95e8 Merge remote-tracking branch 'origin/master' into 1.9 2024-08-22 17:33:20 +02:00
Tryibion e21c884841 Add removing old proxy to add new one. 2024-08-16 13:49:50 -05:00
Tryibion cc157718cd Only allow adding unique proxy types to content database Proxy list. 2024-08-16 11:17:25 -05:00
mafiesto4 bc313c8630 Merge remote-tracking branch 'origin/master' into 1.9 2024-08-05 20:00:39 +02:00
Tryibion 074751f91f Re-add lazy rebuilds 2024-07-25 18:23:26 -05:00
Tryibion e05eedfc76 Force rebuild on proxy changes if rebuild is true 2024-07-25 17:28:55 -05:00
mafiesto4 0d8c9f6626 Add Video module 2024-05-01 01:25:16 +02:00
mafiesto4 8a45dda98c Add support for custom file proxies in Editor 2024-05-01 01:05:15 +02:00
mafiesto4 4cd788cedc Add UI Widget to new asset creation for quick UI setup 2024-03-22 11:59:04 +01:00
mafiesto4 859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
NoriteSC 8841a603f6 Virtual proxy 2023-12-29 23:15:03 +01:00
mafiesto4 8d9f4d72f5 Various stability improvements for Editor 2023-10-17 22:42:47 +02:00
mafiesto4 9a636468e0 Fix crash when importing assets in Editor (race-condition from Content Importer thread) 
#1691 #1679
 2023-10-13 15:44:18 +02:00
mafiesto4 abd6881d7b Fix removing large amount of assets in Editor at once 
#1484
 2023-10-13 15:43:11 +02:00
mafiesto4 e6c45fccb3 Merge remote-tracking branch 'origin/master' into 1.7 
# Conflicts:
#	Source/Engine/Level/Actors/AnimatedModel.cpp
 2023-10-05 10:44:03 +02:00
mafiesto4 5fe135e10b Fix updating Content folder name when renamed in Finder on macOS 2023-10-02 13:11:20 +02:00
mafiesto4 8a9d0271a3 Add ignoring ’.DS_Store’ files in Content on macOS 2023-10-02 13:04:21 +02:00
mafiesto4 a71de7357c Merge remote-tracking branch 'origin/master' into 1.7 2023-09-19 21:42:53 +02:00
GoaLitiuM 5ab299fed9 Fix assets getting deleted when modified by external applications 2023-09-16 18:11:22 +03:00
mafiesto4 fb488cbaf7 Merge remote-tracking branch 'origin/master' into 1.7 2023-09-11 22:43:46 +02:00
mafiesto4 16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00
mafiesto4 18b47257fd Add **Behavior Tree** asset type and editing 2023-08-16 13:26:33 +02:00
mafiesto4 8dc98174cf Minor tweaks 2023-08-01 14:14:27 +02:00
mafiesto4 a3e3ee396a Revert default value back to false as in #1179 2023-06-17 16:37:33 +02:00
mafiesto4 cd68f2463b Adjustment for #1179 to rebuild by default 2023-06-17 16:36:05 +02:00
Wiktor Kocielski 70470bc421 Make rebuilding database when adding asset proxy optional 2023-06-17 12:13:54 +03:00
mafiesto4 086e4c9835 Add content proxy modifications function and workspace rebuilding for custom asset types extensions 2023-06-15 09:51:26 +02:00
mafiesto4 14d12418b6 Add iOS and Apple icons 2023-06-12 14:34:31 +02:00
mafiesto4 22239bc2d1 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-05 11:41:32 +02:00
Tryibion 1978cb6df9 Fix bug with not deleting all children on folder delete 2023-04-28 08:48:13 -05:00
mafiesto4 047eb2eddf Add iOS to Game Cooker platforms 2023-04-12 22:29:21 +02:00
mafiesto4 4755c42d70 Fix .NET generic class typename to match old mono style without inlined assembly name and ver 2023-03-27 17:30:48 +02:00
mafiesto4 a7e428a21c Merge branch 'master' into 1.5 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs
 2023-01-10 15:37:55 +01:00
mafiesto4 9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
mafiesto4 9ad4665270 Add Network Settings 2022-09-03 12:54:37 +02:00
mafiesto4 8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
mafiesto4 d017dd14ca Add Mac platform 2021-12-27 14:04:16 +01:00
mafiesto4 48a867ef16 Add PS5 platform defines and types 2021-10-08 16:25:16 +02:00
mafiesto4 6e08c1aac9 Add logging content database init start time 2021-09-21 18:23:29 +02:00
mafiesto4 146626045f Fixes 2021-08-27 16:05:50 +02:00
mafiesto4 782d29f427 Merge branch 'xboxone' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-xboxone 2021-08-26 12:44:53 +02:00
honzapatCZ c17d86a134 removal of old XboxOneStuff 2021-07-21 15:10:39 +02:00