Commit graph

5441 commits

Author SHA1 Message Date
Robert MacGregor cc45f9e9a4 * BugFix: Fix a Windows ASAN reported allocation mismatch error. 2021-12-13 00:04:24 -05:00
Brian Roberts b0218d129c
Merge pull request #702 from Areloch/ImposterFix
Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely.
2021-12-10 03:39:58 -06:00
JeffR a8b3d874a1 Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely. 2021-12-10 00:01:26 -06:00
Brian Roberts bd876e427a
Merge pull request #701 from JeffProgrammer/console-warn-void-fix
Fix console warning when calling void functions in console
2021-12-08 22:10:46 -06:00
Jeff Hutchinson 73b023a4b7 Fix console warning when calling void functions in console
Forgot to add this check when rewriting the interpreter.
2021-12-08 21:00:50 -05:00
Brian Roberts 0e06e2853e
Merge pull request #691 from Azaezel/alpha40/terrainTrickery
use internalname for terrain layers
2021-12-05 19:32:29 -06:00
Brian Roberts 07310d4d6d
Merge pull request #699 from Areloch/CoreInitCleanup
Cleans up some core execution behavior
2021-12-05 19:31:13 -06:00
Areloch c6c2e9139f Cleans up some core execution behavior
Removes a duplicated material definition
Fixes up PostFX init'ing order so it inits before trying to load the prefs
Adds a skip of loading the CoreModule's materials so we don't double-execute any of them
Fixes a typo for the Vignette PostFX's name so it properly integrates
2021-12-05 11:00:02 -06:00
Brian Roberts ce1fbe5f2c
Merge pull request #698 from Areloch/RemoveLibraryTabsFromEditors
Removes the Library tabs from the World and GUI editors to avoid confusion
2021-12-05 02:33:10 -06:00
Areloch a30e9c6242 Removes the Library tabs from the World and GUI editors to avoid confusion. Adjusts the creation namespace from ECreatorWindow to a dummy object ObjectCreator to handle invoking for creation 2021-12-04 22:47:10 -06:00
Areloch 54fb5837ec
Merge pull request #696 from Ragora/bugfix-macos-compile
BugFix: Correct compilation for MacOS
2021-12-04 14:11:00 -06:00
Robert MacGregor 5fa7c62ba9 * BugFix: Don't use the register keyword in the console grammar files. 2021-12-03 20:33:02 -05:00
Robert MacGregor 58f6431ff0 * BugFix: Correct compilation for MacOS by explicitly specifying C++11 for all libraries and C++17 for the engine itself. 2021-12-03 16:37:22 -05:00
Brian Roberts 82b33b757a
Merge pull request #694 from rextimmy/cmake_cpp17
Minor cmake corrections
2021-12-02 15:19:10 -06:00
Brian Roberts 7f93734cb7
Merge pull request #692 from Azaezel/alpha40/thatsMetal
fix metal sound entry for playerdata
2021-12-02 15:18:46 -06:00
rextimmy a0a3608c34 * Torque now requires c++17 due to new torque script code
* Minimum version of cmake is now beyond 3.6.0, no need to check for that when selecting VS_STARTUP_PROJECT
2021-12-02 20:40:15 +10:00
AzaezelX de379f8b25 fix metal sound entry for playerdata 2021-11-30 18:19:58 -06:00
AzaezelX 1b282e0baf use internalname for terrain layers
stops bugs like spaces in filenames and the like from occuring due to pointing right at the diffuse flat file name, as well as corruption from using a different diffuse in the material later

(cherry picked from commit c1227dbdd0dd61c25970eeaac128c6cbe5d25947)
2021-11-29 13:54:13 -06:00
Brian Roberts 346a84d16c
Merge pull request #688 from Azaezel/alpha40/guibitmapbuttonColorModulation
adds colorization to GuiBitmapButtonCtrl
2021-11-28 12:49:18 -06:00
Brian Roberts a7e804c7c3
Merge pull request #689 from Azaezel/alpha40/soundcleanups
cleanups for sound assets
2021-11-28 12:49:10 -06:00
Brian Roberts 7a67406159
Merge pull request #690 from Azaezel/alpha40/tsStaticTroubles
TSStatic::updateMaterials() crashfix
2021-11-28 12:49:01 -06:00
AzaezelX 663335e556 TSStatic::updateMaterials() crashfix 2021-11-27 14:29:30 -06:00
AzaezelX 93faa243ac cleanups for sound assets
removed redundant get<foo>Profile calls, correctly used a few in proxmine
2021-11-27 00:32:25 -06:00
AzaezelX d074343b50 adds colorization to GuiBitmapButtonCtrl 2021-11-26 20:13:59 -06:00
Brian Roberts 3c30a905c3
Merge pull request #686 from Azaezel/alpha40/cmakeAugs
modular source work
2021-11-26 17:58:25 -06:00
Brian Roberts dfae36dd21
Merge pull request #687 from Areloch/MiscQOL_20211116
Misc QOL and Bugfixes for 2021/11/26
2021-11-26 17:58:16 -06:00
Areloch a5944aff19 Adjusted callback handling of asset inspector fields when invoking AB to select asset for more consistent behavior and better handling of updating the objects and inspector
Added logic to forcefully acquire newly imported asset definition to better try and ensure it's loaded immediately after import
Added logic to asset importer so if a file is not found for an importing material asset, if populate maps is on, then it will try and find a matching image asset in the destination module
Added logic to tsStatic to better handle fields being updated via the editor, forcing updates and refreshes of the shape and materialSlots
Fixed handling of guiBitmapButtonCtrl so it will update the bitmap used when edited via the Gui Editor
Updated image ref to the hudFill image asset for the console GUI
Cleaned up names for the default camera model/material
Defaulted import config to utilize the Prune action instead of rename for more predictable default behavior
Added icons next to AB's preview slider bar for additional visual feedback of slider intent
Added missing checkbox to asset import window and cleaned up scaling behavior
Fixed handling of drag-n-drop behavior in GUI editor so it doesn't block further interaction
Added logic for drag-n-drop of image assets to GUI Editor so it will create a GuiBitmapCtrl with the image
Added handling for drag-n-drop import of folders of assets to AB/Asset Import
Added missing asset import config option to indicate if config supported import of sound assets
Added logic when opening asset import config editor, where if there is a default import config set in the settings, it will open that one by default
Hid the collision section of the import config editor, as those options are currently unutilized
Improved behavior for Create New Folder window in the AB, now always pushing to the front, and also selecting the text by default, so the user can just start typing the new name
Also added return and escape key accelerators to Create New Folder window for better UX
Fixed display of editor windows, adding a distinct blue color to highlighted windows' title bar and fixing display of minimize/maximize/window/close buttons
Moved GUIEditor's onControlDropped function to the AB script to match placement of sibling world editor function
Fixed issue with material editor where the ORM Config map slot was getting the normal map instead of the correct ORM map
2021-11-26 16:40:15 -06:00
AzaezelX 490b8271e8 fix erroneous clipout 2021-11-25 19:51:34 -06:00
AzaezelX 583014de60 fix erroneous clipout 2021-11-25 19:49:56 -06:00
AzaezelX 1816b3ca0c modular source work
from @marauder2k7:
augments the modular inclusion of sourcefiles via confining it to /source/ directories only to prevent strays.
additionally, adds a /lib/ filter for full on library inclusion
2021-11-25 19:39:44 -06:00
Brian Roberts 13cd3de2ad
Merge pull request #685 from Ragora/bugfix-color-key-by-name
BugFix: Correct data corruption potential in GuiInspectorField
2021-11-24 21:38:10 -06:00
Robert MacGregor 41e5988c46 * BugFix: Correct a scoping error with ConsoleValue in the updated code in GuiInspectorField. 2021-11-24 14:14:24 -05:00
Robert MacGregor 4dea3810b9 * [SFXDescription] BugFix: Correct a data corruption issue in converting legacy channel values. 2021-11-24 13:46:18 -05:00
Robert MacGregor f1a48df676 * [GuiInspectorField] BugFix: Correct data corruption potential caused by casting the result of Con::evaluatef directly to a const char. 2021-11-24 09:16:09 -05:00
Brian Roberts 31c8d3ce3a
Merge pull request #681 from Ragora/bugfix-macos-builds
BugFix: Correct the inability to build on MacOS
2021-11-23 11:58:57 -06:00
Robert MacGregor ba7082bea1 * BugFix: Correct the inability to build on MacOS due to differing target names on MacOS. 2021-11-23 10:32:49 -05:00
Brian Roberts ae02725e96
Merge pull request #680 from rextimmy/cmake_work
make use of folder properties in cmake
2021-11-22 13:12:27 -06:00
rextimmy d58cf398a9 make use of folder properties in cmake 2021-11-22 12:30:08 +10:00
Brian Roberts 637f54e859
Merge pull request #679 from Azaezel/alpha40/cubeCrashCorrection
set cubemapsaver profile to one that preserves sizes
2021-11-21 19:25:12 -06:00
AzaezelX 0527865462 set cubemapsaver profile to one that preserves sizes
also aug size mismatches for the popup so they're reported
2021-11-21 14:28:51 -06:00
Brian Roberts 797020286b
Merge pull request #668 from Ragora/feature-turret-typemask
Feature: Implement a TurretObjectType bit for typemasks
2021-11-20 23:32:15 -06:00
Brian Roberts df4624e88a
Merge pull request #674 from Ragora/adjustment-unix-platform
Adjustment: Generalization of platformX86UNIX to platformPOSIX
2021-11-20 19:27:48 -06:00
Brian Roberts 01ae95ee4b
Merge pull request #678 from JeffProgrammer/console-stack-fixes
Fixed a leak with console stack in the interpreter.
2021-11-20 19:27:33 -06:00
Jeff Hutchinson 7ac62f42a3 Fixed a leak with console stack in the interpreter.
Issue was pushing a new frame in the global scope. Everytime a global scope was called, 1 ConsoleValue got allocated that was never freed. After 4096 'global scope' function calls, the engine would blow. Also cleans up an extra rogue usage of push/pop with the saver helper.
2021-11-20 19:08:02 -05:00
Brian Roberts 05a8a014b8
Merge pull request #677 from Areloch/assimpExtensionCaseFix
Fix extension case handling when looking up assimp importer
2021-11-20 00:38:03 -06:00
Areloch 04b0883a31 Assimp checks against lowercase extensions, so we force the extension of the file to lower before fetching the importer.
Also adds sanity check that the importer was actually found before we try and use it.
2021-11-19 23:14:06 -06:00
Robert MacGregor 88cfa4533b * Cleanup: Remove a comment referencing the now-removed DisplayPtrManager. 2021-11-17 22:08:08 -05:00
Robert MacGregor d1fde1f54b * Cleanup: Fully remove the DisplayPtrManager class as it was not actually being used by anything. 2021-11-17 21:58:17 -05:00
Robert MacGregor b986589804 Merge remote-tracking branch 'main/Preview4_0' into adjustment-unix-platform 2021-11-17 21:38:48 -05:00
Brian Roberts 75adcb9b7c
Merge pull request #676 from JeffProgrammer/ts-errors
Optionally allow to treat script assert as warning
2021-11-17 17:03:32 -06:00