Commit graph

996 commits

Author SHA1 Message Date
Brian Roberts
2aeebbe4c4
Merge pull request #1244 from Azaezel/alpha41/serverGroupFix
fix serverGroup not being created
2024-03-24 22:07:55 -05:00
AzaezelX
563912c181 fix serverGroup not being created 2024-03-24 19:44:44 -05:00
marauder2k7
fc8a281113 Update WorldEditorInspectorWindow.ed.gui
Scroll bar was extending beyond its parents extent making it render incorrectly.
2024-03-20 19:01:08 +00:00
Areloch
b1f71bab74 Adds handling for the keyboard remap page of the options menu to be able to present a bind with a modifier key 2024-03-19 23:05:03 -05:00
marauder2k7
51624b7ce8 macosx changes
changes required to get masox to run.

Some further changes possible required around resourceHolder in future.

The geometry shader works in macosx with gl version 3.3, though i do think some changes are required internally to account for a lack of OUT_col%
2024-03-15 15:17:25 +00:00
marauder2k7
a7dabae88a Update helperFunctions.tscript 2024-03-14 11:30:52 +00:00
marauder2k7
bd7bbd782c Revert "Merge branch 'development' into ShaderConstBuffer-CleanupRefactor"
This reverts commit ae11d996d9, reversing
changes made to e6c653c441.
2024-03-14 08:32:29 +00:00
marauder2k7
ae11d996d9 Merge branch 'development' into ShaderConstBuffer-CleanupRefactor 2024-03-14 08:28:29 +00:00
marauder2k7
fbed04050a gui shaders for opengl
First opengl geometry shader along with the other shaders for gui rendering opengl side.
2024-03-09 18:34:43 +00:00
marauder2k7
d9c4269d8b bug fix
deleteSelection when an output node had multiple connections only the first one was deleted, needed a new function to return a vector of connections that are now looped and deleted at the end of delete selection.

few other minor additions and fixes.
2024-03-07 17:22:48 +00:00
marauder2k7
dbbd9383e7 better rounded rect 2024-03-07 10:20:06 +00:00
marauder2k7
0d448ad761 smoothing out results from gui shaders
roundedRectangle and circle drawing now smooth out their results
2024-03-07 09:47:18 +00:00
marauder2k7
c9d70de609 extra draw gui
add the extra functions for drawing gui elements
RoundedRectangle:

All draw rect functions now pass through roundedRectangle which uses a shader and can draw borders, and rounds the corners

Draw thick line:
draws a line thicker than 1 pixel, uses a geometry shader to do this

Draw Circle:
Draws a circle with a border parameter.
2024-03-06 17:27:18 +00:00
marauder2k7
66d8f0f55c Update profiles.ed.tscript 2024-03-05 13:15:54 +00:00
marauder2k7
b2095db575 can key focus 2024-03-04 17:15:13 +00:00
AzaezelX
24562e6758 aug ArrayObject to have a uniquePair command
like uniqueket and uniquevalue, removes duplicate entries, but only if *both* match
also, use that for the populateAllFonts() cache generator
2024-03-03 22:04:09 -06:00
marauder2k7
daa0cfef3a shader node editor test
node editor functioning correctly, connections needed next
shader nodes to be added in the next commit also
2024-03-03 21:13:58 +00:00
marauder2k7
457cdd00bb shader editor ground work
Adds the ground work for shader editor
Adds the base gui for the shader editor
2024-03-02 20:09:45 +00:00
marauder2k7
6355da5df6 various fixes
STB probably shouldn't fail on failed info, just continue.
Assimp only add sequences if there are any.
Update kork chan asset.
2024-03-01 15:01:47 +00:00
AzaezelX
3ab716063f doc correction 2024-02-23 12:39:26 -06:00
AzaezelX
4d1395dd57 from mar: fix the opengl cookie uv lookup 2024-02-23 11:23:07 -06:00
AzaezelX
c27b9bf48f allow spotlights specifically to comprress ies based on angle differentials 2024-02-23 01:28:15 -06:00
AzaezelX
bbe9bc8871 missed a 1d convert 2024-02-22 23:47:57 -06:00
AzaezelX
14b6822e49 a) use a 1d texture for this
b) if we're going to optionally assign iesProfiles via shadowMacros.push_back, should specify the entries for the samplers too
2024-02-22 17:53:53 -06:00
AzaezelX
0b7fd2f0b3 ies bugfixes 2024-02-22 16:00:26 -06:00
marauder2k7
7fb14e17b5 Create jelly-fish.ies 2024-02-21 10:16:07 +00:00
marauder2k7
973d2792ed Delete A23D-Pathway-&-Accent-Light.ies 2024-02-21 10:15:44 +00:00
marauder2k7
3b4a15d7aa Some test ies profiles
IES profiles to my knowledge are not only free to download, but also free to distribute. you can get packs with thousands of these, i am uploading 3 test ones for now.
2024-02-21 10:14:29 +00:00
marauder2k7
39ec0305f9 GLSL To match
Update the glsl side to match hlsl ies profile usage
2024-02-21 08:24:24 +00:00
marauder2k7
4417462499 Add support for both ies and cookie
Both ies and cookies can now exist on a light

We are still not using all the capabilities of an IES profile, such as candela and luminance values we are just using them as a mask for the moment

Issues compiling on mac and linux, will need to update the ies-loader to use torque methods instead of std::
2024-02-21 07:40:57 +00:00
marauder2k7
a12d915180 Loads an IES Photometric profile.
ADDED: Ability to add IES profile as the cookie texture slot in both point lights and spot lights

TODO:
Have the IES Profile also drive the settings for the lights.
Make it work with Cookie textures. IES profiles are to be another slot in the advanced light section.
2024-02-21 06:22:37 +00:00
Brian Roberts
429585f060
Merge pull request #1217 from Azaezel/alpha41/crashFyxMatED
temp workaround for material editor crash
2024-02-20 14:12:16 -06:00
AzaezelX
60758dd5a2 temp workaround for material editor crash
selection swapping is causing an apcrash
notDirtyMaterial.delete(); *should* work, but we know what they say about assumptions.
supressing deletion of workspace material kill off and recreation pending proper review
2024-02-20 14:11:58 -06:00
Areloch
7563130545 Fixes the guiEditor inspector search bar extents and clear button position 2024-02-14 00:34:52 -06:00
Areloch
3734ef8e5b Added search behavior to guiEditor's inspector as well 2024-02-14 00:23:27 -06:00
Areloch
d890c530f9 Adds logic to be able to set a search string on an inspector that will be used to filter displayed fields.
Adds a textEdit filter box to the main world inspector that hooks into the primary inspector for said search functionality
2024-02-13 20:33:14 -06:00
Brian Roberts
59fc6d3d65
Merge pull request #1214 from Azaezel/alpha41/fixAnimScrubberPos
fix animation scrubber position
2024-02-10 15:15:40 -06:00
AzaezelX
7c7a213f94 fix animation scrubber position 2024-02-10 15:15:09 -06:00
AzaezelX
acef688a45 correct main entry to 128 2024-02-10 14:49:54 -06:00
AzaezelX
ddddf112a4 revert "defaulting" to shapeEditorplugin 2024-02-10 14:43:35 -06:00
AzaezelX
85e5cfec3c set object editor previewBackground element to .5s instead of .0s to stop blowing up eye adaption 2024-02-10 14:41:12 -06:00
AzaezelX
359ec3aa43 set object editor previewBackground element to .5s instead of .0s to stop blowing up eye adaption 2024-02-10 13:47:44 -06: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
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
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
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
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