Commit graph

273 commits

Author SHA1 Message Date
Bloodknight c8e9b85ed3
Merge branch 'development' into issue_2115 2018-02-05 15:59:33 +00:00
Jeff Hutchinson d8e302efee Fix Torque3D 64bit DSOs.
Fix from Torque2D for 64bit string table entries.
2018-02-03 00:32:22 -05:00
Marc Chapman 1c2effd7fa Phase 1: Add a #define test 2018-01-23 20:24:35 +00: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
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 407bbce509 Merging 2017-11-05 22:33:32 -06:00
Areloch 35d649b57e Merge pull request #2056 from Bloodknight/afx_merge_main
Afx merge main
2017-10-11 08:47:47 -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 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
rextimmy 3f3bbf770d Support for VS 15.3 update 2017-08-15 21:39:22 +10: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
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
Areloch 7cc0373b48 #if cleanup for the VS2017 workaround 2017-07-07 02:12:43 -05:00
Areloch ec400e373f Merge pull request #2030 from Areloch/2017TemplateFix
VS2017 compiler workaround
2017-07-05 22:29:23 -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
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 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 9b62afbe3f Cleans up a redundant include. 2017-05-15 01:02:15 -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 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
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
Areloch 19dcfde60f Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Masquara 970dd5c477 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch 87283640b7 Removed the unneeded PPC And Altivec elements, and removed the LOCBUILD flag 2017-04-09 23:26:35 -05:00
Areloch 7f735cae2e Missed a bit. Readded an accidental removal, and cleaned up an extraneous endif 2017-04-08 21:06:47 -05:00
Areloch 26fd24fbab Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Thomas "elfprince13" Dickerson d3956cb532 merged numerous changes from upstream 2017-03-03 21:17:07 -05:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Areloch 713c93d328 Merge branch 'splashAndWindowIcons' of https://github.com/Areloch/Torque3D into development 2017-01-15 23:37:06 -06:00
Areloch 0c6174b045 Merge pull request #1920 from elfprince13/variadicConsoleTemplates
Variadic console templates
2017-01-12 23:32:03 -06: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 ec5efe5411 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:21:29 -05:00
Thomas "elfprince13" Dickerson d64e2a7019 Removed constexpr use to support VS2013 2017-01-10 23:22:05 -05:00
Thomas "elfprince13" Dickerson 2bb64a0e74 Removed constexpr use to support VS2013 2017-01-10 23:20:48 -05:00
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Thomas "elfprince13" Dickerson bb38a40bcb fixed lots of tabs and space 2017-01-06 18:04:28 -05:00
Thomas "elfprince13" Dickerson 1048b7d535 finished variadic conversion 2017-01-06 17:19:43 -05:00
Thomas "elfprince13" Dickerson 39bea37fa0 minor fixes, and converted the type table 2017-01-06 17:19:36 -05:00
Thomas "elfprince13" Dickerson 500383591c TSShapeConstruct commands converted 2017-01-06 17:19:27 -05:00
Thomas "elfprince13" Dickerson b215bfb933 executef converted 2017-01-06 17:19:16 -05:00
Thomas "elfprince13" Dickerson 62e3fae060 so many variadics. 2017-01-06 17:19:08 -05:00
Thomas "elfprince13" Dickerson 0dfb15dc57 Another set of templates converted to be variadic 2017-01-06 17:18:47 -05:00
Thomas "elfprince13" Dickerson 88106f9032 Fixed type inference for nulls in console functions 2017-01-06 17:18:37 -05:00