Commit graph

4779 commits

Author SHA1 Message Date
Areloch
88ae8a9665 Added getShapeConstructorFilePath console function on shapeAsset
Fixed typo in import config settings for DuplicateAutoResolution
Converted TSShapeConstructor to utilize assets
Updated shape editor to work with assetified constructors
Converted guiBitmapButtonCtrl to use assets
2021-08-02 04:20:27 -05:00
Areloch
52c83d19e1 Added shapeFile field to TSForestItemData convert setting
Fixed modulePath not setting in some cases for project importer
Fixed not assigning drop and splash textures in precipitation
Fixed stringtable insert for sfxProfile
2021-07-28 12:01:17 -05:00
Areloch
abf5a09bc3 Removed duplicate checkbox image
Added asset import conflict resolution option to prepend folder name
Cleanups of Project Importer and fixed importing of material and terrain materials, specifically, fallbacks in the event they are unnamed to utilize the mapTo and internalName fields, respectively
Fixed typos in guiTerrainMaterialDlg
Added AssetBrowser button to GuiEditor
Improved FileObject's PeekLine function to be able to peek forward further via an optional lineOffset argument
2021-07-28 09:26:13 -05:00
AzaezelX
438e6cbb3c fix for diffuse map mangling in several cases, filter imposters out of real time lighting (for now?) fix the blankskybox via a resave, and filter "badfilereference" and "failed" assets out of variable replacement for the project converter 2021-07-25 17:18:55 -05:00
Areloch
432d201569 Further conversions of missed file fields in core and tools
Assets created for missed objects and files
Improvements to the Project Importer to correct a number of issues, including not parsing ,'s from object names, trimming whitespace, pruning script extensions from exec invokes
2021-07-24 02:08:23 -05:00
AzaezelX
36b31ae19d zip support followup 2021-07-22 21:27:13 -05:00
AzaezelX
b8eaefc21e refactor new IsScriptFile method to be zip-safe 2021-07-22 20:55:46 -05:00
AzaezelX
8976250fdf remove fallback from INIT_SHAPEASSET / INIT_SHAPEASSET_ARRAY as it seems that was causing more harm than good somehow 2021-07-22 12:35:25 -05:00
AzaezelX
4df5baffec alter project importing in the following ways:
A) if the file reference string lacks a "/" or "\" entirely, assume it's truly oldschool relative-to-scriptfile when generating links
B) leverage a combination of getClassHierarchy(%currentObjClass); and a new T3Dpre4ProjectImporter::genProcessor(%classType, %conversionMap) method to list-generate ittertatively applied entry conversions in a typo avoiding manner. (will stil need to ensure the old entries are properly listed. this only really avoids copypasta errors)
2021-07-22 12:25:45 -05:00
AzaezelX
795292bed5 alter nomaterial asset to a) use an imageasset, and b) remove the .cs assumption 2021-07-22 12:21:22 -05:00
AzaezelX
f185bef8a3 leverage isScriptFile
(also initialize  scattersky. mNightCubemapName = StringTable->EmptyString();)
2021-07-22 12:02:23 -05:00
AzaezelX
c41b8e00ff clean up the light.cookie entries 2021-07-22 11:57:41 -05:00
AzaezelX
059fb63487 set initial asset loaded state to not loaded 2021-07-22 11:57:11 -05:00
AzaezelX
38b565e12a new method isScriptfile. operates like isFIle, but also checks variations on extentions 2021-07-22 11:56:35 -05:00
AzaezelX
313466f57c new method from JeffH and Marauder: getClassHierarchy(classname). dumps a list of the class inhericance in reverse ancestor order (so that class first, next parent, *it's* parent, ect 2021-07-22 11:55:34 -05:00
Areloch
3e131f5b8e Added changes missed via merge failures.
Removed some unused files/references that were causing errors, related to issues #502 & #512
2021-07-20 20:05:49 -05:00
Areloch
5525f8ecdd Converts all game, gui editor, and system classes to utilize assets
Processed core, tools and default modules to utilize assets
Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption
Removed unneeded MainEditor mockup module
Removed some unused/duplicate image assets from the tools
2021-07-19 01:07:08 -05:00
Areloch
83b0432283
Merge pull request #489 from Azaezel/alpha40/zipPassPunt
expose a zip file password cmake config option
2021-07-17 11:03:26 -05:00
Areloch
4d40e3cab5
Merge pull request #449 from OTHGMars/Zip_Test2
Loading from zipped game directories.
2021-07-17 11:03:19 -05:00
Lukas Joergensen
91c985e518
Merge pull request #497 from Azaezel/alpha40/particleBounds
particle emitter bounds box fix
2021-07-14 14:46:01 +02:00
Lukas Joergensen
2c87c69dfc
Merge pull request #500 from Azaezel/alpha40/ScreenResFix
typofix in getScreenResolutionList
2021-07-14 14:43:21 +02:00
AzaezelX
3c0ca5ea88 typofix in getScreenResolutionList 2021-07-09 21:17:13 -05:00
Brian Roberts
18a7e31991
Merge pull request #499 from Azaezel/alpha40/macwork
mac compilation and standarization fixes
2021-07-05 17:56:22 -05:00
AzaezelX
cddacf1c48 mac compilation and standarization fixes
compresses void tc_spinloop() for both unix derivatives and apples to utilize pthread_yield_np();
mac only tweaks to Platform::getUserHomeDirectory() to return the ~/documents directory for parity with windows results
2021-07-01 14:10:07 -05:00
Jeff Hutchinson
312d55be47
Merge pull request #498 from OTHGMars/script_ext
Script extension assignment.
2021-06-27 23:48:20 -04:00
Brian Roberts
b02bead6ea
Merge pull request #493 from Azaezel/alpha40/shadowVarValidators
shadowmap validator tweaks
2021-06-22 12:05:02 -05:00
Brian Roberts
5ed7cda822
Merge pull request #492 from Azaezel/alpha40/simSetSupport
report simset names for add/remove errors
2021-06-22 12:04:48 -05:00
Brian Roberts
3aa0b8d236
Merge pull request #491 from Azaezel/alpha40/StreamSafetyString
augment bitstream write error reporting
2021-06-22 12:04:31 -05:00
Brian Roberts
db4f4984ca
Merge pull request #490 from Azaezel/alpha40/StaticShapeUnmountFix
connects staticshape::unmount to the parent chain so it can actually do so
2021-06-22 12:01:56 -05:00
OTHGMars
86c302c42e Prevents overwriting existing .torsion files. 2021-06-22 06:11:01 -04:00
OTHGMars
11c258fcdb Script extension assignment.
Sets extension on installed script files.
Enables .torsion file to be reconfigured after extension change.
Prevents copy of main.tscript.in.
2021-06-22 00:48:53 -04:00
AzaezelX
cf0c7a2d11 particle emitter bounds box fix
take the distance particles can move over thier lifetime into account for emitter bounds.
in addition, don't zero out the y axis
2021-06-19 15:15:12 -05:00
Brian Roberts
802598766a
Merge pull request #496 from JeffProgrammer/getWords_buffer_fix
Fix buffer overflow issue in StringUnit::getWords
2021-06-18 23:10:21 -05:00
Jeff Hutchinson
2e8a0185b3 Fix buffer overflow issue in StringUnit::getWords.
getWords("a b c d", 2); // "c d"

that turns into this inside the engine:

getWords("a b c d", 2, 1000000);

that code after parsing d goes string++ which passes over the null character. This now enforces that check. Found this with the new script interpreter...how this wasn't blowing up before is beyond me.
2021-06-18 21:08:03 -04:00
Brian Roberts
43c403a30e
Merge pull request #494 from just-bank/fix-simobject-call
Fix return value conversion when using SimObject::call() method
2021-06-15 12:30:08 -05:00
bank
5d1c29f54b
Fix return value conversion when using SimObject::call() method from scripts. 2021-06-15 19:03:43 +03:00
AzaezelX
8f713d93f3 shadowmap validator tweaks
set the minimum range to draw a shadow to 25 units, and the max to 10k (context, default draw distance is 1k)
'double' the max texture size allowed to 8192^2 (was 4096^2) to allow folks to throw more machine at it if they really *really* wish to
2021-06-11 00:02:52 -05:00
AzaezelX
3caa83284c report simset names for add/remove errors 2021-06-07 17:34:38 -05:00
AzaezelX
1da711dc4f augment bitstream write error reporting 2021-06-07 15:07:54 -05:00
AzaezelX
e3e2de7f7b connects staticshape::unmount to the parent chain so it can actually do so 2021-06-07 15:03:23 -05:00
AzaezelX
a34aea55f7 expose a zip file password cmake config option 2021-06-02 16:08:51 -05:00
Brian Roberts
dc82bc7485
Merge pull request #488 from OTHGMars/ResOptions
Window resolution options
2021-05-17 05:26:36 -05:00
OTHGMars
9539a4a055 Adds comment explaining window position change in GuiCanvas. 2021-05-14 17:30:23 -04:00
OTHGMars
dd665496d1 Borderless window defaults.
Limits borderless windows to the monitor usable area on non windows platforms to prevent the window from rendering behind taskbar/title bars.
2021-05-14 03:57:00 -04:00
OTHGMars
1ba7070bb6 Maintains window position when updating video mode for LightManager compatibility. 2021-05-14 03:52:43 -04:00
OTHGMars
de1e6df64b Removes redundant ScreenResChangeSignal trigger. 2021-05-14 03:50:28 -04:00
Brian Roberts
89e76f96de
Merge pull request #477 from Areloch/torsiontscriptcompliance
Updates the torsion.in file to properly be configured to handle tscript extension
2021-05-13 23:03:09 -05:00
OTHGMars
a5c809a738 Limit fullscreen resolution to options that match the monitor aspect ratio. 2021-05-13 20:52:04 -04:00
Areloch
438788c9b3 Rolled in Az's suggested fixes 2021-05-13 19:30:53 -05:00
Brian Roberts
6fe51cd9c3
Merge pull request #487 from JeffProgrammer/mac_m1
Add support for Apple Silicon
2021-05-11 15:17:28 -05:00