TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-06 13:00:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6743 commits 5 branches 33 tags 958 MiB
Commit graph

6743 commits

This branch
This branch
All branches
Author SHA1 Message Date
marauder2k7 144e1bcc60 Update assimpShapeLoader.cpp 2024-02-10 04:25:48 +00:00
marauder2k7 26e1350234 Merge remote-tracking branch 'upstream/development' into AssimpLoaader-Fix 2024-02-10 02:56:56 +00:00
Brian Roberts 25a3c3325f
Merge pull request #1208 from jamesu/datachunker_refactor 
Datachunker & FrameAllocator refactor
 2024-02-09 20:32:39 -06:00
marauder2k7 7115d9bcc6 Update assimpShapeLoader.cpp 2024-02-09 22:12:52 +00:00
marauder2k7 37dd58dca4 Update assimpShapeLoader.cpp 
non destructive fixes for assimp loader
-this creates an ambient sequence if 1 does not exist.
-adds a bounds node if 1 does not exist.
 2024-02-09 22:06:11 +00:00
Brian Roberts 600a6b8ebc
Merge pull request #1192 from Areloch/EditorPopupEXFieldExpansion 
Usability improvements for editor fields utilizing popup menus
 2024-02-07 19:29:07 -06:00
Brian Roberts 142c6c9a28
Merge pull request #1209 from Azaezel/alpha41/simplifySoundSlots 
Alpha41/simplify sound slots
 2024-02-06 21:20:20 -06:00
James Urquhart 28ba2f2473 Fix gcc & clang Compile for FrameAllocator changes 2024-02-07 00:05:14 +00:00
AzaezelX c9ac4ffbfe correct grouping 2024-02-05 21:02:41 -06:00
James Urquhart 45898694e4 Reimplement FrameAllocator and FrameTemp; Tidy up DataChunker header. 
- Also additional work on tests to reflect watermark behavior change
 2024-02-06 02:35:16 +00:00
AzaezelX cea641b154 don't early out, *do* use case sensitive filename finding for the stringtable, and finally, don't even bother setting the mSoundpath here unless it's to clear it 2024-02-05 18:41:07 -06:00
James Urquhart 7332dd6643 Add tests for FrameAllocator and DataChunker 2024-02-05 22:53:09 +00:00
AzaezelX ef858d726b remindernote: false for unchanged, true for changed 2024-02-05 14:40:24 -06:00
AzaezelX da9b9ed787 prelim refactor 2024-02-05 14:23:11 -06:00
James Urquhart 3781c7fae5 Add an alternate allocator for DecalManager; Also fix SFX weirdness. 2024-02-04 23:27:31 +00:00
James Urquhart 915fac31b3 Basic refactoring WIP 2024-02-04 23:27:31 +00:00
Brian Roberts 36581246cd
Merge pull request #1206 from Areloch/MatAnimFlagsFix 
Ensures that material animation flags are cleared when values are changed so they don't "stick"
 2024-02-04 15:49:30 -06:00
Brian Roberts 3fd4cbdb89
Merge pull request #1207 from Areloch/ImageAssetArrayInspectorFix 
Fixes the handling of imageAssets for array'd field types, as well asfixing the editor behavior of guiBitmapCtrl so the imageAssets correctly update the fields upon editing
 2024-02-04 15:49:20 -06:00
Areloch 7ef4552196 Fixed category filtering logic for datablockField populateMenu 2024-02-04 15:25:35 -06:00
Areloch 138e426ed1 Ensures that material animation flags are cleared when values are changed so they don't "stick" 2024-02-04 14:58:26 -06:00
Areloch 1e21cc678f Fixes the handling of imageAssets for array'd field types, as well as fixing the editor behavior of guiBitmapCtrl so the imageAssets correctly update the fields upon editing 2024-02-04 14:45:19 -06:00
Brian Roberts ceec0dfb5b
Merge pull request #1205 from Areloch/ForcedArrayIndexInspector 
Adds ability to force the inspector to only show a set index of array'd fields.
 2024-02-04 11:27:50 -06:00
Areloch 4646d5eac3 Adds ability to force the inspector to only show a set index of array'd fields. Mostly for specific editor tool use(like editing material's individual layers/stages) 2024-02-04 00:21:54 -06:00
Brian Roberts 79e06af6dd
Merge pull request #1204 from Areloch/MLTextTypeOut 
Adds ability for MLTextCtrl to type the characters out over time
 2024-02-04 00:14:58 -06:00
Areloch 6de92264f6 Adds ability for MLTextCtrl to type the characters out over time 2024-02-04 00:13:33 -06:00
Brian Roberts 1ee85334b0
Merge pull request #1197 from Areloch/UpdateBaseUILoadingScreen 
Updates the loadingGUI to utilize the same panels for the background coloration that the other new menus use, rather than a bitmap.
 2024-02-04 00:12:01 -06:00
Brian Roberts ddd2522fa6
Merge pull request #1201 from Areloch/Particle_Material_InitPersistField_Reorg 
Updates the initPersistFields for ParticleData and Material
 2024-02-04 00:10:51 -06:00
Brian Roberts e68643c6ce
Merge pull request #1194 from Areloch/onClientMissionLoadedCallback 
Adds a callGamemodeFunction invoke for when the client is done loading the mission so the gamemode can do stuff once the player is done loading, but before fully connecting/spawning in
 2024-02-04 00:10:29 -06:00
Brian Roberts 4078a41f17
Merge pull request #1198 from Areloch/MiscBaseGameFixes_20240203 
Misc BaseGame fixes
 2024-02-04 00:10:09 -06:00
Brian Roberts f940360b96
Merge pull request #1199 from Azaezel/alpha41/sfxSafties 
sfx safeties
 2024-02-04 00:09:56 -06:00
Brian Roberts a253c8b48b
Merge pull request #1202 from Areloch/PlayerAnimationCallbackTweaks 
Tweaks to Player's animation callbacks
 2024-02-04 00:09:45 -06:00
Brian Roberts 1d906503b6
Merge pull request #1203 from Azaezel/alpha41/stringSpecification 
resolve ambiguity
 2024-02-04 00:09:11 -06:00
AzaezelX 67af2e0e0c resolve ambiguity 
clang + ninja via clion disliked a string assignment from a case that could feed a string either another string or a char *, soi used the latter acroiss the board
 2024-02-04 00:08:54 -06:00
Areloch af7b5cdb34 * Improved logic to better handle the callback kickoff for actionAnimations happening 
* Also adds animation name to callback so you can work off which animation triggered it
 2024-02-04 00:03:35 -06:00
Areloch b161e72e7f Updates the initPersistFields for ParticleData and Material to be properly organized with order and group to reflect how they're expected in the editors 2024-02-03 23:50:32 -06:00
Brian Roberts b31a5eafe2
Merge pull request #1200 from Areloch/MiscEngineFixes_20240203 
Misc Engine fixes and additions
 2024-02-03 23:45:09 -06:00
Areloch da06fc1d96 * Fixes description for a few Scene methods 
* Adds method to Scene to delete dynamic objects in the scene
* Add getNodeTransform to ShapeBase
* Add sanity check to AFX ea_update function to avoid divide by zero
* Adds ability to set color mul on GuiBitmapBorderCtrl like bitmapCtrl
* MatrixF utilty functions/operators
* Add ability to ignore an object in the containerBoxEmpty method call
* Adds some better initialization/sanity handling for resetWorldBox and resetRenderWorldBox for SceneObject
 2024-02-03 23:42:26 -06:00
Areloch 1bdaef9f82 * Ensures the HDRBloom pref is properly set as part of the default settings 
* Adds a few input names to the bitmap button lookup for the BaseUI logic
* Properly defaults the current menu index for the GameMenu gui
* Ensures that all editing actions for forest editor flag the editor/map as dirty for saving
* Ensures editor messageBoxes are properly focused on popping up
* Returns the newly created camera bookmark objects from their create functions
 2024-02-03 23:15:35 -06:00
AzaezelX c4b30b74fd clarify variable types. you want to pass assetIDs, not actual profiles 2024-02-03 22:39:21 -06:00
AzaezelX 846cec8dff hybridize suggested approaches with older code style, passing along either a matrix or a null. 
for network transmission purposes, send which along as a bool
 2024-02-03 22:35:41 -06:00
AzaezelX b12cd00b74 SFX and soundasset safeties and fixe 
adress several insatnaces of things like ServerPlay2D et al either not emitting sound at all, or doing so only at scene origin
 2024-02-03 20:16:45 -06:00
Areloch 303a107c29 Updates the loadingGUI to utilize the same panels for the background coloration that the other new menus use, rather than a bitmap. 2024-02-03 18:03:55 -06:00
Brian Roberts e630ab859a
Merge pull request #1196 from Azaezel/alpha41/makeitmakesense 
reformat the assertfatals for ghostids
 2024-02-03 17:41:09 -06:00
AzaezelX 66766006d3 reformat the assertfatals for ghostids 
both for legibility when source reading and popup utility
 2024-02-03 17:38:49 -06:00
Brian Roberts a673501330
Merge pull request #1195 from Areloch/oldECCodeCleanup 
Removes some old entity/component code from the level load process that isn't used anymore
 2024-02-03 17:31:11 -06:00
Areloch aa3d51c3cc Removes some old entity/component code from the level load process that isn't used anymore 2024-02-03 17:16:41 -06:00
Areloch b0b0cbfaef Adds a callGamemodeFunction invoke for when the client is done loading the mission so the gamemode can do stuff once the player is done loading, but before fully connecting/spawning in 2024-02-03 17:09:11 -06:00
Brian Roberts c92a88a852
Merge pull request #1193 from Areloch/EditorObjectSavingCallback 
Adds a callback invoke for objects in the scene to inform them if the level is being saved
 2024-02-03 16:27:35 -06:00
Areloch 9c643a69cf Adds a callback invoke for objects in the scene to inform them if the level is being saved. Allows for certain special actions, like having objects reset to an original position before the save occurs. 2024-02-03 16:24:12 -06:00
Areloch d952722811 Updates the field types used in the editor to utilize the GuiPopUpMenuCtrlEx to make them support categories and be able to search filter them 
Updates the dataBlock field type to properly present categorized listings
Expands the datablock Field to have an edit and add buttons on the field to make the workflow simpler
Adds utility functions to GuiPopUpMenuCtrlEx to control indentation, categories and searchability
Expands datablock editor functionality to be able to create a datablock of a type to pre-set the inheritFrom param of the process early(used for the add new button on DB fields to carry-through the current DB to the creation process of a derivative)
 2024-02-03 16:10:28 -06:00