Commit graph

5366 commits

Author SHA1 Message Date
Brian Roberts
e2a2f26828
Merge pull request #717 from lukaspj/fix/improve-taml-xml-formatting-no-tampering
Improve tinyXml2 output formatting
2022-01-17 05:03:24 -06:00
Brian Roberts
33e3e41c8b
Merge pull request #718 from Areloch/SoundAssetFleshout
Sound Asset Fleshout
2022-01-03 20:58:55 -06:00
JeffR
15ef8b4fbe Cleaned up implementation of #712
Also updates other game classes like the shapebase to utilize the sound asset hooks properly.
2022-01-03 20:57:10 -06:00
Lukas Aldershaab
3ef57168b2 Cleanup fsTinyXml implementation 2022-01-03 21:16:34 +01:00
Lukas Aldershaab
5abd66dfa3 Split PrettyPrinting functionality from VFS printing 2022-01-03 21:10:26 +01:00
Lukas Aldershaab
165459c90b Improve tinyXml2 output formatting 2022-01-02 12:18:25 +01:00
Brian Roberts
3812ce2e82
Merge pull request #715 from Areloch/ConvexShapeSpawnFix
Fixes creation of convex shapes via editor
2021-12-25 17:11:08 -06:00
JeffR
cde1d68f78 Fixes handling in the generic creator function to deal with commands formatted with "return " at the start AND without
Fixes assignment of default material to convex shape when the toolbar button is pressed to create a 1u cube automatically.
2021-12-25 12:30:31 -06:00
Brian Roberts
c7342cc64f
Merge pull request #714 from Areloch/AssetPreviewUpdate
Updates the handling of the baking of shape asset previews
2021-12-24 17:34:42 -06:00
JeffR
b70faae38f Updates the handling of the baking of shape asset previews to generate them with support for view angle control to improve visibility, as well as supporting overriding of a material in the preview bake
Also utilizes the updated bake handling to have material asset previews render as a sphere shape asset, overriding with the material asset's material, improving distinction of what is a material asset vs image asset
Also updates the sphere preview mesh to be more generic and not only for reflection probes
2021-12-24 17:26:45 -06:00
Brian Roberts
d9bedbe31c
Merge pull request #711 from Azaezel/alpha40/audioWork
fix ServerPlaySound
2021-12-16 18:25:28 -06:00
AzaezelX
7c32abd026 fix ServerPlaySound 2021-12-16 18:25:14 -06:00
Brian Roberts
f88e82c099
Merge pull request #705 from Azaezel/alpha40/playSoundAugs
augments playSoundAsset
2021-12-16 01:46:51 -06:00
Brian Roberts
09cfeb08a9
Merge pull request #707 from Ragora/bugfix-macos-install-build
WIP: BugFix: Correct 'make install' not working on MacOS
2021-12-16 01:41:19 -06:00
Brian Roberts
8be84f872d
Merge pull request #709 from rextimmy/gl_anisotropy_fix
fix opengl device not returning the correct anisotropic value
2021-12-16 01:12:49 -06:00
rextimmy
e1398895b3 fix opengl device not returning the correct anisotropic value 2021-12-15 20:09:18 +10:00
Robert MacGregor
bd979aa5cf * Adjustment: Minor formatting fix in basics.cmake. 2021-12-14 22:23:23 -05:00
Robert MacGregor
2746dcfe48 Merge remote-tracking branch 'main/Preview4_0' into bugfix-macos-install-build 2021-12-14 22:19:31 -05:00
Robert MacGregor
d1dbfad0c7 * [MacOS] BugFix: Correct the MacOS executable not being output to the game directory when no build configuration is provided. 2021-12-14 22:06:47 -05:00
Brian Roberts
c7bf58c0a7
Merge pull request #708 from Ragora/bugfix-unix-include-paths
BugFix: Correct a windows-only pathing issue in terrMaterial
2021-12-14 18:47:27 -06:00
Robert MacGregor
deb994cb13 * BugFix: Correct a windows-only pathing issue in terrMaterial. 2021-12-14 19:44:44 -05:00
AzaezelX
a76613604a augments playSoundAsset
adds hooks to the garbage collector
exposes an (optional) position.
adds a ServerPlaySound + clientCMDPlaySound command pair to trip that for all clients
2021-12-13 20:36:50 -06:00
Brian Roberts
3c95fa808e
Merge pull request #704 from Areloch/TerrainSideProjectFix
A clean implementation of Lukas' Fix side projection #684 PR with Az's addendum fix rolled in
2021-12-13 16:30:16 -06:00
JeffR
434c6c26fe A clean implementation of Lukas' Fix side projection #684 PR with Az's addendum fix rolled in 2021-12-13 15:56:14 -06:00
Brian Roberts
1f4c488640
Merge pull request #703 from Ragora/bugfix-allocation-size-mismatch
BugFix: Fix a Windows ASAN reported allocation/deallocation mismatch error.
2021-12-13 07:35:59 -06:00
Robert MacGregor
cc45f9e9a4 * BugFix: Fix a Windows ASAN reported allocation mismatch error. 2021-12-13 00:04:24 -05:00
Brian Roberts
b0218d129c
Merge pull request #702 from Areloch/ImposterFix
Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely.
2021-12-10 03:39:58 -06:00
JeffR
a8b3d874a1 Fixes mapping of imposter images to be packed as part of the shape asset, and fixes paths to be formatted more sanely. 2021-12-10 00:01:26 -06:00
Brian Roberts
bd876e427a
Merge pull request #701 from JeffProgrammer/console-warn-void-fix
Fix console warning when calling void functions in console
2021-12-08 22:10:46 -06:00
Jeff Hutchinson
73b023a4b7 Fix console warning when calling void functions in console
Forgot to add this check when rewriting the interpreter.
2021-12-08 21:00:50 -05:00
Brian Roberts
0e06e2853e
Merge pull request #691 from Azaezel/alpha40/terrainTrickery
use internalname for terrain layers
2021-12-05 19:32:29 -06:00
Brian Roberts
07310d4d6d
Merge pull request #699 from Areloch/CoreInitCleanup
Cleans up some core execution behavior
2021-12-05 19:31:13 -06:00
Areloch
c6c2e9139f Cleans up some core execution behavior
Removes a duplicated material definition
Fixes up PostFX init'ing order so it inits before trying to load the prefs
Adds a skip of loading the CoreModule's materials so we don't double-execute any of them
Fixes a typo for the Vignette PostFX's name so it properly integrates
2021-12-05 11:00:02 -06:00
Brian Roberts
ce1fbe5f2c
Merge pull request #698 from Areloch/RemoveLibraryTabsFromEditors
Removes the Library tabs from the World and GUI editors to avoid confusion
2021-12-05 02:33:10 -06:00
Areloch
a30e9c6242 Removes the Library tabs from the World and GUI editors to avoid confusion. Adjusts the creation namespace from ECreatorWindow to a dummy object ObjectCreator to handle invoking for creation 2021-12-04 22:47:10 -06:00
Areloch
54fb5837ec
Merge pull request #696 from Ragora/bugfix-macos-compile
BugFix: Correct compilation for MacOS
2021-12-04 14:11:00 -06:00
Robert MacGregor
5fa7c62ba9 * BugFix: Don't use the register keyword in the console grammar files. 2021-12-03 20:33:02 -05:00
Robert MacGregor
58f6431ff0 * BugFix: Correct compilation for MacOS by explicitly specifying C++11 for all libraries and C++17 for the engine itself. 2021-12-03 16:37:22 -05:00
Brian Roberts
82b33b757a
Merge pull request #694 from rextimmy/cmake_cpp17
Minor cmake corrections
2021-12-02 15:19:10 -06:00
Brian Roberts
7f93734cb7
Merge pull request #692 from Azaezel/alpha40/thatsMetal
fix metal sound entry for playerdata
2021-12-02 15:18:46 -06:00
rextimmy
a0a3608c34 * Torque now requires c++17 due to new torque script code
* Minimum version of cmake is now beyond 3.6.0, no need to check for that when selecting VS_STARTUP_PROJECT
2021-12-02 20:40:15 +10:00
AzaezelX
de379f8b25 fix metal sound entry for playerdata 2021-11-30 18:19:58 -06:00
AzaezelX
1b282e0baf use internalname for terrain layers
stops bugs like spaces in filenames and the like from occuring due to pointing right at the diffuse flat file name, as well as corruption from using a different diffuse in the material later

(cherry picked from commit c1227dbdd0dd61c25970eeaac128c6cbe5d25947)
2021-11-29 13:54:13 -06:00
Brian Roberts
346a84d16c
Merge pull request #688 from Azaezel/alpha40/guibitmapbuttonColorModulation
adds colorization to GuiBitmapButtonCtrl
2021-11-28 12:49:18 -06:00
Brian Roberts
a7e804c7c3
Merge pull request #689 from Azaezel/alpha40/soundcleanups
cleanups for sound assets
2021-11-28 12:49:10 -06:00
Brian Roberts
7a67406159
Merge pull request #690 from Azaezel/alpha40/tsStaticTroubles
TSStatic::updateMaterials() crashfix
2021-11-28 12:49:01 -06:00
AzaezelX
663335e556 TSStatic::updateMaterials() crashfix 2021-11-27 14:29:30 -06:00
AzaezelX
93faa243ac cleanups for sound assets
removed redundant get<foo>Profile calls, correctly used a few in proxmine
2021-11-27 00:32:25 -06:00
AzaezelX
d074343b50 adds colorization to GuiBitmapButtonCtrl 2021-11-26 20:13:59 -06:00
Brian Roberts
3c30a905c3
Merge pull request #686 from Azaezel/alpha40/cmakeAugs
modular source work
2021-11-26 17:58:25 -06:00