Commit graph

361 commits

Author SHA1 Message Date
Areloch 3697737498 Merge branch 'ModernEditorLayoutWIP' of https://github.com/Areloch/Torque3D into development 2019-05-13 00:28:23 -05:00
Areloch e83ec69292 Merge branch 'PBR_ProbeArrayGLWIP' of https://github.com/Azaezel/Torque3D into development 2019-05-06 01:50:45 -05:00
Areloch 13fb5cd5b9 Merge pull request #2311 from Bloodknight/TerrainSnapOffsetZ
Snap to terrain Z offset.
2019-05-04 14:25:03 -05:00
Areloch 5d1ff71525 Merge pull request #2324 from Areloch/TweakedguiTreeViewObjectHandling
Tweaks some object handling of guiTreeViewObj
2019-05-04 11:51:03 -05:00
AzaezelX dd1470202d Merge branch 'development' of https://github.com/GarageGames/Torque3D into PBR_ProbeArrayGLWIP
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/lighting/lightManager.cpp
#	Templates/Full/game/levels/Empty Room.mis
#	Templates/Full/game/levels/Empty Terrain.mis
2019-05-01 23:18:31 -05:00
Areloch 6daf0c8d34 Merge pull request #2338 from Areloch/MoreMenubarFixes
Fixes some outstanding menubar problems.
2019-03-31 12:39:31 -05:00
Areloch 67060e5c38 Merge pull request #2340 from Areloch/popupMenuBGFix
Makes the popups correctly operate anywhere in the space of the canvas
2019-03-31 12:36:15 -05:00
Areloch f104fac305 Merge pull request #2322 from Areloch/add3dProjectionCtrl
Adds gui3DProjectionCtrl
2019-03-31 02:14:45 -05:00
Areloch 9ae6a5bfa7 Merge pull request #2320 from Areloch/setFieldHeight
Allows special inspectorFields to override their height
2019-03-30 16:31:21 -05:00
Areloch 7756c4a762 Merge pull request #2319 from Areloch/Scenes
Initial implementation of the Scene object
2019-03-30 16:30:34 -05:00
Areloch a9707f09c3 Merge pull request #2321 from Areloch/textApplyFocus
Updates TextEdit value when focus is lost.
2019-03-30 16:07:18 -05:00
Areloch 557ea101ec Update guiSplitContainer.cpp
Corrected typo.
2019-03-30 14:40:58 -05:00
Areloch 7d62d6249f Makes the popups correctly operate anywhere in the space of the canvas
Also corrects a notional issue where if a poup extends past the bottom of the screen, it'll instead appear above the mouse so it doesn't ever get cut off.
2019-03-17 02:33:54 -05:00
Areloch 3a93a30ced Fixes a crash that comes from toggling the editors on and off, then clicking a menubar item
Fixes the menubar not resizing with the Window
Fixes the Editors Menubar item not being repopulated if the editor was closed/reopened
Fixes the Physics menubar item not appearing if the editor was closed/reopened
Fixes issue where findMenu could fail if the StringTableEntry happened to trip against a different capitalization.
2019-03-16 02:38:40 -05:00
Areloch e1a1fd52dc Update gui3DProjectionCtrl.cpp
Corrected file capitalizations for linux
2019-02-23 20:12:17 -06:00
Areloch a937bf44f0 Tweaks some handling of guiTreeViewObj so you don't necessarily have to delete an object if you delete the tree item, as well as the ability to look up the object id via tree item.
Also removes spam in the event that an item on the tree is more of a data representation rather than literal object.
2019-02-23 18:01:14 -06:00
Areloch 0760f35da0 Adds gui3DProjectionCtrl so a gui control can be tracked to a point in 3d space 2019-02-23 16:36:40 -06:00
Areloch e89f959884 Updates TextEdit value when focus is lost. 2019-02-23 16:18:03 -06:00
Areloch 4e31deb94d Allows special inspectorFields to override the height they use in the rollouts 2019-02-23 16:08:47 -06:00
Areloch 9bf8337e4a Initial implementation of the Scene object for handling scenes/levels in a more consistent and deliberate way. 2019-02-23 15:55:28 -06:00
Areloch 2d1ee7c5a0 Adds ability to set the split point of a guiSplitContainer 2019-02-23 13:55:29 -06:00
Areloch 99e3fa2156 Merge pull request #2305 from Azaezel/copyCleanup
corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged
2019-02-20 23:12:58 -06:00
Marc Chapman c92c508a5d Adds the capability to add a small offset to the Z value of items being told to snap to terrain 2019-02-12 03:14:01 +00:00
suncaller 8a7c09c8fe Clean up redundant variables 2019-02-06 15:03:06 -05:00
suncaller 31d0eb16f8 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
Azaezel e7c3085d5f corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged
pretty sure the offending leak-line creeps in with
 561f010f2e/Templates/BaseGame/game/tools/base/utils/swatchButtons.ed.cs (L34)
comparative release/debug results in
string gridBitmap = "\c0"
vs
string gridBitmap = "ic\c1Gl\c0"
and the relavent initpersistfields entry of TypeString points to
561f010f2e/Engine/source/console/consoleTypes.h (L71)
which is likely causing malformation
2019-01-28 21:04:51 -06:00
Areloch 72af45ef69 Merge pull request #2294 from OTHGMars/GuiInputCtrl
Adds features to GuiInputCtrl
2019-01-21 15:14:37 -06:00
OTHGMars 2add57079d Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
Azaezel 13ce1a7441 corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
Azaezel 1eed979a9c Merge branch 'method_Unmangle' into PBR_PR 2018-12-12 14:54:22 -06:00
Azaezel a7fc407284 corrects a pair of conversions. one object oriented, one not. 2018-12-12 14:52:14 -06:00
Areloch 835513b861 Deleting a probe in the editor now automatically does a cleanup of it's baked cubemap files
Also added it to do the prefilter/irrad processing on any StaticCubemap selected.
2018-12-10 00:46:28 -06:00
Areloch 121ca2ac97 Merge pull request #2258 from Areloch/OthroCameraFix
Fixes the front/back ortho views in the editors
2018-12-09 15:35:38 -06:00
Areloch bb30de04f7 Merge branch 'development' into ConvexProxies 2018-12-09 15:34:12 -06:00
Areloch 6cf0c9e360 Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Areloch 81dcac1190 Initial WIP of the Modern Editor Layout 2018-12-08 12:50:31 -06:00
Areloch b4a1d18f42 Core implementation of Physical Based Rendering. 2018-09-15 20:19:57 -05:00
Areloch 54f1d8c18e Merge pull request #2250 from Areloch/popupMenuFixesPR
Fixes various incorrect popup menu behaviors.
2018-09-05 13:06:26 -05:00
OTHGMars b0455c7524 Adds features to GuiInputCtrl
This commit adds three new features to the GuiInputCtrl. All three default to off, so it is fully backward compatible with existing scripts. The new options are:
sendAxisEvents – If true, the control will generate onAxisEvent() callbacks for all axis events. This is useful for binding joystick/controller axes to game actions.
sendBreakEvents – If true, the control will generate onInputEvent() callbacks for SI_BREAK events for all keys and buttons. By default the callback is only triggered for break events on modifier keys.
SendModifierEvents – If true SI_MAKE events for modifier keys will generate callbacks. By default, only the break events are sent for modifier keys.
2018-07-18 20:35:59 -04:00
Ratfish Studios 19682cbe22 Fixes the front/back ortho views in the editors to comply with art tool standards. 2018-05-21 01:32:01 -05:00
Ratfish Studios fea3724f4e Rearranges the right-mouse click popup menus for the world editor and gui editors to a) be organized more logically and b) be more flexible.
This also fixes some insecure behavior relying on %this value eval'ing, which has also been modified to be better.

Also fixes up some old calls for getting menubar menus by internal name, which is no longer supported, instead using the findMenu function call.
2018-05-08 00:30:15 -05:00
Azaezel 13334b4d5c Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
2018-04-23 10:08:14 -05:00
Lukas Joergensen 7d91d0a577 Eliminate ConsoleFunction and ConsoleMethod, replace with DefineEngineStringlyVariadic 2018-04-20 22:09:58 +02:00
Lukas Joergensen 6b524ae58a Eliminate ConsoleStaticMethod 2018-04-20 20:27:09 +02:00
Lukas Joergensen 0fff33869c Eliminate unnecessary uses of ConsoleMethod 2018-04-17 22:36:32 +02:00
Lukas Joergensen 76908eae3c Eliminate DefineConsoleMethod 2018-04-17 21:01:50 +02:00
Areloch bc1b506205 Merge pull request #2146 from Azaezel/specializationShenanigans
changes find, swap, for_each, and delete_pointer from global to t3d namespace
2018-04-17 03:02:03 -05:00
Azaezel cbce2ee805 Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
2018-03-28 15:42:34 -05:00
Areloch 8f947d5251 Adds a convenience function to refresh the console dialog. 2018-03-17 14:37:07 -05:00
Areloch 19e66ceabb Merge pull request #2215 from Areloch/MeshBaking_Expanded
Expanded mesh baking functionality
2018-03-17 00:41:37 -05:00