Commit graph

4567 commits

Author SHA1 Message Date
Areloch c0dec83a21
Merge pull request #1296 from Azaezel/alpha41/revertReformulation
roll back player animation picking
2024-07-26 17:15:46 -05:00
AzaezelX b5e1b32064 roll back player animation picking
old one worked better even if it made the compiler scream
2024-07-26 10:25:02 -05:00
AzaezelX eaa09a6db7 corrections:
fill in missing SceneObjectTypes enums.
parity with simobject.cpp and objecttypes.h
correct inspector display
2024-07-24 20:43:36 -05:00
AzaezelX 72c67e196a Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into Enumnanigans 2024-07-24 17:58:27 -05:00
Brian Roberts 7db28feb67
Merge pull request #1292 from Azaezel/alpha41/openALUpgrade
open al upgrade
2024-07-23 14:46:03 -05:00
marauder2k7 324acaf896 Update uuid.cpp
code review from Tron better method for uuid toString
2024-07-23 13:36:49 +01:00
marauder2k7 665fc092aa Update uuid.cpp
remove dmalloc
2024-07-23 13:09:23 +01:00
marauder2k7 80a1f0a0c5 Update uuid.cpp
add a malloc to target to make sure it has the length to take the string
2024-07-23 08:07:54 +01:00
marauder2k7 0853748f12 Update uuid.cpp
2 pass format_token, 1st gets the length required second passes it to target.
2024-07-23 07:58:03 +01:00
marauder2k7 3e57c709d9 Update uuid.cpp 2024-07-23 01:33:26 +01:00
marauder2k7 b1e7b817d2 Update duDebugDrawTorque.cpp 2024-07-22 21:40:57 +01:00
marauder2k7 776a9b9024 Update particleEmitter.h
....how was this working before.....
2024-07-22 21:37:51 +01:00
marauder2k7 56a89ee0b0 Update consoleFunctions.cpp 2024-07-22 21:20:54 +01:00
marauder2k7 6807abc8b6 ID10T error
no default does not need case -_- id10t error, few other fixes
2024-07-22 21:12:48 +01:00
marauder2k7 a621cc5100 various warnings
warnings cleanup
2024-07-22 20:59:48 +01:00
AzaezelX b12ece4627 from @marauder2k9-torque: remove typedefs as al.h now defines them, linux fix 2024-06-30 15:08:02 -05:00
marauder2k7 547b8c8c8c Merge remote-tracking branch 'upstream/development' into PhysicsDiscovery-tests 2024-06-25 13:17:39 +01:00
marauder2k7 b0181cc56a Update astNodes.cpp
missed naming
2024-06-18 15:23:52 +01:00
marauder2k7 fed83cdb8f naming
change enum to OP_JMPIFNOTSTRING (same name as others doing similar for different types)
place case with other ifnot statements
2024-06-18 15:15:25 +01:00
marauder2k7 54d0da6690 Update stringFunctions.h
changes to dAtob from az
2024-06-18 15:10:24 +01:00
marauder2k7 0d4c335231 test
working test without scanstring changes
2024-06-16 23:05:42 +01:00
marauder2k7 d8411b4a58 Update console.h
case insensitive
2024-06-16 20:02:57 +01:00
marauder2k7 d6a79e4f5b if statement
treat "true" as a bool in getInt check (inside if statements for strings)
no longer convert all "true" and "false" to ints
2024-06-16 20:01:47 +01:00
marauder2k7 e56f4cb6a6 if statements
Changed:
if check on vals now return true if the value has a string value
%val = "test me" if(%val) will now return true since %val is not null

Script side:
string checks for "true" and "false" will now be parsed as integer values of 1 and 0.

TEST VIGOUROUSLY
2024-06-16 15:04:20 +01:00
Brian Roberts 760c153232
Merge pull request #1288 from Azaezel/alpha41/posePoking
pickanimation filter fix, with docs
2024-06-15 14:30:52 -05:00
Brian Roberts b2fad6e3b9
Merge pull request #1287 from Azaezel/alpha41/destructorDefines
handle missing virtual destructors
2024-06-15 14:30:40 -05:00
AzaezelX 7ac714606f proper formulation 2024-06-11 16:08:07 -05:00
AzaezelX 61978fa4da pickanimation filter fix, with docs
sorts the order of operations flaws clang was complaining about, with explainations on why
2024-06-11 15:21:24 -05:00
AzaezelX a58f98167f handle missing virtual destructors
clang translation: destructinplace needs to know what to erase.
2024-06-10 13:20:09 -05:00
AzaezelX 5c701fe09e file write clarifications
handle clang complaints about hidden virtuals in the context of file writes that have thier own routes and I/O needs.
2024-06-10 13:15:27 -05:00
marauder2k7 1c43959c07 multiline eval support 2024-06-07 20:44:44 +01:00
marauder2k7 8140ed9b64 clear
clear lines, and dont try to print lines when there is no file.
2024-06-07 20:13:56 +01:00
AzaezelX 56e4484ff6 remove glowbin as it's own render pass 2024-05-30 17:29:42 -05:00
marauder2k7 79dfd14bea Update sfxALBuffer.h
revert to head
2024-05-25 10:20:14 +01:00
marauder2k7 0d1dc234fa Update sfxSndStream.cpp
we always want shorts
2024-05-25 10:04:51 +01:00
marauder2k7 e3d977b8e7 Update sfxALBuffer.h
mac dont like
2024-05-25 09:10:47 +01:00
marauder2k7 16ff27c6e6 Merge remote-tracking branch 'upstream/development' into sound-fix 2024-05-25 09:10:24 +01:00
marauder2k7 0ae0d633e9 Update sfxSndStream.cpp 2024-05-25 08:16:43 +01:00
marauder2k7 aa9cb63789 Update sfxSndStream.cpp 2024-05-24 17:18:35 +01:00
marauder2k7 de454dc793 Update sfxSndStream.cpp
revert vorbis back to 16bit add normalisation option.
2024-05-24 16:25:26 +01:00
marauder2k7 c28cedc2d8 32 bit float test
32 bit floating point sounds
2024-05-24 16:19:10 +01:00
marauder2k7 ebdc408385 Update sfxSndStream.cpp
streaming file fixes, also only wrap back around when we have read the whole file.
2024-05-24 15:11:18 +01:00
marauder2k7 bf34d3daa8 Update sfxSndStream.cpp
fix distortion issue on some sounds, if vorbis requires a scale set for float conversion
2024-05-24 14:12:01 +01:00
marauder2k7 482eb28ded Update sfxSndStream.cpp
add different file type modes and reset stream after reading (torque still reads the full thing)
2024-05-24 14:00:21 +01:00
marauder2k7 b338458a1d possible fix for torsion lineno 2024-05-24 09:48:42 +01:00
marauder2k7 25d6ee5372 backup
backup commit
2024-05-20 12:21:37 +01:00
marauder2k7 2d2d3c7560 PlaneConvex
Working example of a plane convex type, now groundplane does not need to create a box for its collisions.
2024-05-19 01:18:50 +01:00
marauder2k7 2132379b05 backwards compat
Changed: addCollisionDetail now has its fill mode at the end for easier backwards compat
2024-05-16 21:21:34 +01:00
marauder2k7 4b2165668f moar fixes
Fixed: convex and shape nodes are now the same transform as the target nodes
Changed: addNode now has the target at the end of its call for backwards compat
Fixed: renameNode was overwriting addNode calls, should not have been so
2024-05-16 20:36:47 +01:00
marauder2k7 280102d565 Update tsMeshFit.cpp
update addCollisionDetail documentation
2024-05-16 08:18:17 +01:00
marauder2k7 92b10df7eb cleanup nodes
ADDED: functionality to clean nodes out of the script that are related to a specific target
ADDED: functionality to clean multiple addCollisionDetails from the script
ADDED: ColConvex get added as nodes now and dont just get skipped (for future reference ColMeshes are checked for colConvex are not but this will be needed in future)

Removed: erroneous deletion of nodes and meshes from shapeEditorActions tscript file.
2024-05-16 07:04:54 +01:00
marauder2k7 25b0c5e2b1 finish fill mode setting
now fill mode actually takes effect and changes the fill mode type used to generate the convex hull
2024-05-16 04:32:14 +01:00
marauder2k7 48848f9706 rename vars
renamed vars to make more sense with the new option params
2024-05-16 03:39:18 +01:00
marauder2k7 f963a78446 TEST progress
Adding multiple collision hulls and shapes through the shape editor now works as intended though with multiple convex hulls it does produce a few lag spikes on first load of the objects.
2024-05-15 07:32:26 +01:00
marauder2k7 78f6206cde repurposed sliders
repurposed and renamed the 2 sliders in the gui to be for settings in vhacd
added the drop down for fillMode types but it is not hooked up to source yet
2024-05-14 17:20:17 +01:00
Brian Roberts cbe7f77ce0
Merge pull request #1278 from Azaezel/alpha41/oopsOps
fix fighting itterators
2024-05-14 09:47:54 -05:00
AzaezelX fe5e81a27a fix fighting itterators 2024-05-13 21:31:20 -05:00
marauder2k7 81a913616c revert ThreadPool rename
revert ThreadPool rename, resources ThreadPool class is already nested in namespace VHACD
2024-05-12 21:59:18 +01:00
marauder2k7 8cf2b1d0ef Update tsMeshFit.cpp
fix addSphere
fix addCapsule

now spheres and capsules scale correctly.... hopefully....
2024-05-12 17:51:21 +01:00
marauder2k7 399844f7f1 linux and tests
fix linux build
change thread test to use TorqueThreadPool
2024-05-12 16:31:30 +01:00
marauder2k7 948d2e5cef Update tsMeshFit.cpp
code cleanup, fix warnings etc
2024-05-12 15:21:59 +01:00
marauder2k7 109d8c06e9 final cleanup
final cleanup removal of the old convexDecomp library
ADDDED: library for the floatmath from v-hacd resource, required for fit sphere/capsule/box functions
2024-05-12 15:13:03 +01:00
marauder2k7 eb33fe04af working vhacd
renamed ThreadPool to TorqueThreadPool to avoid conflics
fixed data transmission between stages of convexDecome and trimesh creation
TODO: re-add our own functions for generating sphere/cylinder/box
2024-05-12 14:43:56 +01:00
marauder2k7 679f0ff065 vhacd
added vhacd not working atm
2024-05-12 03:07:59 +01:00
AzaezelX 84c08e6ed9 work around collide not returning false with a nul object
fix a crash caused by having boundingBoxCollision on, while projecting the mouse so that there is nothing between it and a globalbounds object
it would seem we're somehow ending up in a state of WorldEditor::collide returning true it hit somethging, but NULL as far as *what*
until we properly fix this, doublecheck to make sure the hitObject isn't NULL before we start trying to reference membervars/methods
2024-05-07 00:24:49 -05:00
Areloch da743d9dc4 Removed test enum values 2024-05-04 10:19:12 -05:00
Areloch b77911bdcd Exposes the SceneObjectTypeMasks as an enum type, allowing it to be utilized in inspectors.
Updated Trigger triggeredBy field to utilize new enum type for editing
Updated MaterialDefinition's animFlags field to utilize appropriate enum type for editing
Fixed image reference in bitmask inspectorField type to use correct image asset name
2024-05-04 09:56:04 -05:00
AzaezelX 3a7f3beb64 play steering thread on server so mounted objects like turrets can be linked to it 2024-05-02 21:01:16 -05:00
Brian Roberts 67b052a192
Merge pull request #1269 from Areloch/MultiObjectEditMadness
Adds handling for complex fields such as Point2, Point3 and Point4's to be able to apply value changes to only one axis across a multi-object set without affecting other axis'
2024-05-01 23:21:15 -05:00
Areloch 0d2aeac303 Cleaned up unneeded formatting values on the TypePointX field elements
Adds logic checks so we don't multi-apply edits from applyWord fields, causing redundant extra undo's
2024-05-01 21:58:18 -05:00
AzaezelX 1ea74bf8c6 enhanced argc reporting
in a method argc out of bounds scenario, report how many it got, and what range it expected
2024-05-01 18:20:14 -05:00
Areloch fdadfa5eea Adds handling for complex fields such as Point2, Point3 and Point4's to be able to apply value changes to only one axis across a multi-object set without affecting other axis' 2024-04-30 18:44:17 -05:00
marauder2k7 baa977eed8 missed change
missed explicit value
2024-04-27 23:40:35 +01:00
marauder2k7 8cf5fac497 Improved error printing torquescript
Added a vector that can lookback across x number of lines in a file, if not a file just print out the error.
2024-04-27 21:19:56 +01:00
marauder2k7 f82082f59f Merge remote-tracking branch 'upstream/development' into torquescript-errorPrinting 2024-04-27 07:02:52 +01:00
Brian Roberts 4e88c4c050
Merge pull request #1255 from marauder2k9-torque/torquescript-generateCompiler
TorqueScript Generate compiler
2024-04-27 00:44:35 -05:00
Sven ada83d9a6a
Remove redundant cstdint include 2024-04-25 18:10:26 +00:00
Sven ac56258c9f
Revert "Remove redundant include" 2024-04-25 18:09:54 +00:00
Sven 51be14645d
Remove redundant include 2024-04-25 19:58:50 +02:00
Sven ba5351180b
Add cstdint to ies_loader 2024-04-25 11:27:09 +00:00
Brian Roberts 29ba0439b7
Merge pull request #1260 from Azaezel/alpha41/dynamicReflectionRevisions
fix dynamicCubemaps on objects
2024-04-24 23:14:10 -05:00
Brian Roberts d464c450d5
Merge pull request #1259 from marauder2k9-torque/test-cubemap-mip-gen
Test PR for generating cubemap mips
2024-04-24 23:14:02 -05:00
marauder2k7 6966d20104 Error printing
now torquescript will print out a more modern error message with a pointer to the offending character.
Multi line error outputs to be added to this for context
2024-04-24 06:42:25 +01:00
marauder2k7 4f3a1f395c Merge remote-tracking branch 'upstream/development' into torquescript-generateCompiler 2024-04-20 06:21:05 +01:00
Areloch 51c1ab6b83 Adds a sanity check to SimObject's setFieldValue console method so if you pass in a blank field name it doesn't crash, instead asserting in debug, and logging the error in release 2024-04-19 00:00:37 -05:00
AzaezelX 824b9a9cd5 fix dynamicCubemaps on objects 2024-04-18 13:57:29 -05:00
marauder2k7 ce4d861658 Test PR for generating cubemap mips
note ibl skips prefilter step and prefilter just becomes the cubeRefl.getCubemap()

Generates cubemap mip levels after the bake correctly on DX side.
2024-04-18 07:56:52 +01:00
Brian Roberts e5aa6e4a95
Merge pull request #1258 from Azaezel/alpha41/probePoke
shift capturing from a globalMacro to a sceneRenderstate S32
2024-04-18 01:42:33 -05:00
AzaezelX fe26ffc375 shift capturing from a globalMacro to a sceneRenderstate S32
lets us ditch shader recompilation so that can be done on the fly without hitches, though does cost us a per-shader const for objects and postfx
2024-04-16 13:51:41 -05:00
Brian Roberts 848db69ef1
Merge pull request #1256 from Azaezel/alpha41/orphanOops
getPrefabByCHild should skip NULLs
2024-04-15 17:55:24 -05:00
AzaezelX f6419d9659 fix order of ops mangling useGroupCenter snapping 2024-04-15 15:33:06 -05:00
AzaezelX 785872d398 getPrefabByCHild should skip NULLs 2024-04-15 13:20:09 -05:00
marauder2k7 587f80da91 Update bison.bat
make it output the header file, this way the linkage should always work..... "should"
2024-04-15 00:33:04 +01:00
marauder2k7 77eec75bed Update astNodes.cpp
typo
2024-04-14 22:52:32 +01:00
marauder2k7 856d3bc901 fix for linux
linux case sensitivity
2024-04-14 22:47:55 +01:00
marauder2k7 83b3f01928 update bison flex
-Updated bison flex exe files to the latest windows version i could find
-Regenned the compiler..... alot of changes.....
2024-04-14 22:17:41 +01:00
marauder2k7 0954b081d0 GenerateCompiler
-ReAdded generateCompiler.bat
-Fixed paths in bat filse
-Fixed paths for includes
2024-04-14 07:08:17 +01:00
AzaezelX ce36e2cac6 typofix 2024-04-10 16:27:30 -05:00
AzaezelX 39e72cf2b6 ditch _snapfloat entirely in favor of just using the shared mRoundF 2024-04-10 15:56:44 -05:00
AzaezelX f52c1165b6 fix editor grid snap 2024-04-10 15:17:47 -05:00
AzaezelX 65fe0be037 use consistent clipping 2024-04-10 15:17:24 -05:00
AzaezelX f7ed077d82 round utility functions
add mRoundF to return nearest floating value to stepsize
2024-04-10 14:17:19 -05:00
Brian Roberts f0e7a27c16
Merge pull request #1249 from Azaezel/alpha41/refreshrevamp
hot editing tsstatics crashfix
2024-04-07 14:26:15 -05:00
AzaezelX 00bdc913b0 onAssetRefresh(); already chains. no need to call that again 2024-04-06 17:14:56 -05:00
AzaezelX 40d38cc1ec uneeeded 2024-04-06 16:48:02 -05:00
AzaezelX 5ff83138cf need to set state to ok post-load and pre-changesignal callback 2024-04-06 16:39:31 -05:00
AzaezelX 3ace31c68c crashfix work for hot-editing shape assets tied to tsstatics 2024-04-06 14:48:22 -05:00
marauder2k7 447cec6cdd Update guiInspectorTypes.cpp
fix rotation display
2024-04-02 01:48:37 +01:00
Brian Roberts cc6bf16d95
Merge pull request #1247 from Azaezel/alpha41/copyPasteCrunch
fix mangled copypaste
2024-03-30 18:51:16 -05:00
AzaezelX 01ff82cb72 fix mangled copypaste 2024-03-30 17:41:22 -05:00
marauder2k7 33094397c2 Update bitmapSTB.cpp
stb loader was spamming NO SOI with the function of stbi_info_from_memory because it checks for a jpeg first. This will always return an error if you are sending any other format. Remove this check and just load the memory stream. if it fails to return pixeldata then we have an error.
2024-03-27 07:32:59 +00:00
AzaezelX 2b73f93f38 fix position editor value flutter
a) it didn't like mixing the script input %g and %.7f
b) we should set the increment to POINT_EPSILON as that's our cutoff value for several calcs.
2024-03-26 14:29:20 -05:00
marauder2k7 ee9ac81281 Merge remote-tracking branch 'upstream/development' into change-to-use-libsndfile 2024-03-25 08:41:12 +00:00
Triston a2cdbebfa1 removes a use after freed in consoleInternal 2024-03-24 18:36:42 -05:00
marauder2k7 d08583bef1 Merge branch 'SFXResource-fix' into change-to-use-libsndfile 2024-03-24 15:56:01 +00:00
marauder2k7 352afa3f0f SFXResource multi read
SFXResource was always creating a new file for each sound resource. Sometimes this would happen 3 times since the asset was creating a resource, then the profile, then the object that was using it.

Now if the sfxResource exists and we call openStream it returns the sfxFileStream linked to that file instead of just creating a new one.
2024-03-24 15:39:58 +00:00
marauder2k7 6bc4ace2e5 Update sfxSndStream.cpp
fix for stereo files (2d sound files) frames report back as bytesPerSample * channels

which for us is bytesPerSample. This needs to be applied to the return from read so sfx resource knows we have read all the info.
2024-03-24 13:51:04 +00:00
marauder2k7 705b17ab57 Merge remote-tracking branch 'upstream/development' into change-to-use-libsndfile 2024-03-24 12:07:26 +00:00
marauder2k7 0342eb6f31 replace other classes
now all sfxFileStreams create a libsndfile stream class.

At the moment we only read as short
2024-03-24 12:06:03 +00:00
marauder2k7 147044796b sfxSndStream
Ogg file from libsndfile now working. we can pull more information from the format and specifics of the file from libsndfile should maybe look at updating all the parameters around mFormat so it feeds openal settings better.

Next step is to remove the other stream classes.
2024-03-24 11:33:42 +00:00
marauder2k7 3652367b36 sfxSndStream
read an ogg file through libsndfile instead of libvorbis.

There are still issues with this part of the file opens but doesn't read the whole file for some reason
2024-03-23 20:17:18 +00:00
marauder2k7 d1fcdcbea3 Merge remote-tracking branch 'upstream/development' into MACOSX-CompileFixes 2024-03-21 18:52:54 +00:00
marauder2k7 a745fc3757 Initial commit
added libraries:
opus
flac
libsndfile

updated:
libvorbis
libogg
openal

- Everything works as expected for now. Bare in mind libsndfile needed the check for whether or not it could find the xiph libraries removed in order for this to work.
2024-03-21 17:33:47 +00:00
Brian Roberts 05a083ca6f
Merge pull request #1234 from marauder2k9-torque/virtuals-override
Virtuals override
2024-03-21 10:43:26 -05:00
Brian Roberts 3fd352926b
Merge pull request #1238 from Azaezel/alpha41/dynamicfieldsCrashfix
crashfix for inpector dynamic field editing
2024-03-21 10:43:17 -05:00
marauder2k7 d44e475800 compile fixes and improvements
mac was failing to generate an archive.

Icons now in an app asset so it can be properly modified in the project instead of being a static .icns file.

Info.plist now gets its bundle name from the product bundle identifier field, this means it can be changed through the gui instead of having to manually modify the bundle identifier. All other settings are left blank.

Info.plist will need further updates to take values set in Xcode to make it easier to distribute apps.

OpenAL and SDL have to skip installation in release mode builds for the archive to be created correctly.
2024-03-21 10:45:31 +00:00
AzaezelX 8549c17a42 crashfix for inpector dynamic field editing 2024-03-20 14:32:09 -05:00
marauder2k7 f00d53f1d4 Revert "Update engineAPI.h"
This reverts commit a3742d26fb.
2024-03-19 22:32:25 +00:00
marauder2k7 a3742d26fb Update engineAPI.h
remove static inline and replace for static.

static inline is not C compliant.
2024-03-19 22:20:48 +00:00
marauder2k7 7874c0ae27 Merge remote-tracking branch 'upstream/development' into virtuals-override 2024-03-19 19:11:24 +00:00
AzaezelX 2e25059b27 fix inheritance conflict loop by declaring a singular root for class EngineObject : public StrongRefBase 2024-03-18 22:39:18 -05:00
AzaezelX c337d5a9d2 clang tidy misc fixes
adress mixed || plus && concerns raised
2024-03-18 20:11:44 -05:00
marauder2k7 8dc3163fae Update gfxNullDevice.cpp 2024-03-18 20:24:03 +00:00
marauder2k7 815832152d changes on macosx
mac picked up a couple of left over issues.
2024-03-18 19:58:47 +00:00
marauder2k7 7c7e3c8bf8 Update gfxNullDevice.cpp 2024-03-18 19:58:02 +00:00
marauder2k7 155696ba76 Update gfxNullDevice.cpp
ubuntu gcc crash on this function
2024-03-18 18:55:59 +00:00
marauder2k7 2b295fb7f0 rest of virtuals removed
virtuals removed and replaced with override where necessary on the rest of the code base, clang-tidy to the rescue.
2024-03-18 18:40:22 +00:00
marauder2k7 efbe5e90f5 virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
2024-03-18 18:13:00 +00:00
Brian Roberts 15971185ee
Merge pull request #1232 from Azaezel/alpha41/reloadredux
reload chain execution
2024-03-18 12:22:01 -05:00
AzaezelX bfc921da22 reload chain execution
for imageassets and materialassets, check any other assets using them, and uppon completion of reloading, kick off the using assets reload as well in serial
2024-03-17 21:30:19 -05:00
marauder2k7 e0c80ac909 fix for the fix because original fix did jack 2024-03-15 22:59:27 +00:00
marauder2k7 51624b7ce8 macosx changes
changes required to get masox to run.

Some further changes possible required around resourceHolder in future.

The geometry shader works in macosx with gl version 3.3, though i do think some changes are required internally to account for a lack of OUT_col%
2024-03-15 15:17:25 +00:00
marauder2k7 db97e8473a Update winPlatformCPUCount.cpp
fix pragma push/pop.
2024-03-14 15:14:01 +00:00
marauder2k7 11d8604d8e ogl device buffer creation
now ogl mirrors dx side with ubo creation and clearing pushed up to the device level.
2024-03-14 14:23:08 +00:00
marauder2k7 1e8841e6b5 pushed buffer creation up to the device level
now shaders ask the device to create a buffer, if a buffer of the same name and size already exist then a pointer to that buffer is returned instead. Going to see if something similar can be added to the opengl end.
2024-03-14 13:32:21 +00:00
marauder2k7 e46a7a7d47 re-download array object from development
re-download arrayObject from development so it doesn't show up as if there have been changes
2024-03-14 08:40:10 +00:00
marauder2k7 d7b68a97ee no idea why this was changed in a previous commit
how the fuck did this get changed!
2024-03-14 08:37:05 +00:00
marauder2k7 89843b541c Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor 2024-03-14 08:32:38 +00:00
marauder2k7 bd7bbd782c Revert "Merge branch 'development' into ShaderConstBuffer-CleanupRefactor"
This reverts commit ae11d996d9, reversing
changes made to e6c653c441.
2024-03-14 08:32:29 +00:00
marauder2k7 ae11d996d9 Merge branch 'development' into ShaderConstBuffer-CleanupRefactor 2024-03-14 08:28:29 +00:00