Commit graph

4250 commits

Author SHA1 Message Date
Areloch
fc225a7f0b Adds a default value to the lodType of the asset importer to prevent utilizing an un initialized value 2020-07-29 15:42:28 -05:00
Brian Roberts
bcbc08cf23
Merge pull request #251 from zfbx/patch-1
Added slider to consoleDlg for bg alpha (Needs refinement)
2020-07-27 10:13:51 -05:00
Tony
3d76cc4c12 Moved GuiSliderProfile into core 2020-07-27 10:57:08 -04:00
Brian Roberts
017f7fafa2
Merge pull request #259 from Areloch/SecondaryWindowCloseFix
Captures secondary window close events
2020-07-26 20:08:56 -05:00
Brian Roberts
70ea856574
Merge pull request #236 from Azaezel/alpha40_connectionCleanup
client cleanups
2020-07-26 18:03:15 -05:00
Brian Roberts
6548ed1425
Merge pull request #260 from Areloch/QueuedUI
Moves the BaseUI module to utilize the queuedExec function
2020-07-26 16:54:54 -05:00
Areloch
0e37214a8b Moves the BaseUI module to utilize the queuedExec function to make overriding UI elements easier 2020-07-26 16:39:49 -05:00
Areloch
7d0831143c Captures secondary window close events so secondary windows can be closed via hitting the x on the window itself. 2020-07-26 15:58:53 -05:00
Brian Roberts
b2c4ff7745
Merge pull request #257 from Bloodknight/UbuntuGCC9-fixes
Fix GCC9 complaints
2020-07-26 13:09:27 -05:00
Brian Roberts
4890ed8789
Merge pull request #258 from Areloch/BaseGameThemeUpdate
Updates the BaseGame UI theme
2020-07-26 13:09:00 -05:00
Areloch
5f95f9f8c0 Made GuiFadeinBitmapCtrl not only respond to mouse and keyboard events, but gamepad events as well, allowing gamepad inputs to skip opening splash pages
Ensured that guiGameListMenuCtrl adjusts values for rows marked as sliders via the left and right gamepad actions
Corrected the button maps for look and move on the gamepad for the ExampleModule's default movement binds
Fixed ExampleModule's default keybinds so alt+enter correctly toggles fullscreen
Fixed joinServerMenu so it has a guiInputCtrl that can catch keybind events and pass them to the menuInputButtons
Removed erroneous input consumption on OptionsMenuList
Removed unneeded check against Graphics API list
Flipped order of Anti Aliasing option to match ordering of the others
Removed old, unneeded legacy option menu script files
Added logic for message boxes to automatically return active MenuInputButton control to the holder before it was pushed
Added fill color for the UI list gui profile so the sliders render more legibly
2020-07-25 01:29:25 -05:00
Areloch
5b289bce5e Shifts the tools messageboxes to be distinct from any messageboxes in the main game
Reorged the canvas handling of gamepad inputs for the axis and triggers to use the SI_ versions in the right spots
Fixed issue where pause menu would be hidden and not display again
Made the pause menu active from the gamepad start button rather than back
2020-07-24 00:40:03 -05:00
Areloch
ef4cc8b573 Updated names of some of the input images to match the names of the inputs to simplify lookups
Altered a few of the input images to improve readability of some of the text
Standardizes the menuInputButton set usage to just use the raw action names rather than a middleman naming scheme for simplicity and standardization
Added comments to menuInputButtons.cs
Split out the menuInputButton containers to simplify and stabilize the code on the messageBox dialog
Removed old reference to script/gui files not there anymore
Simplified the input state check in guiGameListMenuCtrl.cpp
Added a check so we don't try exec'ing the selected list item in guiGameListMenuCtrl.cpp if nothing has actually be selected
2020-07-23 16:26:38 -05:00
Areloch
37420cda66 Updates the BaseGame UI theme to be more legible and visually consistent.
Also standardizes and fixes the menuInputButtons system.
2020-07-23 00:22:15 -05:00
Brian Roberts
75c2ac26a2
Merge pull request #256 from Bloodknight/UbuntuGCC9-fixes
Fix GCC9 complaints
2020-07-22 13:29:28 -05:00
Bloodknight
af126ad089 Fix GCC9 complaints 2020-07-22 16:40:01 +01:00
Bloodknight
f52ae7f1b3 Fix GCC9 complaints 2020-07-22 14:29:54 +01:00
Brian Roberts
ba1eb59e9f
Merge pull request #252 from Azaezel/alpha40_fresnelLight
from jeff and tim: review of lighting impacts
2020-07-20 07:58:16 -05:00
Brian Roberts
bc8734b27b
Merge pull request #255 from Areloch/DragAndDropImportFix
Fixes issue with Drag-and-drop asset import action
2020-07-20 07:58:02 -05:00
Brian Roberts
9b0b00c786
Merge pull request #254 from Areloch/VerveRoundDeltaFix
Moves the delta-based rounding function Verve used up into the engine
2020-07-18 04:45:15 -05:00
Areloch
3be33929ec Fixes an issue where it wouldn't correctly set the targetModuleId and targetPath when doing a drag and drop import of assets in the AB. 2020-07-18 03:01:42 -05:00
Areloch
247c0eb34a Moves the delta-based rounding function Verve used up into the engine so it wouldn't override the regular mRound function. Now is mRoundDelta. 2020-07-18 02:53:34 -05:00
AzaezelX
ea206b48b2 from jeff and tim: review of lighting impacts
(with a focus on fresnel)
also adds BRDF_GetDebugXXX methods gl side
2020-07-16 16:36:13 -05:00
Tony
48838494d4
Update console.gui 2020-07-14 22:47:43 -04:00
Tony
e4e98d87cb
Added BG alpha/opacity slider to ConsoleDlg
function was already there so just made use of it with a slider
2020-07-14 21:51:15 -04:00
Brian Roberts
b62ea8c701
Merge pull request #250 from Azaezel/alpha40_fogFix
from @rextimmy new isbackground shader feature.
2020-07-14 16:50:17 -05:00
AzaezelX
454192ed02 from @rextimmy new isbackground shader feature. used the same z=w trick we've done before to force things to render behind everything else. applied to fog 2020-07-14 14:08:12 -05:00
Brian Roberts
dda0cc9aa7
Merge pull request #249 from Areloch/InspectorGroupInserts
Adds additional functions for inserting inspectorGroups
2020-07-14 03:22:46 -05:00
Brian Roberts
a6ba72bb82
Merge pull request #248 from Azaezel/alpha40_glowNONO
cleanup singlechannel glowmask leftovers (we use a full rgb map now)
2020-07-14 03:22:31 -05:00
Areloch
5b4af68793 Adds ability to get InspectorGroup index, as well as inserting a new inspectorGroup at a specific position in the list 2020-07-13 18:58:00 -05:00
AzaezelX
f829303ded cleanup singlechannel glowmask leftovers (we use a full rgb map now) 2020-07-12 17:39:16 -05:00
Brian Roberts
56233410cf
Merge pull request #247 from Areloch/AssetEditorImprovements
Various improvements, fixes and enhancements to Asset editor stuffs
2020-07-12 14:08:16 -05:00
Brian Roberts
3cd5932cef
Merge pull request #246 from Areloch/AssetImporterUpdate
Various improvements, fixes and expansions for Asset Importing
2020-07-12 14:08:02 -05:00
Brian Roberts
fbb11027b6
Merge pull request #245 from Areloch/PopupMenuBitmapArrays
Minor additions to popup menus
2020-07-12 14:07:49 -05:00
Brian Roberts
655abde39f
Merge pull request #244 from Areloch/TextEditPlaceholderText
Adds logic to guiTextEditCtrl to have placeholder text when the control is empty.
2020-07-12 13:52:30 -05:00
Areloch
7818b1ba49 Correct to make the getModuleFromPath function static again. 2020-07-11 21:57:40 -05:00
Areloch
4adcedcf28 Added/Improved some asset type icons
Renamed current default import config to DefaultConfig
Updated Asset Browser UI layout.
Fixed sizing behavior for Edit Asset window
Fixed sizing behavior for Edit Module window
Implemented Collection Sets system
Implemented handling of non-asset loose files for AB
Initial handling logic for prefabs for AB
Updated Asset Importer to hook into C++ AssetImporter
Made Add Module window properly reset module name field when opened
Overhauled entire AB search system so it can use phrases and compound search logic
Overhauled asset previews to utilize single guiIconButtonCtrl for efficiency and stability
Updated Asset Preview Drag-n-drop to work with new previews
Begun initial work with Tags integration into AB - currently only works with datablock categories
Bugin initial work with Creator classes - currently only populates category lists, no items
Added logic for scanning current AB directory for non-asset loose files, and activating an Auto-Import button if any are found
Added ability to drag-n-drop datablocks from AB and spawn requisite object
Stabilized drag-n-drop behavior of ShapeAssets, so when spawned, it'll find a much more sane drop position
Fixed shapeAsset fields for drag-n-drop behavior so it correctly sets field now
Adjusted folder and asset search fields in AB to utilize placeholder text
Added logic when creating new module to prompt auto-populating common default folders
Shifted preview size to slider
Added logic to MenuBuilder so popup menus can utilize bitmap arrays
Added editor setting for if to display loose files in AB
Minor theme color corrections for some profiles
2020-07-11 16:49:06 -05:00
Areloch
a3d6afc197 Corrects lookup/in-place auto import logic for ImageAssets
Fixed sizing issue for material asset ptr fields
Fixed type of comment in Particle Asset
Hooked GLSL and HLSL shader files to be proper asset loose files for PostEffectAsset
Adjusted some default values for default ImportConfig
Corrected field type of multiple fields  for the importConfig
Corrected loading of PopulateMaterialMaps config setting from config file
Corrected field types of multiple fields for AssetImportObjects
Exposed several utility fields for the Importer to script
Added ability to create an AssetImportObject in script and add it to the Importer's current session
Ensured stable naming behavior(replacing spaces, -, and . in names with _
Improved getAssetTypeByFile logical lookup so it doesn't accidentally grab cached.dts files
Added ability to hard reset an import session, wiping all inbound files for a full reset
Added ability to process DTS files to shape import so it can parse out content such as materials for associated asset imports
Added better handling for shape materials that are just colors
Added callback hook-in so if the importer doesn't have a defined function for importing a given asset type, it'll try calling down into the editor
Stabilized imageAsset processing logic when generating a material for it
Improved imageType lookup/processing logic in Importer
Improved logic for binding in associated image files to materialAssets
Improved logic for processing shapes to get related materials and images, ensuring better likelyhood of finding and associating related assets
Cleaned up validation logic
Added ability to properly look up the editor's default import config if it's set to be used for autoimport
Improved handling of originalFilePath logic, so if it's an in-place import, it doesn't bother populating the field
Set default UP axis value on shape importing to ensure better default behavior
2020-07-11 16:20:10 -05:00
Areloch
a71f5cfd9d Missed header changes 2020-07-11 15:58:39 -05:00
Areloch
a5404ad216 Adds ability to utilize bitmap arrays and set entry indexes for popup menus
Also enables the ability to fetch the text of a popup menu item
2020-07-11 15:57:13 -05:00
Areloch
758dd20724 Adds logic to guiTextEditCtrl to have placeholder text when the control is empty. 2020-07-11 15:53:21 -05:00
Brian Roberts
67dbe4dfe2
Merge pull request #229 from Areloch/TerrainAssetFixup
Reworks the terrain loader code to work with the assets.
2020-07-10 17:30:27 -05:00
Brian Roberts
ef6137ac6f
Merge pull request #242 from Azaezel/alpha40_stuckSpots
from practicing: aiplayer onstuck correction
2020-07-10 17:28:29 -05:00
Brian Roberts
7de3829d38
Merge pull request #243 from Azaezel/alpha40_triggerTricks2
from @practicing01: trigger mounting
2020-07-10 17:28:15 -05:00
AzaezelX
b8c3b515f8 from @practicing01: trigger mounting 2020-07-10 15:50:25 -05:00
AzaezelX
1619b7cd23 from practicing: aiplayer onstuck correction 2020-07-10 12:15:46 -05:00
Brian Roberts
55c95a6146
Merge pull request #241 from Azaezel/alpha40_macCompile
comparison flaw in spotlight animation check.
2020-07-08 12:27:28 -05:00
AzaezelX
61db21aaaf comparison flaw in spotlight animation check. also, proper location of shadercache dir 2020-07-07 16:54:25 -05:00
Brian Roberts
9d42895b2e
Merge pull request #240 from JeffProgrammer/wincpu_detect
fixed cpu detection on 64bit windows
2020-07-07 01:47:02 -05:00
Jeff Hutchinson
7880c71d9a fixed cpu detection on 64bit windows (and removing nasty assembly for win32).
Note that this still works for 32bit windows.
2020-07-07 01:05:08 -04:00