Commit graph

3944 commits

Author SHA1 Message Date
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
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
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
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
AzaezelX
1afd1996fe sceneobject mountchain enable/disable collision aug 2020-10-09 16:51:26 -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
AzaezelX
d1cc5964c4 fix GCC compile 2020-10-08 18:17:35 -05:00
AzaezelX
eaf814f2e3 EngineExportScope(){} *can't* be initialized by default, aparantly 2020-10-05 13:44:08 -05: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
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
Brian Roberts
d50f1f0b81
Merge pull request #342 from lukaspj/fix/replace-dstrcmp
Replace uses of dStrCmp with new String::compare
2020-10-03 17:01:12 -05:00
Lukas Aldershaab
197a62f6ea Convert dStrcmp to String::compare for more cases 2020-10-04 00:00:01 +02:00
Lukas Aldershaab
d0f9aca859 Code style improvement 2020-10-03 23:53:45 +02:00
Brian Roberts
6dedf6330b
Merge pull request #327 from lukaspj/fix/interpreter-foreach
Fix global variables not being able to be used inside of a foreach$ loop
2020-10-03 15:59:20 -05:00
AzaezelX
411cd009f4 fix terrain compilation 2020-10-03 13:32:16 -05:00
AzaezelX
33f17ea759 pathshape gravity suppression injection 2020-10-03 12:21:16 -05:00
Brian Roberts
681dbe108c
Merge pull request #323 from Azaezel/alpha40_smoothToRough_clean
shift pbrconfig to ORM in keeping with the prepoderance of industry standards
2020-10-03 11:49:10 -05:00
Brian Roberts
40f9dfe712
Merge pull request #334 from lukaspj/fix/sfx-player-bitstream-data
SFX Player fixes #74
2020-10-03 11:39:31 -05:00
Brian Roberts
777a50683d
Merge pull request #329 from lukaspj/fix/temporary-spotlight-fix
Temporary fix for the geometry feed in spotlights
2020-10-03 11:36:52 -05:00
Brian Roberts
bbfa55c206
Merge pull request #328 from lukaspj/feature/guiRenderTargetVizCtrl
Implementation of guiRenderTargetVizCtrl
2020-10-03 11:34:50 -05:00
Brian Roberts
8c49019958
Merge pull request #337 from lukaspj/feature/disable-update-of-basetexture
extra option for terrain block to disable the update of the basetexture
2020-10-03 11:31:48 -05:00
Brian Roberts
612a3e3358
Merge pull request #309 from Azaezel/alpha40_triggerTricksTre
new trigger features: triponce, tripcondition, and trippedby.
2020-10-03 11:26:59 -05:00
Brian Roberts
c7cabe7081
Merge pull request #261 from Azaezel/alpha40_animCleanups
groundframe generation cleanup work
2020-10-03 11:26:14 -05:00
Brian Roberts
e5014fb24e
Merge pull request #212 from Azaezel/alpha40_export_LOD_rounding
export rounds LODs to the nearest power of 2
2020-10-03 11:25:53 -05:00
Lukas Aldershaab
c999baf7ed Moves from using dStrCmp to the new String::compare static functions. Keeps things cleaner, consistent, and works with intellisense. 2020-10-03 14:37:55 +02:00
yourarcade
7480dea1a9 breakShape() - remove parts created with invalid object box along with empty parts. 2020-10-03 14:09:16 +02:00
Francisco Montañés García
faa38ffcd8 Inside _internalRender mForceFOV is not take into account. 2020-10-03 13:20:45 +02:00
Lukas Aldershaab
f87dde254d extra option for terrain block to disable the update of the basetexture 2020-10-03 11:31:02 +02:00
Lukas Aldershaab
70de01e34c SFX Player fixes #74 SFX Playlist currently writes an absurd amount of data into the bitstream. 2020-10-03 11:11:34 +02:00
Lukas Aldershaab
b5d1d1a02c Temporary fix for the geometry feed in spotlights 2020-10-03 01:07:17 +02:00
Lukas Aldershaab
dca2dc0074 Implementation of guiRenderTargetVizCtrl 2020-10-03 00:58:38 +02:00
Jeff Hutchinson
2bf3c8384c Fix global variables not being able to be used inside of a foreach$ loop. 2020-10-03 00:47:20 +02:00
AzaezelX
3a67ddd34c so ok, looks like there's *still* wonkiness with processtick runing through from vehicle to rigidshape. we'll have to review that at a later date. mean time, explicitly specifying shapebase so folks can proceede with thier project requests 2020-10-02 14:44:43 -05:00
AzaezelX
321c25a401 profiler tracking name collision fix 2020-10-02 14:16:27 -05:00
AzaezelX
afb39d398f code review:
1) got rid of evey class having it's own gravity
2) rigidshape inheritance simplifications
3) gravitymod from physicszones taking buoyancy into account natively (we still track raw bouyancy to cancel it out for player)
4) disableMove used throughout
5) items can now also be influenced by the appliedforce from physicszones
2020-10-02 13:53:46 -05:00
AzaezelX
0c7811bd1a shift pbrconfig to ORM 2020-09-30 13:51:12 -05:00
AzaezelX
22b0785c73 augment imageasset with initMapSlot and bindMap class insert macros (and array variants) to make the conversion process for folks shifting from 3.x to 4.x cleaner, as well as autocreation of getter/setter methods andadditoinal acessor macros for consistency 2020-09-30 13:50:23 -05:00
AzaezelX
e88b7a0783 minor cleanups:
clean up mismatched  PROFILE_START+PROFILE_END() that was in/out of the mip packign for loop on the gl side, leaving just the self-cleaning PROFILE_SCOPE(GFXGLTextureObject_copyToBmp); similar to the dx11 side
   void GuiGameListMenuCtrl::removeRow(const S32& row); (the GuiGameListMenuCtrl:: bit in the class iteslf is redundant and making linux unhappy)
2020-09-26 22:43:26 -05:00
AzaezelX
1d71ee70e8 memleak fix 2020-09-25 12:25:35 -05:00
Areloch
ead26ec18a Implements hook-look-up logic for shape assets to ShapeBaseData including autoimport handling
Also fixes issues with editing/spawning DBs via the asset browser
2020-09-21 20:51:41 -05:00
Brian Roberts
add299e1b8
Merge pull request #316 from Areloch/UpdatedWindowsSettingsOptions
Updated version of OTHGMars' updated window and resolution options modes.
2020-09-20 16:02:35 -05:00
Areloch
26ef40950b Updated version of OTHGMars' updated window and resolution options modes.
Additional changes include disabling certain options when they are not valid(ie, resolution is disabled when in borderless mode)
2020-09-20 02:06:15 -05:00
Areloch
350d3e6702 Fixes 2 minor mistake corrections 2020-09-20 01:19:08 -05:00