Commit graph

88 commits

Author SHA1 Message Date
Azaezel 28e509af1a 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
Azaezel de4f2ddc2a (crashfix) clean up shadowvar followup. 2018-03-16 16:21:53 -05:00
Azaezel 342bf8f3d3 gui shadowvar cleanups 2018-03-15 14:50:54 -05:00
Azaezel 2009bf1ee3 refactor to avoid shadowvars 2018-03-15 00:52:03 -05:00
Azaezel 3ceaa0ed50 cleaned up member::radius 2018-03-13 15:31:00 -05:00
Azaezel 4615bd6db8 more compiler compliant cleanups plus a full set of tsMesh::foo to tsmesh::mFoo class var conversions for consistency 2018-03-13 14:53:23 -05:00
Azaezel 242a51eefe bounds to mBounds conflict avoidance 2018-03-13 01:05:15 -05:00
Azaezel 9141d37ca2 corrects PopupMenu::checkItem() not checking the item. also prepends m to member variables for the MenuItem class to correct a few more locals hiding classvar reports. 2018-03-12 14:30:49 -05:00
Glenn Smith 751ccae12d Missed a couple +1s here and there 2018-03-07 00:44:46 -05:00
Glenn Smith a94587af43 Use strncpy instead of strcpy because again, buffer overflows 2018-03-06 02:35:33 -05:00
Glenn Smith 1728fe39ad Use strncat instead of strcat to prevent some buffer overflows 2018-03-06 00:48:44 -05:00
Areloch 010912f393
Merge pull request #2198 from Areloch/MenuBarMoreFixup
Fixes up some menubar issues.
2018-02-13 14:55:49 -06:00
Areloch f237caff5e Stabilizes the add/remove behavior of menubars by also tracking the modeless background control the menubars use for proper cleanup as well.
Also fixes an issue where the findMenu call wasn't properly translating the incoming string to StringTableEntry.
2018-02-08 16:00:11 -06:00
Areloch c337649019 Some code cleanup, tweak and optimizations for assets, entities and components. 2018-02-04 16:21:07 -06:00
Areloch 80c7dfcb6c
Merge pull request #2182 from Areloch/AssetBrowser_Initial
Asset browser initial
2018-02-01 21:14:50 -06:00
Areloch fae9b17be8 Corrects the clearFields function of the variableInspector and enables the callback field support. 2018-02-01 01:51:51 -06:00
Areloch 640e50565b Tabs n' spaces 2018-01-29 15:24:46 -06:00
Areloch 3ed1cafcbe Hides the display of the 'camera axis' gizmo in the shape editor, as well as fixing it so that when you select a animation-only shapefile, it will correctly compute the shape bounds and thus render the bones correctly. 2018-01-29 15:20:34 -06:00
Areloch b645068530 Minor fixes for guiPopupMenuCtrl to get the submenu arrow to render, as well as a sanity check. 2018-01-28 15:15:10 -06:00
Areloch 1c98d6ece8 Added function to guiMenuBar to find a menu by name. 2018-01-28 15:14:16 -06:00
Areloch 73b81a8246 Small fixes to the inspector, and added the ability for the variableInspector to process command and filename field types. 2018-01-28 15:12:02 -06:00
Areloch 2d05d9dd70
Merge pull request #2118 from Areloch/MenuAndPopups
Refactors the Popup menus and GuiMenuBars
2018-01-27 18:41:00 -06:00
Areloch c74a7b1bc2 Fixes the inspector/component editor to display the components attached to an entity correctly in the inspector. 2017-12-03 01:21:30 -06:00
Areloch 253dd02096 Refactors the Popup menus and GuiMenuBars to remove unneeded duplication and platform-specific/deprecated code. 2017-11-11 01:21:48 -06:00
Areloch df9deea1a8 Removes Entity/Component stuff from being behind an experimental flag. 2017-10-15 06:03:59 -05:00
Areloch 79081c6474 Updates the VariableInspector, VariableGroup and VariableField objects to actually be useful. In addition to the original functionality of being able to have a var name passed in and search for all vars with that in it, it also lets you build out a completely custom Inspector.
Unlike the regular Inspector, which requires a specific object or objects, from which the fields are pulled from, this lets you manually create fields, which can tie into any given object and their fields, global vars, and also not only supports the engine types for fields, but also triggers a callback to script if a field type is not found allowing fully custom fields to be handled as needed.
2017-09-21 02:49:36 -05:00
Areloch 0801a3cca8 Implementation of sRGB image support. Overhauls the linearization setup to utilize the sRGB image types, as well as refactors the use of ColorF and ColorI to be properly internally consistent. ColorIs are used only for front-facing/editing/UI settings, and ColorFs, now renamed to LinearColorF to reduce confusion of purpose, are used for color info in the engine itself. This avoids confusing and expensive conversions back and forth between types and avoids botches with linearity. Majority work done by @rextimmy 2017-06-23 11:36:20 -05:00
Masquara 970dd5c477 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Thomas "elfprince13" Dickerson 27e2871b01 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:36:04 -05:00
Thomas "elfprince13" Dickerson bcc5459818 whitespace 2017-01-11 23:34:46 -05:00
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Thomas "elfprince13" Dickerson 88106f9032 Fixed type inference for nulls in console functions 2017-01-06 17:18:37 -05:00
Azaezel 2652f9a609 Fills out the automaticly filled inspector entries for AbstractClassRep::FieldFlags::FIELD_ComponentInspectors with a pressable button. 2016-12-01 01:07:53 -06:00
Areloch 48610d2eb1 Merge pull request #1773 from Areloch/findByObjectFix
GuiInspector's findByObject method fix.
2016-11-23 00:30:55 -06:00
Anis 60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2
more unused variable cleanups
2016-10-23 21:04:36 +02:00
Azaezel 1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Azaezel fbfd3ed8ed clang: constructor initialization order
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
2016-10-14 18:16:55 -05:00
Areloch af2ac4472e renames the engine method arg to avoid name confusion. 2016-09-14 19:42:05 -05:00
Areloch 818b617972 Implements the right-mouse popup menus in the editor in SDL to make it match to Windows. 2016-07-04 16:01:49 -05:00
Areloch 6ec899620d Tweak to the Component Fields to properly refresh the group. 2016-06-02 23:57:46 -05:00
Areloch 89672ea0ab Hooks the component fields back into the inspector so they are registered as proper fields of their types, as opposed to the regular string-only dynamic fields. 2016-06-02 22:40:29 -05:00
Areloch 74a2005d15 Fixes mistake where GuiInspectorEntityGroup's onAdd doesn't explicitly return true, which can cause problems in some compilers. 2016-05-30 02:29:20 -05:00
Areloch 510b726f6f Final Linux compliance changes(renames, tweaks for gcc compliance, etc) 2016-05-29 00:58:02 -05:00
Areloch ec8882c3c8 Ensuring all names are the correct casing for Linux 2016-05-26 01:37:14 -05:00
Areloch b04ad52b5d Ensure that inclusion of any entity/component stuff is properly bracketed with the preprocessor check. 2016-05-15 10:11:46 -05:00
Areloch 827e70d674 Integration of Entities into the inspector/editor so they can call back into the tool scripts for custom handling. 2016-05-14 14:12:53 -05:00
Areloch 383d27f2ec The class is designed as a general-purpose rotation/orientation class to make it easy to work with rotations and swap between math types as easily as possible. 2016-05-12 00:45:16 -05:00
rextimmy 41e5caf22b Direct3D11 Engine/source changes 2016-03-20 21:52:11 +10:00
Areloch bedc79aacb Merges in Monkey's fixes PR with a resolution for a conflict 2015-09-03 22:58:57 -05:00