Commit graph

2498 commits

Author SHA1 Message Date
Azaezel 9200eb99e1 duplicate var+assignment 2018-03-14 13:15:14 -05:00
Azaezel a357f9154b Polytope::intersect variable differerntiation. 2018-03-14 13:14:39 -05:00
Azaezel 99aa6263e6 layer, and playerControllerComponent shadowvar cleanups 2018-03-14 13:12:26 -05:00
Azaezel 45a4de7c4a shadowvar cleanups for scattersky and accumulationVolume 2018-03-13 21:29:09 -05:00
Azaezel 53869600cc netObject classvar cleanups 2018-03-13 21:27:31 -05:00
Azaezel f0e5fddde8 reflector classvar cleanups 2018-03-13 21:26:27 -05:00
Azaezel 68da3176c9 more gfx shadowvar cleanups 2018-03-13 21:25:45 -05:00
Azaezel 577e16ec10 sfx shadowvar cleanup 2018-03-13 21:25:02 -05:00
Azaezel 656c81dd39 ribbon classvar cleanup 2018-03-13 21:24:37 -05:00
Azaezel e24e917cf9 MountedImage& image = mMountedImageList[i]; clarification cases 2018-03-13 19:29:08 -05:00
Azaezel 50ed2f6d08 clean up unnecessary global char buffer[100] define 2018-03-13 19:27:47 -05:00
Azaezel 151632f0c4 shader hooks and gen cleanups 2018-03-13 18:07:58 -05:00
Azaezel 32707c5e53 SFXMemoryStream::read clarification. 2018-03-13 18:05:30 -05:00
Azaezel 1d754d92d7 serverquery cleanup 2018-03-13 18:03:10 -05:00
Azaezel ae514ef808 animation clarification 2018-03-13 17:54:35 -05:00
Azaezel 1fc7192018 terrain file I/O and opengl rendering cleanup 2018-03-13 17:33:13 -05:00
Azaezel 87207e0a97 simobject, dictionary, stringtable, and taml clarificationsand cleanups 2018-03-13 17:30:33 -05:00
Azaezel f1c397e055 scenecontainer cleanup 2018-03-13 17:29:03 -05:00
Azaezel a5917ced16 substitution statements conformed to standard class:mVar standard 2018-03-13 17:27:24 -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 b55db9a143 TSMesh::castRayOpcode method var clarifications/match for .h file 2018-03-13 14:26:17 -05:00
Azaezel 10937d0a4d tsignal::order to ::mOrder. yet another potential conflict with a class member vs a method input 2018-03-13 14:22:51 -05:00
Azaezel 57af794ee3 clarified the texture-atlas varnames a bit. (shadow vars cleanup) 2018-03-13 12:16:17 -05:00
Azaezel ef0a4bee08 tsmesh: parentMesh and indicies to mParentMesh and mIndicies (usual deal, complaints about method vars or temp ones potentially conflicting with class vars) 2018-03-13 11:36:36 -05:00
Azaezel 4a5c36352c remove inside a remove after a remove... yeah.... No. 2018-03-13 02:12:59 -05:00
Azaezel 95f7205f61 buf clarification. mModifLightRays logic cleanup 2018-03-13 02:11:57 -05:00
Azaezel 242a51eefe bounds to mBounds conflict avoidance 2018-03-13 01:05:15 -05:00
Azaezel f08339c534 many *many* generic is and js 2018-03-13 00:57:31 -05:00
Azaezel f10e5d5933 pos to mSeqPos to resolve a method entry vs class entry 2018-03-12 23:09:20 -05:00
Azaezel a061af68d2 delta to mDelta to resolve another class var vs method var confusionpoint 2018-03-12 23:07:34 -05:00
Azaezel 95b46c107a winconsole many, many i vars. worldEditor path arguement, lockPtr doubleup. volume.cpp: uneccesary duplicated FileNode::Attributes attr; def 2018-03-12 19:10:55 -05:00
Azaezel 452bbc7bb1 cleans up extra=extra complaint 2018-03-12 17:41:22 -05:00
Azaezel 261a71c3f9 clarified several variable 'r' definitions, as well as a doubleup of a sucessive S32 txt_w = mProfile->mFont->getStrWidth( buff ); pair 2018-03-12 16:00:10 -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
Azaezel 0a09aaba2e nother set of generic 'object' varnames, all of which referenced different things 2018-03-12 04:37:41 -05:00
Azaezel 35d5e8178e overgeneralised variable 'name' clarified between use-cases 2018-03-12 04:04:41 -05:00
Azaezel 65870124b0 local obectName doubleup 2018-03-12 04:03:46 -05:00
Azaezel 9298d889b3 simset::objectList to simset::mObjectList 2018-03-12 03:58:19 -05:00
Azaezel 886dcbaac5 variable naming cleanup due to locals overriding in multiple places. objectname to mObjectName+ getName() refs in dictionary. 2018-03-12 02:36:52 -05:00
irei1as 932ba0aed8
Update sfxSound.cpp 2018-03-11 17:29:30 +01:00
irei1as a21c5a7677
Update sfxSound.h 2018-03-11 17:25:30 +01:00
irei1as ae82c93ad0
Update asyncPacketStream.h 2018-03-11 17:23:59 +01:00
irei1as 0380b95492
Update sfxSound.cpp 2018-03-11 17:20:59 +01:00
Glenn Smith 6b024b21bf As suggested, extract strlen calls from sizes into variables so it isn't called twice 2018-03-08 20:59:40 -05:00
Glenn Smith ed10ce2511 A buffer overflow in enumerateConsoleClassesByCategory 2018-03-08 00:51:52 -05:00
Glenn Smith f9c684fb11 Speaking of badly sized mac things 2018-03-08 00:45:43 -05:00
Glenn Smith 7fc60fbf59 Better to use strlcat and strlcpy and move them to the cpp file. Provided an implementation for platforms that don't support them (macOS only currently) 2018-03-08 00:45:24 -05:00
Glenn Smith cd79088939 Let dStrncat use strncat because it's probably set up for that 2018-03-07 03:58:28 -05:00
Areloch b21c139850 Missed a cleanup line. 2018-03-07 01:30:44 -06:00
Glenn Smith 963333c583 More cats and cpys in files that xcode doesn't see 2018-03-07 01:13:56 -05:00
Glenn Smith 25c25b20b1 Engine was also using raw strcat/strcpy 2018-03-07 00:49:46 -05:00
Glenn Smith 751ccae12d Missed a couple +1s here and there 2018-03-07 00:44:46 -05:00
Glenn Smith a94e0c6d81 Cleaning up the checks 2018-03-06 02:37:42 -05:00
Glenn Smith e03a86f75a Actual buffer overflow bug found because of these fixes 2018-03-06 02:35: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
Glenn Smith bf408235a8 Removed unused macString.mm that has old versions of string functions with no bounds checking 2018-03-05 23:48:09 -05:00
Areloch 43ca2c5bc2 Cleanup of export function to remove redundant arg
Removed unused var
Cleaned up collision export on convexShape
Added prefab export functionality
2018-03-04 16:03:39 -06:00
Areloch 501a322435 Adds handling for the proper updated exporting of mesh for convexShapes 2018-03-04 15:10:44 -06:00
Areloch f309b736ca Expanded mesh baking functionality, now supporting baking of LODs and Collision meshes 2018-03-01 01:51:18 -06:00
Johxz 09854e2612 update readme version files 2018-02-28 22:42:42 -06:00
Johxz 8aa48ff21b update recast 2018-02-28 22:15:31 -06:00
Johxz 64c2059050 delete old files 2018-02-28 13:01:06 -06:00
Azaezel 1a3e7970ca requested revision: use dword just in case of compiler shenanigans 2018-02-26 22:34:21 -06:00
Azaezel 602e5217ee tell switchable graphics supported systems that they need to use the beefier GPU 2018-02-26 20:45:18 -06:00
Areloch 0d2705d815
Merge branch 'development' into issue_2115 2018-02-14 01:43:34 -06:00
Areloch af864a8e95
Merge pull request #2158 from Azaezel/thatsAwrap
adds an mWrap and mWrapF method
2018-02-14 01:41:47 -06:00
Areloch dbf7aa9ef7
Merge pull request #2159 from Azaezel/veryValid
exposes getters for typevalidators.
2018-02-14 01:40:42 -06:00
Areloch 4182827b9a
Merge pull request #2157 from Areloch/NetworkedFields
Adds a new function for defining network-aware console fields on NetObjects
2018-02-14 00:59:25 -06:00
Areloch b914670338
Merge pull request #2206 from Azaezel/profileProblem
companion to #2203:
2018-02-14 00:59:08 -06:00
Areloch 0c6af0ddcf
Merge pull request #2203 from Bloodknight/DifferentProfileFixes
Fixes console spamming of material profiles
2018-02-14 00:58:57 -06:00
Areloch de50a5eba2
Merge pull request #2205 from Areloch/ContextKeybinds
Implements hold and context keybinds
2018-02-14 00:57:48 -06:00
Areloch 2e6f0bde1d
Merge branch 'development' into NetworkedFields 2018-02-14 00:11:32 -06:00
Areloch 010912f393
Merge pull request #2198 from Areloch/MenuBarMoreFixup
Fixes up some menubar issues.
2018-02-13 14:55:49 -06:00
Areloch e54877c67d
Merge pull request #2196 from Bloodknight/Cleanup_CLASSDOC
Remove nested CLASSDOC Macro
2018-02-13 14:55:09 -06:00
Areloch e18661d861
Merge pull request #2190 from Areloch/AssetCodeCleanupRoundOne
Some code cleanup on assets, entities and components, round 1
2018-02-13 14:54:50 -06:00
Azaezel f9ab317f65 companion to #2203: corrects a couple backend profile assignment mismatches found with @rextimmys debug spew 2018-02-13 02:51:28 -06:00
Areloch 5fd5519670 Implements hold and context keybind functionality, enabling the ability to have actionmap binds for holding down a button(complete with hold time return if needed) and context binds for being able to have different events for tapping and holding on the same key. 2018-02-12 21:36:19 -06:00
Azaezel 324c2faf95 don't try to physically interact with a prefab with invalid entries 2018-02-12 11:48:13 -06:00
Marc Chapman 60f604fe9b Profile change for specular files 2018-02-12 16:20:18 +00:00
Areloch 7fd04eabaf
Update meshRenderSystem.cpp 2018-02-11 02:09:53 -06:00
Areloch 937ef6c33d Tabs&Spaces 2018-02-08 16:04:50 -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
Marc Chapman fafc3acd5e Remove nested CLASSDOC Macro 2018-02-05 23:02:02 +00:00
Bloodknight c8e9b85ed3
Merge branch 'development' into issue_2115 2018-02-05 15:59:33 +00:00
Johxz 5f4a91fe21 update to libogg v133 2018-02-04 22:26:02 -06:00
Johxz 97af14fd84 update to bullet 2.87 2018-02-04 21:49:50 -06:00
Areloch c337649019 Some code cleanup, tweak and optimizations for assets, entities and components. 2018-02-04 16:21:07 -06:00
Areloch 5ad9ae30bb Bugfixes and improvements for the animation component and related asset behavior.
Adds in ability to establish a shape animation asset as being cyclic or blended.
Adds functionality for blended animations to integrated into shapeAssets.
2018-02-04 14:31:28 -06:00
Areloch 7ef781d94c
Merge pull request #2187 from JeffProgrammer/torquescript_64_dsos
Fix Torque3D 64bit DSOs.
2018-02-04 13:18:10 -06:00
rextimmy 032a801a99 gcc/clang build fix 2018-02-04 09:32:39 +10:00
Jeff Hutchinson d8e302efee Fix Torque3D 64bit DSOs.
Fix from Torque2D for 64bit string table entries.
2018-02-03 00:32:22 -05: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 2bdec9278f
Merge pull request #2171 from chaigler/dae_file_leak_fix
Fix for daeRawResolver resource leak
2018-01-31 16:28:57 -06:00
Areloch 0860e03bf2
Merge pull request #2165 from chaigler/SDL2_cmake_fix
Remove dxerr.lib dependency
2018-01-31 16:28:40 -06:00
Areloch 74187743bf
Merge pull request #2183 from Areloch/ShapeEdDisplayFixes
Fix a few rendering issues in the Shape Editor
2018-01-31 14:11:02 -06:00
Areloch d784228f32
Merge pull request #2170 from chaigler/BL_remove_fix
Fixes for compiling without Basic Lighting
2018-01-31 14:10:50 -06:00
Areloch 48a093eec4 Adds the ability to force the path returned by the file dialog to be relative. 2018-01-29 22:16:42 -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 8bd533e001 Adds the Systems for the Entity-Component-Systems setup. 2018-01-28 16:58:00 -06:00
Areloch 6eec7aae2f Added Sound Component 2018-01-28 15:17:14 -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 6563f46242 Addition to guiTreeViewCtrl - ability to find what item in the tree is under a given position. 2018-01-28 15:07:50 -06:00
Areloch 66f522668b Expansion of the guiDragAndDropCtrl - support for dragging to any control visible on the canvas. 2018-01-28 15:03:44 -06:00
Areloch 8eb442490a Updates to component classes -
Shift from ghosted components to entity-managed for networking
Initial implementation of Systems through the Mesh Component
2018-01-28 14:57:02 -06:00
Areloch 4341428d53 Asset Browser initial implementation - Asset updates.
Script execution on certain existing assets, new asset types and some tweaks to the managers.
2018-01-28 14:48:02 -06:00
Areloch ab453d068c
Merge pull request #2094 from Areloch/ClearScopeAlwaysConsoleFunc
Adds a engine method to clear the scopeAlways flag on netObjects
2018-01-27 18:42:05 -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
chaigler 51a756dab6 Ensure file is closed before returning
Fix for #2012
2018-01-24 19:09:08 -05:00
chaigler e67e87cfac Fix assert on exit when Basic Lighting is removed
Occurs because ShadowMapManager is destroyed before
AdvancedLightManager.
2018-01-24 16:30:34 -05:00
chaigler 59c81f9179 Fixes linker errors when Basic Lighting is removed 2018-01-24 16:27:29 -05:00
chaigler dc254180b9 Removes dxerr libs from SDL2
SDL2 wa still linking against dxerr.lib and dxerr8.lib but not actually
using any code that requires them. Both libs are deprecated and no
longer included in the Windows SDKs.
2018-01-24 08:02:23 -05:00
Marc Chapman af62b5c0a9 Phase 2: #ifdef for Zodiacs and particles 2018-01-23 22:03:18 +00:00
Marc Chapman 1c2effd7fa Phase 1: Add a #define test 2018-01-23 20:24:35 +00:00
rextimmy 3bbdd9b155 PhysX 3.4 implementation 2018-01-19 22:34:26 +10:00
Azaezel 1a89d95919 exposes getters for typevalidators.
example usage

FRangeValidator gravCoefFValidator(-10.f, 10.f);
   addFieldV( "gravityCoefficient", TYPEID< F32 >(), Offset(gravityCoefficient, ParticleData), &gravCoefFValidator,
      "Strength of gravity on the particles." ); <- clamps gravity within a -10 to 10 range when evaluating scriptt-set changes

mClamp(gravityCoefficient,gravCoefFValidator.getMin(),gravCoefFValidator.getMax()) for any calculations done on the source side would do the same at the point that is called, with a singularl lookup spot for the range.
2018-01-16 14:14:57 -06:00
Azaezel cf98ef8350 adds an mWrap and mWrapF method for cycling values to within a given range.
examples of usage would be say, keeping a rotation within 360 degrees, or hitting a tile boundary and resetting the offset
2018-01-16 13:40:09 -06:00
Areloch b0e8a1f032 Adds a new function for defining static console fields on NetObjects - addNetworkedField()
This lets you attach a 32 bit netMask to the field, so that when it is changed, it automatically flags the associated bitmasks on the netobject as dirty.

This is to shortcut having to flag certain masks being marked as dirty through protected fields and just simplify/streamline the code.
2018-01-16 00:47:53 -06:00
Areloch 463cd50d0a
Merge pull request #2133 from lukaspj/console-function-errors
Fix minor errors in console function definitions
2018-01-10 13:52:33 -06:00
Areloch c4ded31d9a
Merge pull request #2131 from lukaspj/improve-console-dump
Improve console dump with additional information
2018-01-10 13:52:23 -06:00
Areloch 0cd17a049e
Merge pull request #2134 from lukaspj/console-cleanup
Cleanup of the elements exposed to the console
2018-01-10 13:52:02 -06:00
Areloch 7eb71b531e
Merge pull request #2126 from Areloch/FixComponentEditorDisplay
Fixes the inspector/component editor to display components
2018-01-10 13:12:35 -06:00
Areloch 7e623d7a26
Merge pull request #2156 from Areloch/RemoveOldBitmapLoaders
Remove MNG and GIF loaders
2018-01-10 09:50:56 -06:00
Areloch 86756bd929 Loader files didn't properly get deleted with the libmng and lungif library removal. 2018-01-10 09:49:28 -06:00
Areloch 936f468b5d
Merge pull request #2059 from Bloodknight/SaharaUndo
#define AUTOPAINT_UNDO
2018-01-10 09:47:24 -06:00
Areloch 94eb457be4
Merge pull request #2151 from Areloch/Library_Trimming
Removes the LibMNG and LunGIF libraries
2018-01-09 01:43:33 -06:00
Areloch 6dac17d9f6
Merge pull request #2128 from Areloch/NFD_Open_Folder_Fix
Updates Native File Dialogs lib to enable folder browsing.
2018-01-03 00:26:43 -06:00
Areloch aeaf737999 Removes the LibMNG and LunGIF libraries, as they aren't actually utilized and just extend the build times. 2018-01-02 15:48:44 -06:00
Azaezel 491a7dcfdd tAlgorythm fed namespace T3D for better library interoperability. resulted in the need to specify usage in... a few places. 2017-12-27 22:57:47 -06:00
Richard Marrevee 0a407865ac
Update gfxD3D11Device.cpp 2017-12-22 17:11:31 +01:00
Marc Chapman df4a275da2 Update libpng to 1.6.34 2017-12-12 14:00:27 +00:00
Lukas Joergensen 3bc46a8376 Cleanup of the elements exposed to the console 2017-12-10 19:02:20 +01:00
Lukas Joergensen e7414e95a8 Fix minor errors in console function definitions 2017-12-08 21:08:35 +01:00
Lukas Joergensen 08144a1a55 Improve console dump with additional information, such as array sizes and variadic function 2017-12-08 20:50:44 +01:00
Areloch 2c1675992e Updates Native File Dialogs lib to enable browsing and selecting of folders, instead of just files. 2017-12-06 14:09:27 -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
Azaezel 0079899281 new method: TSShapeInstance::resetMaterialList(). Sets all object-instance mapto values back to initial state. reskin now does so to avoid having to track origional values independently. (so say, if you've already got skin1 plugged in to one, and nothing in to another, no need to set skin1=skin2 on the first and skin2 or base=skin2 on the second to swap both on over to skin2).
also by request, went ahead and killed case sensitivity for mapto string replacement when reskinning.
2017-11-12 23:58:34 -06:00
Jeff Hutchinson 449c4c4d1e fix arg corruption on functioncall compilation. 2017-11-12 14:21:49 -05:00
Jeff Hutchinson b05691c6b5 roll back changes to simFieldDictionary as it doesn't want to play nice and causing corruption 2017-11-12 13:39:14 -05: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 407bbce509 Merging 2017-11-05 22:33:32 -06:00
Areloch 9fdc89a83e Corrects an include's case sensitivity being wrong, causing issues on linux. 2017-10-30 13:53:12 -05:00
Areloch 48f50d19c3
Merge pull request #2106 from block8437/development
Fixed a typo where the value of outBytesWritten was being clamped incorrectly.
2017-10-28 00:38:19 -05:00
Areloch 0e58300de8 Makes it properly force an update of the filter via a dirty flag. 2017-10-26 20:11:35 -05:00
Areloch caa1aa67b6 Merge pull request #2096 from Areloch/GetCursorPosLocal
Adds a function to get the cursor position in local coords
2017-10-26 02:42:03 -05:00
Areloch aa77d49e26 Merge pull request #2095 from Areloch/SetForwardVector
Enables setting the forward vector of a Scene Object
2017-10-26 02:41:52 -05:00
Areloch 6bdbac6e38 Merge pull request #2097 from Areloch/Entity_Component_Improvements
Fixes up various parts of the entity and component classes.
2017-10-26 02:41:42 -05:00
Areloch 920a8d2edb Merge pull request #2099 from Areloch/RemoveECExperimentalFlag
Removes Entity/Component stuff from being behind an experimental flag.
2017-10-26 02:41:31 -05:00
Areloch 793bc84698 Merge pull request #2101 from Areloch/Autoloaded_Assets
Adds the ability to define types of assets to be auto-loaded
2017-10-26 02:41:20 -05:00
Areloch 7ea80fc6d3 Merge pull request #2102 from Areloch/updateLibPNG
Update libPNG to latest build.
2017-10-26 02:41:05 -05:00
Azaezel 5408a5eade allows arbitrary material name string replacement, rather than forcing folks to start with base. ie: an entry of skin = "blue; area=fire"; would replace base_area_grid with blue_fire_grid as the used material 2017-10-24 19:15:54 -05:00
Brian Smith 0c604eaf87 Fixed a typo where the value of outBytesWritten was being clamped incorrectly. 2017-10-23 17:00:16 -04:00
OTHGMars c61d71a17c Sets scale for collision primitives created in the shape editor. 2017-10-18 03:25:05 -04:00
Areloch 6805b5567e Remove unneeded isParent handling for entities in the GuiTreeViewCtrl 2017-10-18 00:35:37 -05:00
Areloch 6ce53c45f0 Removes EXTENDED_MOVE block because that's mostly for VR and we'll be implementing a separate VR controller. 2017-10-18 00:26:57 -05:00
Areloch 829e4c40a3 Corrects the documentation. 2017-10-17 21:50:53 -05:00
Areloch 749797dc4f Corrected documentation. 2017-10-17 21:00:42 -05:00
Areloch 6d2c27d7e9 Update libPNG to latest build. 2017-10-17 14:55:57 -05:00
Areloch df9deea1a8 Removes Entity/Component stuff from being behind an experimental flag. 2017-10-15 06:03:59 -05:00
Areloch 3e26684202 Fixes up various parts of the entity and component classes. 2017-10-15 04:42:30 -05:00
Areloch 2fa0171894 Adds a function to get the cursor position in local coords 2017-10-15 04:02:43 -05:00
Areloch 524556fe30 Adds a engine method to clear the scopeAlways flag on netObjects 2017-10-15 03:59:13 -05:00
Areloch 4bcc97379c Enables setting the forward vector of a Scene Object 2017-10-15 03:49:18 -05:00
Areloch db7386bb21 Tweaks the asMatrixF for RotationF, as well as exposes additional console methods for rotation manipulation 2017-10-15 03:41:26 -05:00
Areloch 4e03f07e8e Implements support of autoloaded assets. 2017-10-14 22:10:42 -05:00
Areloch 9a207ca6b0 Adds functionality to automate convex proxy objects for appropriate types. Instead of having to manually convert a zone or portal or occlusion volume to convex to edit it's shape, then back again, simply entering the convex editor will automatically convert them to proxy convex shapes, with a special material to denote them.
When the convex shape editor is exited, it converts them back to their original type, with the changes made to the proxy convex applied to them.
2017-10-12 01:41:27 -05:00
Areloch efbd5fb451 Merge pull request #2088 from Areloch/EditorTool
Initial implementation of the EditorTool class and world editor hook-in.
2017-10-11 12:00:21 -05:00
Areloch 35d649b57e Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -05:00
Azaezel b63d07616e adds fallbacks to the aiTurret's scannode to operate similar to the aimNode, letting folks skip out on adding either and just using pitch (or failing that, heading) 2017-09-29 15:54:55 -05:00
Areloch 5c1d764956 Merge pull request #2089 from Areloch/VariableInspectorRefactor
Updates the VariableInspector, VariableGroup and VariableField objects
2017-09-27 15:31:26 -05:00
Areloch 49d109aa6b Enables SDL's ability to drag and drop files onto the game window and have it call back into script for handling. 2017-09-23 15:43:09 -05:00
Areloch 2b35d88e51 Adds some filtering options to the console log gui so you can specify if you wish to be able to see errors, warnings and regular messages. It also denotes how many errors and warnings are currently in the log. 2017-09-23 12:37:55 -05:00
Areloch 4509d14df3 Merge pull request #2057 from OTHGMars/GFXFormatStrs
Adds missing GFX Texture format strings
2017-09-21 16:56:15 -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 eec61ce1b9 Initial implementation of the EditorTool class and world editor hook-in. 2017-09-21 00:10:44 -05:00
Areloch b7870c33f8 Sets the default grid snap size to 1 rather than 10. 1 Seems like a more neutral default value, and also makes it match the displayed '1' in the UI interface as the default as well. 2017-09-17 18:24:44 -05:00
Areloch 78107ed546 Merge pull request #2083 from Azaezel/loopyLODs
Sanity check to ensure detail levels shift in tandem for skinned meshes
2017-09-17 04:52:14 -05:00
Areloch 620cbfcda4 Merge pull request #2080 from Areloch/ShaderCommonPathOrderFix
Fixes smCommonShaderPath init order
2017-09-17 04:20:29 -05:00
Azaezel ed886d0bd0 fix(es) for volumetric fog when dealing with dedicated servers. 2017-09-15 13:46:19 -05:00
Areloch 6ca8ca4d83 Merge pull request #2086 from Azaezel/ProfileProblemPing
textureProfile conflict reporting
2017-09-14 22:19:01 -05:00
Azaezel ee14bb923e from@rextimmy: reports the same texture used with 2 conflicting textureProfiles (flipping back and forth causes duplicates) 2017-09-14 13:28:13 -05:00
Azaezel aa31f862cd Sanity check to ensure detail levels shift in tandem for skinned meshes 2017-09-13 14:58:54 -05:00
Areloch 62c406cf84 Merge pull request #2078 from rextimmy/zbias_fixes
Corrects OpenGL projection matrix
2017-09-12 22:49:12 -05:00
Areloch cb4989fb0b Moves the initialization of the shader common path const var so it is set before we do an initial setup of some shadergen fields. 2017-09-11 23:48:49 -05:00
rextimmy 47da7f8bc8 Mac compile fix for SQLiteObject 2017-09-10 09:52:25 +10:00
rextimmy e82b9fbb2f sqlite fixes 2017-08-31 21:07:23 +10:00
rextimmy 505b9fbd12 Corrects OpenGL projection matrix
Corrects OpenGL glPolygonOffset values
Corrects Direct3D11 DepthBias values
2017-08-25 13:13:47 +10:00
Areloch a45a55ad6e Merge pull request #2060 from Bloodknight/add_sqlite
SQLite Integration
2017-08-24 21:58:54 -05:00
Areloch 6d4a620f33 Merge pull request #2070 from Azaezel/OVRoops
fix for overdark VR scene rendering
2017-08-24 00:06:35 -05:00
OTHGMars f23ddadc2a Fixed ovr compiling with srgb and DX9 removed. 2017-08-20 06:06:40 -04:00
Areloch 2ec57a9281 Hotfix to make VS2017 15.3 play nice. Offsetof behavior - specifically buildin - is unreliable(and broken in debug), so explicitly defining it to use a reliable method for now. 2017-08-18 23:28:25 -05:00
Azaezel 99703e7889 fix for overdark VR scene rendering 2017-08-18 15:42:30 -05:00
rextimmy 3f3bbf770d Support for VS 15.3 update 2017-08-15 21:39:22 +10:00
Areloch 9886f1d988 Merge pull request #2065 from rextimmy/d3d11_crash_fix
Fix potential crash with D3D11
2017-08-14 02:04:10 -05:00
rextimmy 3cb5f6ca21 ColorI::fromLinear fix 2017-08-13 19:39:44 +10:00
rextimmy 56ba98ac12 Fix potential crash with D3D11 2017-08-12 19:24:09 +10:00
Marc Chapman 9562414216 Removal of extraneous code 2017-08-11 22:27:18 +01:00
Areloch d939a4440d Merge pull request #2062 from Bloodknight/xorswap
OPCODE lib - rewrite swap, add xorswap
2017-08-10 19:48:52 -05:00
Marc Chapman 4466b9ef33 change int to udword 2017-08-10 18:00:13 +01:00
Areloch e15c4a7e62 Merge pull request #2051 from lukaspj/correct-terrain-colors-linear
Fix for terrain detail color blending post-linearization
2017-08-08 23:35:24 -05:00
Marc Chapman f992b65b7c rewrite swap, add xorswap 2017-08-08 01:39:01 +01:00
Areloch e2d3eeffaf Merge pull request #2055 from Areloch/CommonShaderPath_Improvement
Reworks the $Core::commonShaderPath variable usage
2017-08-04 00:58:34 -05:00
Areloch 9831dc947d Merge pull request #2041 from Azaezel/clearTextureStateImmediate
method to make sure we're not getting pixel shader inputs mixed with …
2017-08-04 00:58:13 -05:00
Areloch 6206816ee1 Merge pull request #2045 from OTHGMars/PhysShapeChange
PhysicsShapeData collision fix
2017-08-04 00:33:26 -05:00
Areloch da10594d72 Merge pull request #2036 from Areloch/LightReflectionFix
Fix light rendering in reflections.
2017-08-04 00:28:32 -05:00
Marc Chapman 44d6bf79b9 Add SQLite files + cmake file 2017-07-30 16:26:46 +01:00
Marc Chapman 82a1f4d942 Merge branch 'feature/SaharaUndo' into SaharaUndo 2017-07-30 11:26:21 +01:00
OTHGMars ba401dbc72 Adds missing GFX Texture format strings
This commit eliminates 5 warnings output from VALIDATE_LOOKUPTABLE here: https://github.com/GarageGames/Torque3D/blob/development/Engine/source/gfx/gfxStringEnumTranslate.cpp#L167
And prevents a fatal error here: https://github.com/GarageGames/Torque3D/blob/development/Engine/source/gfx/gfxTextureManager.cpp#L1371
that occurs when called from GuiOffscreenCanvas::_setupTargets() for an OpenVROverlay because GFXFormatR8G8B8A8_LINEAR_FORCE  is used.
2017-07-27 16:49:02 -04:00
Marc Chapman d1b806caf0 Assorted bug fixes 2017-07-27 01:50:52 +01:00
Marc Chapman 31f1d27a49 player-look -- modified player head and arm control
player-movement -- mods allowing manipulation of player movement.
player-puppet -- mods allowing manipulation of player via contraints.
foot-switch -- mods for overriding built-in footstep sounds, decals, and dust.
2017-07-27 01:48:16 +01:00
Marc Chapman 489821a16b Collision events 2017-07-27 01:41:40 +01:00
Marc Chapman ab66929196 triggers -- 2017-07-27 01:40:12 +01:00
Marc Chapman 9682ba318b triggers -- exposes trigger states to other code. 2017-07-27 01:34:44 +01:00
Marc Chapman b5539a45e3 enhanced-projectile 2017-07-27 01:27:13 +01:00
Marc Chapman b860cb150b afxModel-type -- defines a type bit for afxModel objects. 2017-07-27 01:18:57 +01:00
Marc Chapman b94b470559 localRenderViz -- Implements per-light renderViz setting. 2017-07-27 01:15:57 +01:00
Marc Chapman e4acfc4334 enhanced-physical-zone -- PhysicalZone object enhanced to allow orientation add radial forces.
pz-opt -- PhysicalZone network optimizations.
2017-07-27 01:10:20 +01:00
Marc Chapman 4b90b21d7d anim-clip -- sequence selection by afx effects 2017-07-27 00:31:43 +01:00
Marc Chapman d5f51270eb process-order -- code to help positioning of objects in the process lists. 2017-07-27 00:21:47 +01:00
Marc Chapman 0c4efbb762 ground-cover -- Adds an ambient modulation bias to control how much the foliage images are modulated by the sun's ambient light setting.
full modulation -- 1.0 (default)
 no modulation -- 0.0
2017-07-27 00:18:38 +01:00
Marc Chapman 18d42b539b radius-search -- Expose search-list used for determining area damage. 2017-07-27 00:16:13 +01:00
Marc Chapman facc3606bc remap-txr-tags -- runtime reassignment of texture tag names. (Useful for splitting up tags with the same name in order to map different materials to them.)
bbox-check -- a change that allows disabling of a confusing error message.
2017-07-27 00:15:01 +01:00
Marc Chapman b17b45edbb packet-size-checking -- Methods for querying packet-size settings. Used for detecting when spells or effects overrun the packet buffer from networked dynamic field usage.
scope-tracking -- changes related to the tracking of AFX constraint objects as they move in and out of scope.
2017-07-27 00:09:36 +01:00
Marc Chapman eb5d3cc749 sfx-legacy 2017-07-27 00:03:53 +01:00
Marc Chapman 442b200ef6 obj-select -- object selection functionality
is-camera -- Adds a test for determining if object is a camera.
cam-speed -- added method for getting the camera movement speed.
zoned-in -- connection is flagged as "zoned-in" when client is fully connected and user can interact with it.
2017-07-26 23:59:44 +01:00
Marc Chapman 9106eef98b Selection Highlighting 2017-07-26 23:48:29 +01:00
Marc Chapman fec893cd8b db-cache -- implementation of datablock caching system. 2017-07-26 23:41:57 +01:00
Marc Chapman 169e539e47 enhanced-particle -- Accounts for larger number of particle size keys. 2017-07-26 23:24:08 +01:00
Marc Chapman 6910ee584d enhanced-emitter -- numerous enhancements to ParticleEmitter class.
pooled-particles -- optional support for pooled particles which combines multiple emitters in a common sorting pool.
2017-07-26 22:45:10 +01:00
Marc Chapman d28a416914 packet-overflow-checks -- Monitor packet sizes to avoid packet overflow, especially when dynamic variables are used for AFX effect parameterization. 2017-07-26 22:22:23 +01:00
Marc Chapman d68b616bf7 canvas -- Added a way for a child control to handle an event but still have GuiCanvas::processInputEvent() return false, therefore allowing the event to also be handled by the ActionMap. (see DemoGame::processInputEvent()) . Also added methods for clearing "down" status of mouse buttons in cases where ActionMap grabs the mouse for dragging and masks the up events from GuiCanvas.
fade-gui-ctrl -- adds fading capability to GuiControl.
2017-07-26 22:20:43 +01:00
Marc Chapman 8a6ac1fb0f terrain-zodiacs -- Changes made for rendering zodiacs on regular terrain. 2017-07-26 22:10:56 +01:00
Marc Chapman 4ab89f637e meshroad-zodiacs -- MeshRoad customizations for rendering zodiacs on them.
enhanced-meshroad -- adds option for building top-surface-only PolyList.
polysoup-zodiacs -- Changes made for rendering zodiacs on polysoup objects.
groundplane-zodiacs -- groundPlane customizations for rendering zodiacs on them.
special-types -- defines type bits for interior-like and terrain-like types.
special-types -- defines a type bit for polysoup objects.
2017-07-26 22:05:04 +01:00
Marc Chapman 64e742f053 enhanced-field-mgmt -- Enhancements to dynamic field handling that allow for name filtering and replacement limiting 2017-07-26 21:49:45 +01:00
Marc Chapman bc90e97d35 copy-on-reload -- The datablock copy op, ":" is modified to copy on reload as well as on creation.
reload-reset -- adds virtual method that is called when a datablock is reloaded.
2017-07-26 21:40:27 +01:00
Marc Chapman 43815793d1 datablock-temp-clone -- Implements creation of temporary datablock clones to allow late substitution of datablock fields. 2017-07-26 21:10:43 +01:00
Marc Chapman 83c533249f substitutions -- Implementation of special substitution statements on datablock fields. 2017-07-26 20:18:27 +01:00
Marc Chapman 01340843b2 core -- heartbeat call to arcaneFX::advanceTime() from within clientProcess().
misc  -- various other function references
2017-07-26 20:01:44 +01:00
Marc Chapman d7a8510756 Add all new AFX files 2017-07-26 19:38:34 +01:00
Areloch d870fe8890 Removes the pointless getVariable call when doing the init on our smCommonShaderPath var. 2017-07-24 23:52:11 -05:00
Areloch 7567ca10c3 Reworks the $Core::commonShaderPath variable usage to be a static variable in ShaderGen for efficiency(only one getVariable when shadergen is initialized), as well as implements the ability to set a default value, and ensures that it tries to set a path even if the pref variable is missing which is important for ported projects from older builds. 2017-07-24 00:40:27 -05:00
Lukas Jørgensen f3fc5b1fc0 Fix for terrain detail color blending post-linearization 2017-07-20 11:32:17 +02:00
OTHGMars 2f3dc48f45 Fixes collision shape assignment after a PhysicsShapeData resource change signal is triggered. 2017-07-11 19:11:09 -04:00
Johxz e7c98e504b corrected shape path 2017-07-10 20:02:06 -05:00
Areloch 3d7c1bbbf7 Merge pull request #2040 from Azaezel/xenonCleanup
kills off the last vestiges of xenon support
2017-07-09 17:25:10 -05:00
Azaezel bdafe9df43 forgot one 2017-07-09 15:41:54 -05:00
Areloch fcd162450e Merge pull request #2034 from rextimmy/dds_cubemaps
DDS CubemapData support
2017-07-09 15:34:02 -05:00
Azaezel 6813f255d0 method to make sure we're not getting pixel shader inputs mixed with outputs. 2017-07-09 15:15:30 -05:00
Azaezel 6f78c9567c kills off the last vestiges of xenon support 2017-07-09 15:05:56 -05:00
Areloch 7e62b11502 Includes a fix to get lights to render more correctly in the reflection pass. Also includes a helper function to force a render from a passed in transform and frustum. 2017-07-07 02:55:56 -05:00
Areloch 7cc0373b48 #if cleanup for the VS2017 workaround 2017-07-07 02:12:43 -05:00
rextimmy 8bdccb3ff3 DDS cubemap support 2017-07-07 15:59:02 +10:00
Areloch ec400e373f Merge pull request #2030 from Areloch/2017TemplateFix
VS2017 compiler workaround
2017-07-05 22:29:23 -05:00
Areloch 60b1922bc5 Includes the D3D feature level detection. 2017-07-05 22:27:37 -05:00
Areloch ef1edd3751 Works around the regressive behavior in the VSC++ compiler for VS2017 where the variadic templates would not compile correctly. Issue should be patched in future versions, so for now it'll target the 1910 version specifically. 2017-06-28 23:58:56 -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
Azaezel b4c2906581 expanded debug reporting for SDL_Init 2017-06-13 20:24:03 -05:00
Areloch 64955e8cfc Merge pull request #2004 from Areloch/PragmaPack
Ups the #pragma pack call from 4 to 8 when using 64bit
2017-06-10 01:40:53 -05:00
Areloch 23fb9ba38b Conflict resolution with devhead.
Cleaned up a few remaining d3d9 references in the cmake file.
2017-06-01 23:54:44 -05:00
Areloch 6f87fb54b6 Merge pull request #2008 from Areloch/ConsoleDumpAllocationFix
Console Classes dump allocation fix
2017-05-31 02:30:50 -05:00
Areloch 42718099ed Use the more stable method of checking the string by using the strlen call. 2017-05-31 02:27:28 -05:00
Areloch 4b5fbc20cf Merge pull request #2009 from Areloch/Prepass_Deferred_Remainder
Catches the remaining prepass to deferred changes on the engine side.
2017-05-30 23:43:09 -05:00
Areloch 7e5e3b5105 Removes Direct3D9 functionality. 2017-05-28 16:51:31 -05:00
Areloch 5e288e79d2 Merge pull request #2010 from Areloch/Fix1999
Cleans up a redundant include.
2017-05-25 01:35:34 -05:00
Areloch 915fd9e418 Merge pull request #2011 from Areloch/Fix1998
Fixes a redundant flag test
2017-05-25 01:35:09 -05:00
Richard Marrevee 2f399e427f Update win32WindowMgr.cpp 2017-05-18 20:39:53 +02:00
Areloch f2c25162c4 Fixes a redundant flag test 2017-05-15 01:04:06 -05:00
Areloch 9b62afbe3f Cleans up a redundant include. 2017-05-15 01:02:15 -05:00
Areloch b634cda2bb Merge pull request #1972 from pacomont/Fix_bad_initialization_on_camera
Fix bad initialization on camera
2017-05-15 00:58:36 -05:00
Areloch 726790bacf Merge pull request #2001 from pacomont/Let's_appling_Camera_FX_when_mount_on_driver_position
Why not apply Camera FX on vehicle driver position?
2017-05-15 00:58:11 -05:00
Areloch f5347f95bf Merge pull request #2002 from OTHGMars/VolFogLeak
VolumetricFog memory leak fix
2017-05-15 00:45:43 -05:00
Areloch 9ce521d95f Catches the remaining prepass to deferred changes on the engine side. 2017-05-14 18:28:17 -05:00
Areloch 2d648dae58 Console Classes dump fix. It was running aground on having a case where there was a empty value for the 'usage' field in the class header. This would break the allocation because we're allocating nothing. This rejects it if the usage field is an empty string. 2017-05-14 17:51:13 -05:00
Areloch b0fe71fa2f Merge pull request #2007 from OTHGMars/DrawTextNFix
BugFix for GFXDrawUtil::drawTextN()
2017-05-14 17:47:29 -05:00
OTHGMars 77da6900a8 Prevents GFXDrawUtil::drawTextN() from drawing one character more than requested if in_string has more than n characters. 2017-05-12 18:54:01 -04:00
Areloch 9501e52462 ups the #pragma pack call from 4 to 8 when using 64bit, as per suggested settings. This shaves off a lot of compatibility warnings. 2017-05-08 19:13:10 -05:00
OTHGMars 3658f1587d Fixes a memory leak in the VolumetricFog object and corrects an array alloc mismatch. Once objects were being deleted on the client, the SAFE_DELETE(z_buf) needed to be removed from the destructor. This was causing a runtime crash (release only) because z_buf was still registered with the GFX device. 2017-05-06 20:57:10 -04:00
Francisco Montañés García a316391ba0 Apply Camera FX on vehicle driver position. 2017-05-02 17:17:33 +02:00
Phillip Khandeliants b741d9c1c2 Fixed V570: Variable is assigned to itself
The uninitialized variable 'box' is assigned to itself. Judging from the fact that this is a copy constructor, I think that it is necessary to store in the 'box' the value of 'cv.box'
2017-04-27 12:25:01 +03:00
Phillip Khandeliants 172391e1d3 Fixed V610: Undefined behavior
In an arithmetic expression, all the variables whose values can be represented with type 'int' will be promoted to this type. Therefore, the result of the '~mask' expression is a negative number. By the C++ standard, shifting a negative number to the left leads to an undefined behavior.
2017-04-27 12:13:05 +03:00
Phillip Khandeliants c0f3c4e2f5 Fixed V547: Bad C-string comparsion
This comparison of a string to an empty is meaningless, since in fact two pointers will be compared and the expression will always be false.
2017-04-27 12:03:44 +03:00
Phillip Khandeliants ffb943f3bb Fixed V547: Expression is always false
'ov_read' function returns a signed long, that is stored in an unsigned integer 'bytesRead'. Comparsion 'bytesRead < 0' doesn't make sense, since an unsigned number >= 0.
2017-04-27 11:29:03 +03:00
Phillip Khandeliants 32c5ada995 Fixed V591: Non-void function should return a value
If there is needed to prevent the copying of the object, then there is no need to provide the definition of the copy constructor and the assignment operator, because the member functions and friendly functions can still call them. If the code is compiled by a compiler with support for the C++11 standard, you can delete them using the keyword 'delete'
2017-04-27 10:33:31 +03:00
Areloch d98752672a Merge branch 'development' into AITurretClearIgnoreList 2017-04-26 23:56:33 -05:00
Areloch 0637f39928 Merge pull request #1988 from DTFuchs/Redundant-Check-GetTrailingNumber
Better bug fix for #1738 (str.cpp)
2017-04-26 23:27:17 -05:00
Areloch eded563ec2 Merge pull request #1991 from AlexBarys/AITurretIgnoreListFunctions
Ai turret ignore list functions
2017-04-26 01:21:56 -05:00
Areloch 19dcfde60f Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Areloch ab51befa68 Merge pull request #1979 from Azaezel/purdyPitureProfiler
adds profiling to the various gbitmap loaders*
2017-04-26 01:01:54 -05:00
AlexBarys b82e87ec89 Function definitions for new functions
Added header file definitions for the two new functions created to implement the features requested in issue #1272
2017-04-23 19:01:31 -04:00
AlexBarys 1cddf09590 Implementation for two new features
Added implementation to expose two new functionalities from the c++ to Torquescript as requested in issue #1272.  Added both a DefineEngineMethod function for getting the count of the number of objects on the turret ignore list and a DefineEngineMethod function for returning a reference to the object on the ignore list at a given index on the ignore list.  Also added functions that do each of those things and are then encapsulated by those DefineEngineMethod functions.
2017-04-23 18:58:40 -04:00
AlexBarys 591f0088e0 Added clearIgnoreList() definition
Added the definition for the new function created to implement the feature request in issue #1271 to clear the entire ai turret ignore list with one function call.
2017-04-23 18:49:26 -04:00
DTFuchs 3121f30743 Update str.cpp 2017-04-23 18:49:08 -04:00
AlexBarys afaf3648b4 Implementation to clear entire turret ignore list
Implementing the feature request made in issue #1271 to expose the functionality to clear the entire ai turret ignore list to Torquescript.
2017-04-23 18:46:17 -04:00
Masquara 970dd5c477 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch c443e7a4ae Merge branch 'development' into Xenon_Removal 2017-04-18 20:47:43 -05:00