Commit graph

4461 commits

Author SHA1 Message Date
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
AzaezelX 4a11b0dea3 underwater fog fix 2020-10-09 12:42:43 -05:00
AzaezelX 4c982a4b29 fix gl compilation 2020-10-08 21:38:43 -05:00
Brian Roberts 6860bddf35
Merge pull request #354 from Azaezel/alpha40_compositCreationCoughup
fix for empty r channel creation of composites crashing out
2020-10-08 19:15:13 -05:00
AzaezelX ed260548c5 fix for empty r channel creation of composites crashing out 2020-10-08 19:14:50 -05:00
Brian Roberts 97fd3fba5c
Merge pull request #353 from Azaezel/alpha40_GCC_fixups
fix GCC compile
2020-10-08 18:18:49 -05:00
AzaezelX d1cc5964c4 fix GCC compile 2020-10-08 18:17:35 -05:00
Brian Roberts e3ad02eda0
Merge pull request #352 from Azaezel/queueQQ
followup
2020-10-05 15:52:03 -05:00
AzaezelX 7d63f114fa followup 2020-10-05 15:50:45 -05:00
Brian Roberts 142877650d
Merge pull request #351 from Azaezel/queueQQ
replicate exec signatures for queueExec
2020-10-05 15:19:28 -05:00
AzaezelX 09f9b5351c replicate exec signatures for queueExec 2020-10-05 15:19:04 -05:00
Brian Roberts 04795cefbb
Merge pull request #350 from Azaezel/alpha40_EngineExportFix
EngineExportScope(){} *can't* be initialized by default, aparantly
2020-10-05 13:45:07 -05:00
AzaezelX eaf814f2e3 EngineExportScope(){} *can't* be initialized by default, aparantly 2020-10-05 13:44:08 -05:00
Brian Roberts 605591b315
Merge pull request #349 from lukaspj/fix/caustics-shader-paths
Fix paths in caustics shader
2020-10-04 17:57:45 -05:00
Lukas Aldershaab b6d7fdd7bd Fix paths in caustics shader 2020-10-05 00:51:06 +02:00
Brian Roberts 0c29847943
Merge pull request #343 from lukaspj/feature/mesh-road-profile-editor
Profile editor for the meshRoad object
2020-10-03 17:48:00 -05:00
Brian Roberts 2dae903a18
Merge pull request #341 from lukaspj/fix/break-shape-invalid-box
breakShape() - remove parts created with invalid object box .
2020-10-03 17:47:47 -05:00
Brian Roberts b003eeafe8
Merge pull request #348 from lukaspj/fix/string-compare-overload-error
Use string.compare instead of String::compare when comparing strings
2020-10-03 17:36:32 -05:00
Lukas Aldershaab 7dc2521c76 Use string.compare instead of String::compare when comparing strings 2020-10-04 00:33:21 +02:00
Lukas Aldershaab 973fd44c6a Profile editor for the meshRoad object
credit to Ryan Mounts (RDM)

found originally at http://www.garagegames.com/community/forums/viewthread/105391
2020-10-04 00:19:43 +02:00