4480 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lukas Joergensen	4eabbd5bb0	GuiFilterCtrl: Rename identity function to resetFiltering to avoid clash ... The field "identity" previously clashed with the method "identity"	2020-11-15 21:30:45 +01:00
Lukas Joergensen	a069496ad3	ModuleDefinition: Remove duplicate addProtectedField for ModuleId	2020-11-15 21:30:45 +01:00
Lukas Joergensen	e1a6fa01ca	PostEffect: Rename isEnabled field to enabled, to fix name clash	2020-11-15 21:30:45 +01:00
Lukas Joergensen	5a994bdddc	Rename GuiSpeedometer::mColor to mNeedleColor to avoid clash with parent	2020-11-15 21:30:45 +01:00
Lukas Joergensen	a241d27b58	Expand EngineAPI type definitions	2020-11-15 21:30:45 +01:00
Brian Roberts	f5f0eb2bb4	Merge pull request #378 from Azaezel/alpha40MacCompilePreprocessor ... shader preprocessor fixes	2020-11-11 12:20:33 -06:00
Brian Roberts	b96d342960	Merge pull request #376 from Azaezel/alpha40_FixPrefLookup ... be sure to executte defaults prior to clientprefs	2020-11-11 12:20:23 -06:00
AzaezelX	d76a76a1c4	shader preprocessor fixes ... some hardware/apis do not evalueate 'not defined' as '0', so always ensure there's *some* value when doing macro value comparisons	2020-11-10 13:57:26 -06:00
Brian Roberts	e2cb62e252	Merge pull request #377 from Azaezel/alpha40_macCompile ... mac compile fixes	2020-11-07 23:03:41 -06:00
AzaezelX	c746871b0a	zlib - remove modified mini variant from assimp. we're using the big one elsewhere	2020-11-07 22:03:04 -06:00
AzaezelX	5de19404d9	mac compile fixes ... 1) `/` not `\` for includes 2) had to clean up a few extra ## bits that work fine winside, but trip up macs (only needed when stitching, had 5 spots where that was pointless)	2020-11-06 02:11:13 -06:00
AzaezelX	eb365fc866	be sure to executte defaults prior to clientprefs to ensure nothing gets missed	2020-11-04 16:31:17 -06:00
Brian Roberts	e3b8c7b001	Merge pull request #373 from Azaezel/alpha40_HDRfixes ... get gl side HDR compiling, attempt clamp to keep bloom in range	2020-11-03 21:28:19 -06:00
AzaezelX	be8988b1a3	remove gl side TORQUE_HDR_RGB16 macros. doesn't exist DX side, and seemed to be causing issues	2020-11-01 20:19:49 -06:00
Brian Roberts	036c7c2c75	Merge pull request #374 from Areloch/PostFXSaveLoadEditFixup ... Misc fixes to ensure that the default postFX save, load and editing process is valid	2020-11-01 15:50:52 -06:00
Areloch	9ca276fef0	Misc fixes to ensure that the default postFX save, load and editing process is valid ... Also fixes it so if a level asset doesn't point to a valid postfx preset file, it'll generate a clean one on save	2020-11-01 15:39:30 -06:00
AzaezelX	5be1b77791	get gl side HDR compiling, attempt clamp to keep bloom in range	2020-10-30 00:15:08 -05:00
Brian Roberts	302a64edd1	Merge pull request #372 from Areloch/MiscProbeLoadingFixups ... Misc. probe bake/load fixups	2020-10-29 23:30:45 -05:00
Areloch	94e6d19fb2	Ensures that baking is consistently set to use HDR formats or not which avoids an occasional mismatch crash ... Also corrected a string formatting issue with loading static cubemaps on probes that could lead to a crash Fixed the resources loaded handling so it would correctly initialize the probe's cubemaps even if the initial ghost network packet assigned a cubemap before we fully init'd the client object	2020-10-29 23:27:07 -05:00
Brian Roberts	0e2fff00d2	Merge pull request #339 from lukaspj/fix/forcefov-on-guitscontrol ... ForceFOV is not working on GuiTSControl.	2020-10-28 20:38:25 -05:00
Brian Roberts	72ee2260ca	Merge pull request #370 from Areloch/MiscBaseGameUIFixes ... Misc. BaseGame UI fixes	2020-10-28 20:24:33 -05:00
Areloch	d83fc0b232	Adds check so we only do the pausing of the audio/sim when opening the pause menu when it's single player	2020-10-25 14:40:32 -05:00
Brian Roberts	1e9df5f415	Merge pull request #371 from Areloch/AssetNameSanityCheck ... Adds a sanity check so asset names cannot start with a number	2020-10-25 13:04:35 -05:00
Areloch	f47e3f395a	Adds a sanity check so asset names cannot start with a number, which would be an invalid object name,	2020-10-25 12:26:42 -05:00
Areloch	db6c63d424	Adjusts guiGameListMenuCtrl.cpp to handle Left and Right keys to adjust options, which simultaneously fixes the 'jiggle' issue on the options menu of the BaseGame base UI ... Per Steve's suggestion, put a pause on gameplay sounds alongside the game sim being paused when the pause menu is opened. Nudges the keybind preview image for guiGameListMenuCtrl to be better centered	2020-10-25 02:51:52 -05:00
Brian Roberts	443ca32a1d	Merge pull request #369 from zfbx/RealTimestamps ... Added date/timestamp option to console log	2020-10-24 19:55:14 -05:00
Tony	a5b31a3cef	Added space to append to timestamps if they're used	2020-10-24 20:39:27 -04:00
Tony	f7a0047391	Fixed date order to be YYYY/MM/DD	2020-10-24 20:34:03 -04:00
Tony	afa8124301	Added date/time stamps option to console log	2020-10-24 05:41:18 -04:00
Brian Roberts	68ac97e82a	Merge pull request #367 from Azaezel/alpha40_365 ... fix #365	2020-10-21 11:28:02 -05:00
AzaezelX	fef05cf2ca	fix #365	2020-10-21 11:27:36 -05:00
Brian Roberts	a819181591	Merge pull request #364 from Areloch/ProbeReorgPR ... Overhauls the handling of probes to utilize an active probe list	2020-10-19 01:59:17 -05:00
Areloch	6a3603c737	Overhauls the handling of probes to utilize an active probe list to improve performance and allow a greater total number of active probes in a scene. ... Also fixes handling of metal materials during bakes to render properly, and fixes a possible double-up return in findObjectByType, which could cause doubling when getting probes in the scene	2020-10-19 00:53:09 -05:00
Brian Roberts	072b5ecb19	Merge pull request #357 from Areloch/ImageAssetHookins ... Updates macromagic to properly set up for init'ing when image assets are set in material and terrain materials	2020-10-17 16:21:24 -05:00
Brian Roberts	3851612b91	Merge pull request #361 from Areloch/LevelAssetLoadConsistency ... Updates some level asset functions and script handling	2020-10-17 16:21:01 -05:00
Brian Roberts	225a2ecf4e	Merge pull request #363 from Areloch/ImprovedImageSuffixHandling ... Improves default suffix handling for asset importer on image assets under a material asset	2020-10-17 00:59:12 -05:00
Brian Roberts	9257991d67	Merge pull request #362 from Areloch/PrototypingModule ... Basic prototyping module initial upload	2020-10-16 22:45:30 -05:00
Areloch	c0203e13e9	Basic prototyping module initial upload	2020-10-16 22:12:05 -05:00
Areloch	f4f60e1ae7	Improves default suffix handling for asset importer on image assets under a material asset	2020-10-16 17:03:30 -05:00
Areloch	837983c767	Adds script function to access full path of the level asset's preview image file ... Updates script function descriptions to be correct Updates chooseLevelDlg functions to be more efficient and consistent, and use the exposed get methods for getting preview images and the like properly	2020-10-13 18:44:42 -05:00
Areloch	0658aebe4d	Merge pull request #3 from Azaezel/ImageAssetHookins ... simplification of the Class::_set<slotname>Asset methods,	2020-10-12 19:57:23 -05:00
AzaezelX	4250e1d1b4	simplification of the Class::_set<slotname>Asset methods, (as well as early outting before dAtoi(index) hurt itself if index was invalid) ... also since I was in there, fixed isrgb accidently being flipped on by default	2020-10-12 04:43:47 -05:00
Brian Roberts	0763ad9649	Merge pull request #360 from Azaezel/QQqq ... clip ./ when doing pattern matching	2020-10-12 02:33:02 -05:00
AzaezelX	93e00a8242	clip ./ when doing pattern matching	2020-10-12 02:32:16 -05:00
Brian Roberts	8a252458d4	Merge pull request #356 from Azaezel/alpha40_mountchainCollisions ... sceneobject mountchain enable/disable collision aug	2020-10-11 16:00:56 -05:00
Areloch	f0068c2435	Updates macromagic to properly set up for init'ing when image assets are set in material and terrain materials	2020-10-10 22:48:13 -05:00
Brian Roberts	8e4edc3545	Merge pull request #237 from Azaezel/alpha40_notKnotNoNo ... safety check	2020-10-09 20:00:10 -05:00
Brian Roberts	880c366eda	Merge pull request #355 from Azaezel/alpha40_glFixes ... fix gl compilation	2020-10-09 19:59:21 -05:00
AzaezelX	1afd1996fe	sceneobject mountchain enable/disable collision aug	2020-10-09 16:51:26 -05:00
AzaezelX	e8ca1a6705	postfFx to postFX dir listing fixes	2020-10-09 12:56:38 -05:00