Commit graph

298 commits

Author SHA1 Message Date
JeffR c7763fe3ec Added cleanup of exec stack for module when it's finished to avoid duplicate executions
Added proper container bracketing for the main menu buttons and made that the main navigation target
Added logic to UINav to prevent needlessly re-setting the root page if it already is the root page, which would break the navigation stack
Added logic to UINav toprevent needlessly adding duplicate pages whicn would break the navigation stack
Added logic to close the chooseLevelDlg page when the level is loaded to avoid the page being left hanging on the nav stack
Fixed assetId for no preview image fallback on the chooseLevelDlg page
Fixed display of icons in the shape editor shape helper section
Fixed name lookup on terrain material editor dialogue which would break saving of terrain materials
Disables TORQUE_SFX_DirectX which is currently not in use and nonfunctional
2022-06-02 20:17:23 -05:00
Brian Roberts fea5f325ea
Merge pull request #777 from Azaezel/alpha40/assimp523
update assimp to 5.2.3 Bugfix-Release
2022-05-06 17:10:51 -05:00
AzaezelX 82e608f990 add workaround logic for configuration file generation 2022-04-26 16:03:00 -05:00
AzaezelX bd1bbdc258 correct mac compilation
SDL now leverages https://cmake.org/cmake/help/v3.10/command/enable_language.html
2022-04-25 13:28:32 -05:00
Robert MacGregor bd979aa5cf * Adjustment: Minor formatting fix in basics.cmake. 2021-12-14 22:23:23 -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
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
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 490b8271e8 fix erroneous clipout 2021-11-25 19:51:34 -06:00
AzaezelX 583014de60 fix erroneous clipout 2021-11-25 19:49:56 -06:00
AzaezelX 1816b3ca0c modular source work
from @marauder2k7:
augments the modular inclusion of sourcefiles via confining it to /source/ directories only to prevent strays.
additionally, adds a /lib/ filter for full on library inclusion
2021-11-25 19:39:44 -06:00
Robert MacGregor ba7082bea1 * BugFix: Correct the inability to build on MacOS due to differing target names on MacOS. 2021-11-23 10:32:49 -05:00
rextimmy d58cf398a9 make use of folder properties in cmake 2021-11-22 12:30:08 +10:00
Robert MacGregor 247b12e795 * BugFix: Correct many include paths and build platformX11 on non-Apple Unix. 2021-11-14 14:45:42 -05:00
Jeff Hutchinson 3fdd7266e3 Better Architecture detection strategy if compiling on Apple Silicon 2021-11-06 22:56:05 -04:00
Robert MacGregor 6f617cace8 * BugFix: Correct compiler warnings induced by adding -msse to the compiler commandline on non-x86 devices. 2021-11-01 09:01:00 -04:00
Robert MacGregor 6b56210a47 * Feature: Properly detect ARM32/ARM64 in the CMake build process and enable ARM NEON when either of these are detected. 2021-10-27 17:30:43 -04:00
Jeff Hutchinson 98657bde7a
Merge pull request #621 from Ragora/bugfix-lpng-warnings
update lpng
2021-10-13 18:29:06 -04:00
Robert MacGregor 9d9db307c7 * [Build] BugFix: Correct CMake errors on Windows. 2021-10-13 17:10:47 -04:00
Brian Roberts ba9debf89f
Merge pull request #617 from Ragora/adjustment-unix-case-insensitivity
Adjustment: POSIX Case Insensitivty
2021-10-13 13:12:29 -05:00
Robert MacGregor c0ff69a2e6 * [CMake] BugFix: Remove a forgotten debug message. 2021-10-12 18:44:32 -04:00
Robert MacGregor c965429cf6 * [lpng] BugFix: Corrections to allow the SSE intrinsics to build properly. 2021-10-12 17:38:27 -04:00
Robert MacGregor 7a78ec46c8 * [lpng] BugFix: Correct some compiler warnings associated with lpng and SSE optimizations. This also enables SSE when available for lpng. 2021-10-12 17:20:23 -04:00
Robert MacGregor ca5e706ab4 * [CMake] BugFix: Clear several CMake warnings. 2021-10-12 13:19:28 -04:00
Robert MacGregor 66cfd34b71 * [CMake] BugFix: Correctly set the description and default values of TORQUE_POSIX_PATH_CASE_INSENSITIVE and TORQUE_ZIP_PATH_CASE_INSENSITIVE. 2021-10-12 13:09:12 -04:00
Robert MacGregor 8d0128698a * [ZIPVolume] BugFix: Add the capability of resolving ZIP prefix paths with case insensitivity and a CMake option to control this behavior. 2021-10-11 19:02:58 -04:00
Robert MacGregor 497a94f884 * Adjustment: Cleanups to the case insensitivity code for POSIX systems and add case insensitivty to directory dumping code. 2021-10-11 10:24:24 -04:00
Jeff Hutchinson 41bd5ef6b6 remove FMODex from Torque3D
The current version of FMod in Torque3D uses the legacy ex plugin, which hasn't been around for a long time.
2021-09-11 16:29:32 -04:00
AzaezelX 3fad050028 Merge branch 'Preview4_0' into EngineAssetify_Followups 2021-07-28 13:51:44 -05:00
Brian Roberts 4e05c780a4
Merge pull request #506 from Azaezel/alpha40/stupidTypoTricks
adress #504 - typo leading to broken $origin reference
2021-07-28 13:31:27 -05:00
AzaezelX 3db777b0a0 adress #504 - typo leading to broken $origin reference 2021-07-19 09:41:31 -05:00
Areloch 5525f8ecdd Converts all game, gui editor, and system classes to utilize assets
Processed core, tools and default modules to utilize assets
Converted all console types that were string based, such as TypeImageFilename to utilize const char*/the string table, which avoids a lot of type swapping shenanigans and avoids string corruption
Removed unneeded MainEditor mockup module
Removed some unused/duplicate image assets from the tools
2021-07-19 01:07:08 -05:00
Areloch 83b0432283
Merge pull request #489 from Azaezel/alpha40/zipPassPunt
expose a zip file password cmake config option
2021-07-17 11:03:26 -05:00
Areloch 4d40e3cab5
Merge pull request #449 from OTHGMars/Zip_Test2
Loading from zipped game directories.
2021-07-17 11:03:19 -05:00
OTHGMars 86c302c42e Prevents overwriting existing .torsion files. 2021-06-22 06:11:01 -04:00
OTHGMars 11c258fcdb Script extension assignment.
Sets extension on installed script files.
Enables .torsion file to be reconfigured after extension change.
Prevents copy of main.tscript.in.
2021-06-22 00:48:53 -04:00
AzaezelX a34aea55f7 expose a zip file password cmake config option 2021-06-02 16:08:51 -05:00
Brian Roberts 89e76f96de
Merge pull request #477 from Areloch/torsiontscriptcompliance
Updates the torsion.in file to properly be configured to handle tscript extension
2021-05-13 23:03:09 -05:00
Areloch 438788c9b3 Rolled in Az's suggested fixes 2021-05-13 19:30:53 -05:00
Jeff Hutchinson 61fef8080b mend 2021-05-10 19:58:51 -04:00
Jeff Hutchinson ef34210fef Implement Unit Test Suite for TorqueScript. 2021-04-12 21:43:57 -04:00
Areloch 9a0de40505 Updates the torsion.in file to properly be configured to handle tscript extension 2021-03-13 23:47:18 -06:00
AzaezelX 3603188b7f update openal-soft
sync point: master-ac5d40e40a0155351fe1be4aab30017b6a13a859
2021-01-26 13:01:35 -06:00
Lukas Aldershaab 9ccaa6d3ea Improve handling of non-default script filenames 2021-01-19 21:32:31 +01:00
Lukas Aldershaab 099dd4f1f3 Parametrize script extension, default to 'tscript' 2021-01-19 21:32:31 +01:00
OTHGMars c77be80220 Zip usage notes and defines. 2021-01-11 05:04:36 -05:00
Joseph fe9dc1e25b Help from Az finally gave the correct answer to the problem I was trying to address originally, so really this fix is from Az.
Exposes the directory for where your game files go in cmake without having to go to Advanced tab.
2021-01-10 21:48:46 +00:00
Joseph 4c781ce5c6 Enables support for having your project directory different to your Torque engine directory. 2021-01-08 20:59:35 +00:00
Brian Roberts a0ba345095
Merge pull request #432 from Azaezel/alpha40/sdlwebGeneralization
sdl usage standards proposal 3
2021-01-02 11:09:52 -06:00
AzaezelX 254ac462b5 sdl usage standards proposal 3:
again maintains fallbacks for folks that just don't want to use the lib (though if we do want to go that route, we'll likely want to re-review a few commits and put fallbacks, well, *back* at some point)
includes sdl in torqueconfig.h if in use to kill duplication.
adds a generic sdlPlatform.cpp for general methods, oneliners, and the like
2020-12-31 14:44:39 -06:00