Commit graph

7155 commits

Author SHA1 Message Date
JeffR 10d1aeca1f Shift tracking of dynamicObjects from strict child objects for Scenes, to tracking the objects but keeping them in the Cleanup Group to fix prefab loading behavior
Shifted to utilizing SimGroupInterator and persistenceManager to fix saving issues with SubScenes
Shifted to utilizing SimGroupIterator for Scene saving to standardize and minimize object misses
Changed prefab load file logic to add loaded child simgroup to rootscene for consistent tracking and avoiding conflicts with subScene's hijacking the ImmediateGroup var
Reduced duplication of build<type>field callback for inspectors
Added more standard field type lookups to inspector group when creating a field to avoid misses for types like 'F32' or similar.
Folded the added-on MinSize/MaxSize/SimgroupSelect fields for SimGroup editing into a single compound field and fixed bugs with it's behavior so it works as expected now
2024-10-27 20:04:13 -05:00
JeffR 484ece3d28 adds loadIf conditional eval, onLoad/UnloadCommands, ability to freeze loading state and per-subscene ticking for conditional checks
Fixes for child iteration of subscenes
Renamed tripCondition field in triggers to tripIf for consistency/naming clarity
Added ability for callbacks for gamemode to have reference on which subscene was loaded/unloaded for respective callback
2024-10-21 00:08:07 -05:00
JeffR dde0ffe32f Merge branch 'SubScenes_Gamemode_PR' of https://github.com/Areloch/Torque3D into development 2024-10-20 11:14:52 -05:00
Areloch 43501127ec
Merge pull request #1327 from Azaezel/alpha41/matrixMangle
fix(?) assimp to torquie matrix converter
2024-10-04 16:25:01 -05:00
JeffR 020bd03cf9 Adds logic so levels without a gamemode defined at all are treated as wildcarded to any given gamemode selected 2024-10-04 00:22:12 -05:00
JeffR e4d07c7e8d Adds utility function and method to be able to enact a load of subscenes at a specific world position
Adds loadIf conditional logic to evaluate if a subscene is 'allowed' to load when tested
Adds isAlwaysActive to GameMode to be able to flag a gamemode as being defaulted to on and used automatically
Updated GetGameModesList function to return an arrayObject of the gamemodes found
Overhauled CallGameModeFunction to utilize the gamemodes list with active/alwaysActive modes being called against, rather than level-scanning
Updated ChooseLevelMenu to be able to toggle on/off multiple gamemodes with an image indicator if it's active or not
2024-10-04 00:10:26 -05:00
AzaezelX bb432dc906 fix(?) assimp to torquie matrix converter
it wasn't accounting for the formatScaleFactor (1, 0.01, ect) leading to mesh deformations based on bone vs skinned mesh displacement
2024-09-30 22:39:00 -05:00
Brian Roberts 5f6fe212a7
Merge pull request #1326 from Azaezel/alpha41/forestfix
fix forest editor failing to pop up a create new
2024-09-30 20:25:20 -05:00
AzaezelX 99bcf7ca3e fix forest editor failing to pop up a create new
reminder note for if switches in c++, it it fails once in an or evaluation, that's it. it does not try other portions
2024-09-30 19:45:32 -05:00
JeffR 20a01d9f02 Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into SubScenes_Gamemode_PR 2024-09-28 22:11:39 -05:00
Brian Roberts 00e5482733
Merge pull request #1323 from Eikelenboom/development
Add extra increased font size to Windowed Console
2024-09-24 18:32:42 -05:00
Nils Eikelenboom 8f2dbd5e2f Add extra increased font size to Windowed Console
Added extra large font to the windowed console.  Use the [-A]  [A+] buttons to change the size.

Preferably would introduce "lineSpacing"  to the GuiConsole object for improved readability; as well to store this into the prefs.
2024-09-24 21:43:01 +02:00
Brian Roberts b6efb96191
Merge pull request #1322 from Eikelenboom/development
Windowed Console button close / open / resize
2024-09-24 14:13:56 -05:00
Nils Eikelenboom 02b86eafee Windowed Console button close / open / resize
- Close the windowed console when it's opened and the button is hit.
- Resize/reposition the window after reopening.
- Add a button to the GUI editor.
2024-09-24 20:52:41 +02:00
Brian Roberts 5c83972155
Merge pull request #1321 from Azaezel/alpha41/ABbits
asset browser spam kill
2024-09-23 12:23:02 -05:00
AzaezelX 8461b9dbfd asset browser spam kill
don't report populating preview images if the count is 0
also, remmber to cancel a pending scheduled method if you're rescheduling it
2024-09-23 08:59:36 -05:00
Brian Roberts fe3e47309d
Merge pull request #1319 from Eikelenboom/development
Remove tabs from asset broser & windowed console
2024-09-23 08:34:45 -05:00
Brian Roberts a132d73595
Merge pull request #1320 from Azaezel/alpha41/snapsync
snap syncing
2024-09-23 08:34:34 -05:00
AzaezelX 7664b63071 snap syncing
for world and convex shape editors
2024-09-22 14:34:07 -05:00
Nils Eikelenboom 0291b000e0 Remove tabs from asset broser and win. console
Remove the tabs from the asset browser and windowed console. There were some issues and asset browser will be changed soon. Downside is that the windowed console and asset browser will now open on top of each other.
2024-09-22 19:36:48 +02:00
Brian Roberts f8212ec6b7
Merge pull request #1318 from Azaezel/alpha41/typofix2
typofix
2024-09-22 05:56:12 -05:00
AzaezelX 3fe21e8808 typofix 2024-09-22 05:55:38 -05:00
Brian Roberts e9638d285f
Merge pull request #1317 from Azaezel/alpha41/ohSnap
preserve gridsnap state between runs
2024-09-17 10:24:14 -05:00
Brian Roberts e7585f15ab
Merge pull request #1316 from Azaezel/alpha41/colorPickerCleanups
colorpicker cleanups
2024-09-17 10:24:03 -05:00
Brian Roberts d2c8b661aa
Merge pull request #1315 from Azaezel/alpha41/bitmapmangle
fix malformed GBitmap::getColor
2024-09-17 10:23:53 -05:00
AzaezelX 0612d8508d preserve gridsnap state between runs 2024-09-16 13:52:11 -05:00
AzaezelX ead06b845e colorpicker cleanups
largely focuses on removing extraneous code and mangled math
2024-09-16 13:24:41 -05:00
AzaezelX afeb957601 fix malformed GBitmap::getColor 2024-09-16 12:40:18 -05:00
Brian Roberts 9712a8b1c9
Merge pull request #1314 from Eikelenboom/development
Sanitize the GUI window resizing scripts
2024-09-16 11:35:36 -05:00
Nils Eikelenboom 491f2e8bac Sanitize the window resizing scripts
Instead of magic numbers using a variable with comment so it's clear what is does.
2024-09-13 20:14:43 +02:00
Areloch 0c54a787dc
Merge pull request #1313 from Eikelenboom/development
World Editor GUI adjustments & corrections
2024-09-12 22:01:05 -05:00
Nils Eikelenboom ce8a10ba0a Correct Color Picker GUI text & text edit controls
Some text was black on dark which is hard to read. Due to use of non-existing or incorrect profiles. Title is also updated to be visually in line with the rest of the world editor.
2024-09-12 21:27:23 +02:00
Nils Eikelenboom 7031424214 Undo changes to the default level
Sorry that got snuck in there
2024-09-12 20:22:59 +02:00
Nils Eikelenboom dffb557930 Adjusting window titles to fit properly
Because of the large width & height of the Arial font at 18 did the window titles not fit properly. Font has been decreased and made bold for the sake of distinction. Additional has the terrainpainter window's position been corrected (terrainEditor.ed.tscript)
2024-09-12 18:16:25 +02:00
Nils Eikelenboom f38352501d Correct undefined background Main Tab
Correct the background of the world editor main tab with a (new) solid fill. Sometimes it appeared as black, magenta or the just the scene itself. Color is fixed for now as it is a unique situation regarding the use of tabs here.
2024-09-10 22:07:02 +02:00
Nils Eikelenboom 8b049e3b01 Correct positioning sidepanels
Sidepanels of the world editors got shifted due to the introduction of the editor tab. Several corrected overall. Some minor tweaks to be expected in a later commit.
2024-09-10 20:39:54 +02:00
Nils Eikelenboom b0a11d79d5 Remove space below/above toolbars
Remove the (thin) space between the world editor toolbars.
2024-09-10 13:20:11 +02:00
Areloch a931e9a308 Tweaks the Scene and SubScene save calls to handle simGroups to call onto their children 2024-09-05 13:49:13 -05:00
Areloch 6ff92f61bb Fixed SceneGroup onInspect call to call up through parent
Adds utility methods and SimGroup onInspect injection to add a select button in inspector to select objects under simgroup
2024-09-03 18:25:28 -05:00
Areloch 4bb26bf96c Reorganized the exec's for datablocks in module template file to be within the start/stop blocks
Tweaked example module script file to comply
Moved ExampleGameMode script file to scripts/shared since client and server need access to the gamemode for logic to work
2024-09-01 23:26:10 -05:00
Areloch d7335a73e4 Removed dummy placeholder function stub 2024-09-01 17:59:24 -05:00
Brian Roberts d82a78ec3a
Merge pull request #1312 from Areloch/Torque_Tools_Ext_cmakeFlag
Adds a TORQUE_TOOLS_EXT cmake flag/preprocessor
2024-09-01 17:38:29 -05:00
Areloch d896a2b99a Removed scan-down of subscenes from Scene's getObjectsByClass call
Properly returned value for SubScene::save()
2024-09-01 17:14:08 -05:00
Areloch 03efedab37 Adds a TORQUE_TOOLS_EXT cmake flag/preprocessor and moves the systemCommand method into that so that one can lock down full shell command execution calls without dropping tools support 2024-09-01 16:55:58 -05:00
Areloch ae8eca48e1 Implementation of Subscenes, SceneGroups and Gamemodes
Standardizes Gamemodes to be an actual class with data and utility functions that can be parsed
Adds inspector field handling for selecting gamemodes
Updated Scene class to work with Gamemodes for the gamemode field
Updates editor suite elements to be able to create SubScenes, SceneGroups and Gamemodes
Adds ability to convert SimGroup to SubScene
Updates BaseUI's chooselevel menu to have gamemode selection and filters shown levels based on selected gamemode
2024-09-01 16:39:00 -05:00
Brian Roberts 2dbfc16cf9
Merge pull request #1309 from Azaezel/alpha41/ICeeUuu
clean up surface property visualizer
2024-08-30 05:59:23 -05:00
AzaezelX 9da7823074 clean up surface property visualizer
stateblock cleanups, and kill off stray glowbuffer leftovers
2024-08-29 19:17:24 -05:00
Brian Roberts bb81b687eb
Merge pull request #1308 from Azaezel/alpha41/loglunk2
(backup) correct malformed error reporting
2024-08-28 17:23:08 -05:00
AzaezelX 30dcf0bf78 (backup) correct malformed error reporting 2024-08-28 17:22:44 -05:00
Brian Roberts 5d4925bec7
Merge pull request #1273 from Azaezel/alpha41/steeringSupport
play steering thread on server so mounted objects like turrets can be…
2024-08-28 17:15:28 -05:00