Commit graph

6498 commits

Author SHA1 Message Date
marauder2k7
dbb6359d80 Update CMakeLists.txt
add remaining torque requirements
2023-10-22 00:56:57 +01:00
marauder2k7
be3d26d9e6 SDL_FILESYSTEM
-Set the base dir based on build type
-enable only building active arch on debug
2023-10-22 00:47:14 +01:00
marauder2k7
2b2ce0229c Merge remote-tracking branch 'upstream/development' into AppleToolchainTest 2023-10-22 00:19:52 +01:00
marauder2k7
54959f0d19
SFXEmitter play pause and stop buttons (#1115)
-Add buttons to the inspector for SFXEmitter that will play pause and stop the sfxEmitter.
NOTE: Purely effects the state of the emitter when in the editor this will not effect sfxEmitter functionality in a level.
2023-10-21 18:09:19 -05:00
marauder2k7
852ed8f225
Sfx playlist asset working (#1109)
* GroundWork

-Reverted SFXPlaylist since it is going to be made from an asset now instead.
-Added extra options to soundAssets description.
-SFXPlaylist may need an onAdd function

* Update sfxController.cpp

* SFXPlaylist data

-Added sfxPlaylist init persist fields for the slots to sound asset
-Added logic to fil sfxPlaylist if more than 1 slot is filled

* Update SoundAsset.cpp

to stop git ci complaining, assetImporter........

* Update SoundAsset.h

* sfxPlaylist

-Fix: incomplete type error
-Added onAdd and onRemove to playlist
-SoundAsset getProfile define now returns playlist if the asset is a playlist.

* Update SoundAsset.h

-updated asset array to return playlist or profile depending on what the asset is

* SFXPlaylist working

-SFXPlaylist works
AudioChannelDefault gets its volume set to 0 for some reason and was throwing off making sfxPlaylist inaudible.

Still an exception when closing if using a playlist trips on line 355 of sfxSound

* Update sfxSound.h

* setSoundFile index null fix

* Update SoundAsset.h

* Update SoundAsset.h

* netstream safety in case of a null asset assignment

* Update sfxController.cpp

added safeties around a null playlist trying to play.

* Update with Az's asset err code changes

---------

Co-authored-by: AzaezelX <quillus@hotmail.com>
2023-10-21 17:19:02 -05:00
marauder2k7
aebcf3fc87 Merge remote-tracking branch 'upstream/development' into AppleToolchainTest 2023-10-21 21:24:27 +01:00
Brian Roberts
845defb25d
Merge pull request #1116 from Azaezel/alpha41/previewPoke
generateCachedPreviewImage needs loadShape()
2023-10-21 15:16:05 -05:00
AzaezelX
e6c2fe78fb generateCachedPreviewImage needs loadShape() 2023-10-21 15:15:27 -05:00
Brian Roberts
a8194fdf3a
Merge pull request #1114 from Azaezel/alpha41/assetAnalysisAugs
asset load flow work
2023-10-21 01:37:38 -05:00
marauder2k7
acf3177021 Revert "example cmake workflow"
This reverts commit 233c6a8045.
2023-10-21 07:08:12 +01:00
marauder2k7
233c6a8045 example cmake workflow 2023-10-21 01:50:31 +01:00
Brian Roberts
58403bc9e5
Merge pull request #1113 from Areloch/TamlPrefixedArrayFields
Adjusts the logic for when creating a simObject from a taml to handle array'd prefix field's values
2023-10-20 18:44:14 -05:00
JeffR
92743f6fd8 Adjusts the logic for when creating a simObject from a taml so that array elements(like material slots or sound asset slots) properly can handle prefixed field values, such as referencing loose asset files. 2023-10-20 17:51:49 -05:00
marauder2k7
1e824bfa99 Merge remote-tracking branch 'upstream/development' into AppleToolchainTest 2023-10-20 22:34:34 +01:00
marauder2k7
8b7e318fd5 multiplatform fixes
-Wrap macosconfig in if(apple)
2023-10-20 22:33:20 +01:00
marauder2k7
9bc06f0887 main dir
SDL_BaseDir was returning the directory that contains the app, now it returns the resources directory
2023-10-20 22:23:38 +01:00
marauder2k7
f10520e751 Macosx build with rpath
Archiving builds no longer have linking errors when run
2023-10-20 21:06:53 +01:00
marauder2k7
b6617b1b0f Working multi-arch archiving
-Working multi arch compile
-Required assets now copy to the app bundle
TODO: Make the logic to wrap around whether its multi arch
-The changes in torqumacosconfigs.cmake are not required if we are only building one architecture, also if it is x86_64 we can drop min deployment target to 10.13
2023-10-20 12:04:56 +01:00
marauder2k7
e381bf4838 Working archive
-Archive now working if we override the shared libs rpath with the correct installation path
2023-10-20 00:19:40 +01:00
Brian Roberts
0db209e3dc
Merge pull request #1110 from Bloodknight/UpdateSDL
Update SDL to 2.28.4
2023-10-19 11:26:35 -05:00
marauder2k7
b6c9bef48f revert nativeFile
-NativeFileDialog m file was not being set to obj-c, now we force it withe set_source_files_properties.
2023-10-19 16:29:04 +01:00
marauder2k7
8c4650d5dc NativeFileDialogs
-Needed to change nfd_cocoa to an objc++ file with mm extension
2023-10-19 15:47:16 +01:00
marauder2k7
0af0b5a24a MACOS working
Mac working in this stage
2023-10-19 14:39:22 +01:00
marauder2k7
a200554496 more changes
-Apple = more trouble than its worth
2023-10-19 11:45:25 +01:00
marauder2k7
c11587cad3 Attempt 2
-Missing includes may be due to no parent_scope
2023-10-19 11:04:16 +01:00
marauder2k7
ac60ce8da7 Update apple.toolchain.cmake 2023-10-19 09:58:55 +01:00
marauder2k7
1b49f28d19 move all setup to toolchain
-All apple config in toolchain
2023-10-19 08:57:24 +01:00
marauder2k7
e6c387c67a Update apple.toolchain.cmake 2023-10-19 08:29:27 +01:00
marauder2k7
13af296bf8 initial toolchain
-test of an initial toolchain setup for macosx builds
2023-10-19 08:08:50 +01:00
Brian Roberts
2a27addf08
Merge pull request #1112 from Areloch/AssetPropertiesSaveFix
Fixes the handling of the temp editable asset definition in the asset properties inspector so it'll save sub-objects as expected
2023-10-18 17:55:06 -05:00
Areloch
8232d0f6dd Fixes the handling of the temp editable asset definition in the asset properties inspector so it'll save sub-objects as expected 2023-10-18 11:37:27 -05:00
Brian Roberts
a16715f673
Merge pull request #1111 from Azaezel/alpha41/cmakeCleanups3
remove bad example template
2023-10-17 19:05:43 -05:00
AzaezelX
76477a6e78 remove bad example template 2023-10-17 11:04:06 -05:00
Bloodknight
6a4f399031 typofix 2023-10-16 17:27:01 +01:00
Bloodknight
618590e1d0 Add config to advanced 2023-10-16 17:23:29 +01:00
Bloodknight
402f7aff99 Update SDL to 2.28.4 2023-10-16 16:51:30 +01:00
AzaezelX
4fb67ed618 refactor by request 2023-10-15 16:09:49 -05:00
AzaezelX
3bdce1f33e lower engine requirements back to c++17 standards, not c++20. 2023-10-15 16:09:49 -05:00
marauder2k7
e6ead9f268 Update console.cpp 2023-10-15 15:14:58 -05:00
marauder2k7
09b1e9783a Mem fix
-Data chunker was leaking, (my bad) fixed

-Added != operator to scene container for std:c++17 conformance.
2023-10-15 15:14:58 -05:00
AzaezelX
4b2e3aac43 typofix 2023-10-14 23:02:55 -05:00
AzaezelX
b278802645 cmake cleanups
new global defines: TORQUE_LIB_ROOT_DIRECTORY and TORQUE_LIB_TARG_DIRECTORY for source location and target to build static libs, respectively
reassign location back to torqueConfig.h, torque.rc, and Info.plist to  "${TORQUE_APP_ROOT_DIRECTORY}/source/ aka \My Projects\<apname>\source by request
2023-10-14 23:02:55 -05:00
AzaezelX
a8d640e311 clean up redundant loads, shift first load to getResource methods for sound and shape.
still need to properly sort image
2023-10-09 14:41:14 -05:00
Lukas Aldershaab
a5e75dfd61 Make sure TORQUE_TARGET_PROPERTIES is populated before using it 2023-10-08 17:36:51 -05:00
Lukas Aldershaab
df8041e689 Add support for replacing the main.tscript file with a specified Console Function 2023-10-08 17:36:51 -05:00
Lukas Aldershaab
bcea9bfc3a Support setting target properties and link options from modules 2023-10-08 17:36:51 -05:00
Lukas Aldershaab
87c6884433 Expose SimObjectPtr C-API functions using EngineAPI 2023-10-08 17:36:51 -05:00
Lukas Aldershaab
8748a2cac8 Expose some information in EngineFunction exports for better interop capabilities 2023-10-08 17:36:51 -05:00
Lukas Aldershaab
ee93dc3b57 Ensure that getGlobalScope always returns the same object 2023-10-08 17:36:51 -05:00
Lukas Aldershaab
2c9f6a5350 Remove EngineXMLExport filtering 2023-10-08 17:36:51 -05:00