8480 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brian Roberts	f59a640857	Merge pull request #1775 from Azaezel/alpha41/DivNULLnono ... avoid divide by zero when counteracting bouyancy bounce for players	2026-06-20 20:37:32 -05:00
AzaezelX	f912bc172d	avoid divide by zero when counteracting bouyancy bounce for players ... reported by sir_skurpsalot: https://discord.com/channels/358091480004558848/783127087820439582/1518054290524995644	2026-06-20 20:37:05 -05:00
Brian Roberts	070009df22	Merge pull request #1774 from marauder2k9-torque/Assimp-bounds-axis-fix ... Assimp fixes	2026-06-20 12:58:13 -05:00
marauder2k7	97f3485a76	Update assimpShapeLoader.cpp	2026-06-20 18:14:00 +01:00
marauder2k7	887f239a20	Assimp fixes ... Should now apply the same corrective fix to modelled bounds	2026-06-20 17:09:43 +01:00
Brian Roberts	0b73e701ac	Merge pull request #1772 from Azaezel/alpha41/silentSFXEmitter_Shtapit ... crashfix for SFXEmitter	2026-06-18 17:17:26 -05:00
AzaezelX	6a448cf118	crashfix for SFXEmitter ... the last refactor broke spawning sfxemitters with blank entries. this will fix that, though we'll need to circle back and correct other issues, like looping override	2026-06-18 17:17:07 -05:00
Brian Roberts	2341db8f63	Merge pull request #1771 from Azaezel/alpha41/missionMarkerMangle ... crashfix: make sure mShapeInstance is always assigned valid or NULL	2026-06-17 16:50:21 -05:00
AzaezelX	17d2765592	crashfix: make sure mShapeInstance is always assigned valid or NULL ... there were a couple code routes that could lead to mShapeInstance holding on to the old ram loc. used SAFE_DELETE preemptively to ensure that never happens.	2026-06-17 16:49:49 -05:00
Brian Roberts	280866724d	Merge pull request #1769 from Areloch/ImageAssetConvert ... Updates ImageAsset usage to be more standardized	2026-06-17 15:28:08 -05:00
JeffR	34e3f78a22	Updates ImageAsset usage to utilize AssetRef, and standardizes the setter/getter functions and naming conventions, as well as the ability to use and bind named targets.	2026-06-16 17:39:30 -05:00
Brian Roberts	1683b74937	Merge pull request #1768 from marauder2k9-torque/bugs-reported ... Bugs Reported Steve_Yorkshire	2026-06-16 17:12:37 -05:00
marauder2k7	872c765ca0	clean ... Removed intel runner from mac, it never run Removed arm from windows as it will always fail as git ci runners are not arm removed gcc12 kept gcc13 Added convenience function for checking if a package is active	2026-06-16 22:01:19 +01:00
marauder2k7	4062a1bbbd	remove runners that failed explicitly ... also https://learn.microsoft.com/en-us/cpp/build/reference/debug-generate-debug-info?view=msvc-170 use /DEBUG:FULL instead of FASTLINK as it is deprecated	2026-06-16 21:48:51 +01:00
marauder2k7	222f476f0e	updated runners ... multiple different build types added for different configurations, now making full use of the matrix properly so we can have an early warning of different compile setups and errors that may occur	2026-06-16 21:14:21 +01:00
marauder2k7	ae283af384	Update CMakeLists.txt	2026-06-16 20:32:56 +01:00
marauder2k7	d5d1885254	Update CMakeLists.txt	2026-06-16 20:28:16 +01:00
Brian Roberts	a858d8624e	Merge pull request #1767 from Azaezel/alpha41/assimpUpdate6_0_5 ... update assimp to 6.0.5	2026-06-09 15:08:05 -05:00
AzaezelX	f5cf21cfeb	update assimp to 6.0.5	2026-06-09 12:46:56 -05:00
Brian Roberts	2d2eb57e2e	Merge pull request #1763 from marauder2k9-torque/small-fixes ... Fix for convexShape	2026-06-08 15:44:34 -05:00
marauder2k7	a63ec0d018	Update convexShape.cpp ... default to true	2026-06-08 21:43:58 +01:00
marauder2k7	28f0d523a6	Update CMakeLists.txt	2026-06-08 10:29:25 +01:00
marauder2k7	11a5354e67	convex shape error ... reading an int in scanf into a bool causes issues, could be the compile options being more strict about inlining and the precompiled headers Also precompiled header for sceneObject since build insights saw it as the most expensive header.	2026-06-08 10:09:40 +01:00
Brian Roberts	6c7a92a5b8	Merge pull request #1762 from marauder2k9-torque/Compile-Changes-To-CMakeLists ... Compile changes CMakeLists only	2026-06-07 19:59:39 -05:00
marauder2k7	874b314fee	Update CMakeLists.txt	2026-06-08 01:38:45 +01:00
marauder2k7	1d516f3dd9	Update CMakeLists.txt ... this is just the cmakelists changes from the compile pr, this includes a precompiled header with some defaults in there, could test adding more as required.	2026-06-08 00:52:32 +01:00
Brian Roberts	bac9ed99b3	Merge pull request #1760 from marauder2k9-torque/ShaderGen-produce-shaderdata ... Shader Gen to produce ShaderData	2026-06-07 18:23:21 -05:00
Brian Roberts	059417e593	Merge pull request #1761 from marauder2k9-torque/Fix-GlobalRegistrionVectors-XcodeIssue ... Fix for extension registrations for different Resource types	2026-06-07 18:18:30 -05:00
marauder2k7	d4e9275240	replace specific names for a universal getRegistrations	2026-06-07 22:37:20 +01:00
marauder2k7	3aac9af35e	same change but for gbitmap ... make sure to use the namespace TSShape	2026-06-07 22:30:56 +01:00
marauder2k7	e83bab90d7	fix for shape registration ... The automatic global static was hitting a destructor on xcode, this seemed like it was being pedantic about name at first but then between runs the same issue would come back. With this change it is wrapped in a function to get the vector instead.	2026-06-07 22:10:52 +01:00
marauder2k7	663fc9b83e	Update gfxGLShader.cpp ... opengl cached programs	2026-06-05 15:55:50 +01:00
marauder2k7	dacc4db708	dx caching result	2026-06-05 14:52:30 +01:00
Brian Roberts	0c2aa5328c	Merge pull request #1759 from Areloch/TSStaticFallbackShapePtrFix ... Adjusts the logic for collision and physics setup functions in TSStatic	2026-06-05 08:03:56 -05:00
marauder2k7	4cf780e7b8	Shader Gen to produce ShaderData ... Shader gen now produces a shaderdata class - this should reduce full recompilation of shaders when a macro switch happens. FileStream can now also be setup to be async write, so it will write out the file on a separate thread hopefully freeing up the main thread to continue working.	2026-06-05 11:29:18 +01:00
JeffR	eade131ad2	Adjusts the logic for collision and physics setup functions in TSStatic because we utilize/allow for the fallback shape and so need to contend for if we have a shapeInstance but our shapeAsset ptr is invalid.	2026-06-05 01:56:09 -05:00
Brian Roberts	8adf692da5	Merge pull request #1756 from marauder2k9-torque/Update-Bullet ... Bullet required an update so that it would build again	2026-06-04 11:50:38 -05:00
Brian Roberts	0df3bea9ca	Merge pull request #1757 from Azaezel/alpha41/colFilterFix ... fix advanced model editor slider blocker	2026-06-03 19:45:41 -05:00
AzaezelX	9750e7dcc8	fix advanced shader editor slider blocker ... correct size of hullInactive filter and logic for it by adding a function ShapeEdColWindow::onColTypeSelected that goes off on any selection from the dropdown	2026-06-03 19:24:02 -05:00
marauder2k7	13fa178cf6	update bullet so it actually works ... Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.	2026-06-03 15:08:51 +01:00
Brian Roberts	c7be48130a	Merge pull request #1755 from Azaezel/alpha41/fixSetImageOptional ... fix optional skin param for ShapeBase::setImage	2026-06-02 15:34:19 -05:00
AzaezelX	6485d48e38	fix optional skin param for ShapeBase::setImage ... using the %obj.mountImage(image,slot,loaded,skin) skin option was not always properly applying. reported by steve_yorksire, fixed by sir_skurpsalot: https://discord.com/channels/358091480004558848/580242040730943509/1510795740199260252	2026-06-02 13:46:25 -05:00
Brian Roberts	c58f6825dc	Merge pull request #1754 from Areloch/ShapeAssetCleanupRefactor ... ShapeAsset Cleanup and Standardization refactor	2026-05-31 16:29:21 -05:00
JeffR	d53892fb80	Corrected handling for invalid shapes using fallback shape on TSStatics	2026-05-31 16:22:12 -05:00
JeffR	b338510921	Minor fixes and corrections	2026-05-31 11:53:41 -05:00
Brian Roberts	ebd409c2e9	Merge pull request #1752 from marauder2k9-torque/ScriptFix-ParentCallWithoutThis ... Script Fix for Parent call that does not use %this	2026-05-31 11:36:15 -05:00
JeffR	de26f519f9	Adds logic to correctly write out a shape's materials as fields to the asset taml file so they can register as dependencies with the assetdatabase	2026-05-31 11:14:54 -05:00
JeffR	b44158cb89	Cleans up ShapeAsset of some unnecessary/redundant elements like extra material and animations tracking ... Removed the old SHAPE_ASSET macros Implements AssetRef struct that acts as a universal wrapper for an templated AssetPtr and AssetId pair Adds Type handling for AssetRef for ShapeAsset to unify handling in classes that utilize a shapeAsset, so assigning an assetPtr or an assetId will keep a record of the assignment in the event the assetPtr is invalid. Update all classes that utilized the old SHAPE_ASSET macros to utilize the AssetRef struct and updated the class code to utilize it to provide much more clean and concise code that isn't blocked behind macro definitions Added a new example class: shapeDatablockExample which allows render of a simple shape object utilizing a simple example datablock.	2026-05-31 01:19:26 -05:00
marauder2k7	721b84950d	Update compiledEval.cpp	2026-05-30 10:45:16 +01:00
Brian Roberts	c2c5674fe9	Merge pull request #1727 from marauder2k9-torque/AddField-ControlStruct-AddVisibility-control ... Adds a new FieldDescriptor struct	2026-05-27 14:55:10 -05:00