Commit graph

2355 commits

Author SHA1 Message Date
Areloch
2b62796525 Merge pull request #2332 from Bloodknight/PR_DedicatedLinuxCrashFix
Fixes a crash that occurs on linux headless servers
2019-03-30 16:41:36 -05:00
Areloch
80c036b9b0 Merge pull request #2327 from Areloch/loadCachedDTS
Adds ability to skip loading of cached dts in enumColladaForImport
2019-03-30 16:33:37 -05:00
Areloch
b445b74bb2 Merge pull request #2325 from Areloch/fileDialogReturnBuffer
Moves the path return from fileDialog through the returnBuffer
2019-03-30 16:31:44 -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
0f22f2b20a Merge pull request #2310 from Azaezel/vertColorCorrection
Vert color correction
2019-03-30 16:30:01 -05:00
Areloch
18f4e3172e Merge pull request #2323 from Areloch/getFieldValueCrashfix
Sanity check for calling getFieldValue
2019-03-30 16:07:53 -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
40627afde8 Merge pull request #2318 from Areloch/AssetModuleEchoTweak
Tweaks to the Asset/Module info echo behavior to spam the console less.
2019-03-30 15:34:33 -05:00
Areloch
e7bfbe9133 Merge pull request #2317 from Areloch/setSplitPoint
Adds ability to set the split point of a guiSplitContainer
2019-03-30 15:33:57 -05:00
Areloch
669bfc24d8 Merge pull request #2315 from Azaezel/wireFrameFix
corrects a parity flaw between wireframe and non wireframe box display
2019-03-30 15:09:32 -05:00
Areloch
557ea101ec Update guiSplitContainer.cpp
Corrected typo.
2019-03-30 14:40:58 -05:00
Areloch
33f8a75529 Merge pull request #2281 from marauder2k7/OpenALDevBuildBranch
OpenALEffects
2019-03-30 14:39:06 -05:00
Marc Chapman
a578ef77d3 Fixes a crash that occurs on linux headless servers 2019-02-26 14:47:02 +00:00
Areloch
701ae6034d Update simObject.cpp
Accidental redefine
2019-02-23 21:41:22 -06:00
Areloch
05909cf897 Adds ability to skip loading of cached dts in enumColladaForImport 2019-02-23 21:34:11 -06:00
Areloch
173dbc8868 Update simObject.cpp
better way to handle the validity check for const char*
2019-02-23 20:14:10 -06:00
Areloch
6ae3076ab7 Moves the path return from fileDialog through the returnBuffer so it doesn't get mangled or corrupted in memory inadvertently. 2019-02-23 18:11:54 -06:00
Areloch
728511b137 Sanity check so calling getFieldValue on a blank fieldName doesn't cause a crash. 2019-02-23 16:50:05 -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
b79030ebb4 Tweaks to the Asset/Module info echo behavior to spam the console less. 2019-02-23 14:20:57 -06:00
Areloch
2d1ee7c5a0 Adds ability to set the split point of a guiSplitContainer 2019-02-23 13:55:29 -06:00
Areloch
775ca57047 Merge pull request #2307 from Azaezel/highlightHax
nextfreemask does nothing for proximity mines as there are no subclas…
2019-02-21 00:08:57 -06:00
Areloch
251f24581e Merge pull request #2299 from Bloodknight/SQLiteConsoleRefactor
Sqlite Console refactor,
2019-02-20 23:51:56 -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
Azaezel
46624cc95a wireframe capsule set to the contents of the solid capsule for corrections and backwards compatibility 2019-02-19 16:30:39 -06:00
Azaezel
110d815b39 solid capsule renderfix. +/- halfhieght, not full, and need to do vector, not point-multiplication for the verts 2019-02-19 16:10:33 -06:00
Azaezel
05f8d8b5f1 corrects a parity flaw between wireframe and non wireframe box display 2019-02-19 13:13:23 -06:00
Azaezel
b50f72b109 set gl vertcolor mapping to bgra format, the same as we do for stateblocks 2019-02-11 07:42:31 -06:00
suncaller
8a7c09c8fe Clean up redundant variables 2019-02-06 15:03:06 -05:00
Marc Chapman
1036097eca Merge branch 'gg-development' into SQLiteConsoleRefactor 2019-02-04 18:02:30 +00:00
suncaller
31d0eb16f8 Clean up MSVC warning [C4312] conversion from type to type * of greater size 2019-02-02 23:09:55 -05:00
suncaller
265e64f6fc Clean up MSVC warning [C4305]: truncation from 'double' to 'F32' 2019-02-02 23:07:44 -05:00
Azaezel
0baa410619 nextfreemask does nothing for proximity mines as there are no subclasses on this chain, but does bump it's enum value over the limit with the new addition to sceneobject. so killed it. 2019-01-31 06:45:10 -06: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
a77eb37f9a Merge pull request #2292 from Azaezel/highlightHax
afxRenderHighlightMgr: account for hardware skinning
2019-01-21 15:18:19 -06:00
Areloch
8717c6a376 Merge pull request #2300 from OTHGMars/SDL_Joystick2
Sdl joystick2
2019-01-21 15:17:31 -06:00
Areloch
72af45ef69 Merge pull request #2294 from OTHGMars/GuiInputCtrl
Adds features to GuiInputCtrl
2019-01-21 15:14:37 -06:00
OTHGMars
3af77bbf15 Adds support for SDL joystick and game controllers. 2019-01-10 20:09:05 -05:00
OTHGMars
0ae675839e Adds event codes for 2 POV hat masks, 2 trackballs and the guide button. 2019-01-10 20:06:54 -05:00
OTHGMars
2add57079d Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
Marc Chapman
e5884c56a7 Sqlite Console refactor, also rename param to make tooltip function more helpful 2019-01-10 21:31:17 +00:00
Glenn Smith
a78235dd06 Fix Input::getKeyCode on software keyboard layouts
Input::getAscii goes Torque keyCode -> SDL Scancode -> SDL Keycode -> SDL ascii key name
Input::getKeycode used to be SDL ascii key name -> SDL Scancode -> Torque keyCode

This mismatch made software keyboard layouts behave incorrectly in different places. For example, you would bind a key to an ActionMap and it would activate with a different button than specified.
2019-01-10 04:15:22 -05:00
Areloch
8633884145 Merge pull request #2287 from Azaezel/macUpdates2
corrects compilation errors on mac
2019-01-09 09:42:19 -06:00
Brian Roberts
6e4ed303f6 Update afxRenderHighlightMgr.cpp 2019-01-07 11:41:17 -06:00
Azaezel
7939d08c6a afxRenderHighlightMgr: account for hardware skinning 2019-01-07 06:22:24 -06:00
Areloch
d74a25540f Merge pull request #2282 from OTHGMars/CanvasResize
Fixes CanvasSizeChangeSignal and Canvas::onResize()  under SDL
2019-01-06 04:51:18 -06:00
Azaezel
547a2e28eb no message 2019-01-02 17:53:17 -06:00