GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,442 Commits 14 Branches 0 Tags
88530606dfd930df73f6610cc22207ceae0d7e73
Commit Graph

511 Commits

Author SHA1 Message Date
Wojtek Figat
40c98ac9e5 Merge branch 'fix_folder_rename' of https://github.com/MineBill/FlaxEngine into MineBill-fix_folder_rename 2023-09-18 16:56:53 +02:00
MineBill
9931a5c026 Don't treat '.' in folder names as extensions. 2023-09-16 19:09:38 +03:00
Ari Vuollet
5ab299fed9 Fix assets getting deleted when modified by external applications 2023-09-16 18:11:22 +03:00
Wojtek Figat
9bbdf16623 Fix potential content tree freeze when toggling engine/plugins files showing 2023-09-12 14:03:53 +02:00
Wojtek Figat
9d494679ac Add formatting MyPlugin.cs for new plugin setup 
#1335
 2023-09-11 22:42:48 +02:00
Wojtek Figat
985d6cc811 Add UTF8 format for created plugin files and format code 
#1335
 2023-09-11 22:32:37 +02:00
Wojtek Figat
99c2adc1f3 Add game settings formatting for created plugin ProjectInfo 
#1335
 2023-09-11 22:32:17 +02:00
Wojtek Figat
776fbe2a7b Fix creating plugin with whitespace or non-ASCII character in the name 
#1335
 2023-09-11 22:30:51 +02:00
Wojtek Figat
2fa7740a0f Merge branch 'plugin-project-creation' of https://github.com/Tryibion/FlaxEngine into Tryibion-plugin-project-creation 2023-09-11 21:48:31 +02:00
Wojtek Figat
16fed8927c Refactor #1266 (code quality and simplicity) 2023-09-11 20:02:53 +02:00
Wojtek Figat
2ddb44afa8 Merge branch 'ContentBrowserImprovement' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-ContentBrowserImprovement 
# Conflicts:
#	Source/Editor/Windows/ContentWindow.cs
 2023-09-11 15:39:48 +02:00
Wojtek Figat
716e643f2a Fix applying prefab changes to nesting prefab instances 
#1256
 2023-09-10 21:07:41 +02:00
Chandler Cox
92a5432d22 Sort plugin projects in content tree. 2023-09-02 13:13:34 -05:00
Wojtek Figat
3b163b6c4b Minor cleanup 2023-08-27 16:36:37 +02:00
Wojtek Figat
48c74e5ea5 Merge branch 'filter-cm' of https://github.com/Tryibion/FlaxEngine into Tryibion-filter-cm 2023-08-27 15:37:22 +02:00
Chandler Cox
c5ff2c8c2f Add tooltip text. 2023-08-26 16:17:21 -05:00
Chandler Cox
514bc00310 Show Json Asset Type on ToolStrip of Json Asset Window. 2023-08-26 16:10:59 -05:00
Chandler Cox
8ad4c94545 Add not closing contnent filter cm on click 2023-08-25 15:25:51 -05:00
Chandler Cox
0bbd619e32 Code cleanup 2023-08-24 13:54:55 -05:00
Chandler Cox
51664fc236 Use pltform process. 2023-08-24 13:51:08 -05:00
Chandler Cox
fb69bc64f8 Add automated plugin project creation and Git cloning. 2023-08-24 11:38:14 -05:00
Chandler Cox
134273abd9 Remove popup from appearing if the content item can not re renamed. 2023-08-19 12:47:29 -05:00
Wojtek Figat
7da93ad68d Merge branch 'feature/1151-play-mode-refactor-cleanup' of https://github.com/envision3d/FlaxEngine into envision3d-feature/1151-play-mode-refactor-cleanup 2023-08-14 18:42:05 +02:00
Wojtek Figat
55ca419aba Merge branch 'paste-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-paste-fix 2023-08-14 16:18:44 +02:00
envision3d
b9ffb950f3 Refactor and more appropriately organize logic 
- move play logic to simulation module
- update play hotkey to call play game/scene delegate function
- link hotkey tooltip text to inputOptions
 2023-08-06 13:11:45 -05:00
Wojtek Figat
81860e5f18 Cleanup code #1215 and add cook game icon 2023-07-31 19:02:53 +02:00
NoriteSC
0b89164328 Merge branch 'FlaxEngine:master' into ContentBrowserImprovement 2023-07-28 15:56:40 +02:00
Chandler Cox
d6bfcbcc3d Add for prefab 2023-07-27 10:49:29 -05:00
NoriteSC
6a65ccd5ef rev1 2023-07-24 22:10:12 +02:00
envision3d
dba0675873 Merge branch 'master' of https://github.com/FlaxEngine/FlaxEngine into feature/1151-play-mode-actions 2023-07-20 02:00:53 -05:00
Chandler Cox
be079b9b67 Improvements to debug log count. 2023-07-18 09:51:21 -05:00
Chandler Cox
868db7c848 Add functionality to combine similar logs into a log with a count. 2023-07-15 13:52:10 -05:00
Wojtek Figat
bb9711277a Cleanup code from #1213 2023-06-28 16:27:42 +02:00
envision3d
39f4c00135 add play button actions, number of players 
- add context menu support for toolstrip buttons
- add "Play Game" vs. "Play Scenes"
- add context menu for choosing play button action to toolstrip button
- add number of game client selection for cook & run
- add context menu for cook & run to toolstrip button
- add menu items for the above
- add editor option entries for saving user preferences for the above
 2023-06-28 02:02:10 -05:00
PhyresiCompany
fe8260fe14 Window improvements with a new approach 2023-06-27 19:58:37 -03:00
Ari Vuollet
2190031ccf Support decimal values in Font sizes 2023-06-18 20:52:46 +03:00
Wojtek Figat
086e4c9835 Add content proxy modifications function and workspace rebuilding for custom asset types extensions 2023-06-15 09:51:26 +02:00
Wojtek Figat
8f7da81621 Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Flax.flaxproj
#	Source/Editor/Content/Items/AssetItem.cs
 2023-06-13 15:41:07 +02:00
Wojtek Figat
13b1c16213 Add asset reload option via context menu in Editor 2023-06-13 14:58:14 +02:00
Wojtek Figat
979168e82c Refactor various Editor APIs to use auto-generated bindings instead of manual code 2023-06-12 14:34:07 +02:00
Wojtek Figat
f552dd0c28 Merge remote-tracking branch 'origin/master' into 1.6 2023-06-10 23:29:22 +02:00
Wojtek Figat
3bbfe9de8a Code cleanup, add tooltip and cache property option in layout #1140 2023-06-09 17:32:57 +02:00
Wojtek Figat
a0d6f3c22b Merge branch 'ui-resize-update' of https://github.com/Swiggies/FlaxEngine into Swiggies-ui-resize-update 2023-06-09 17:23:00 +02:00
Wojtek Figat
007edb4651 Merge commit '2c809389ad7d8953b10e7ab3b1b29aca4d072116' into 1.6 2023-06-01 01:06:27 +02:00
Olly Rybak
fce41b95f6 Added bool to properties window to carry value between controls 2023-05-29 20:55:55 +10:00
Wojtek Figat
44036a26d0 Fix UI Control selection highlights when using Canvas Scaler 
#977
 2023-05-28 21:35:56 +02:00
Wojtek Figat
81ae687238 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 16:34:38 +02:00
Wojtek Figat
583a5d9223 Minor fixes to content window navigation 2023-05-28 13:17:43 +02:00
Ari Vuollet
bca5e908f1 Copy content files using Content Database instead of Content Importing 
Fixes an issue where copying asset files does not change the asset ID,
causing the copied assets to remain linked to the original files.
 2023-05-27 00:41:19 +03: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