3467 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Areloch	8ee1f92ba4	Merge pull request #2319 from Areloch/Scenes ... Initial implementation of the Scene object	2019-03-30 16:30:34 -05:00
Areloch	c4e10825f4	Merge pull request #2310 from Azaezel/vertColorCorrection ... Vert color correction	2019-03-30 16:30:01 -05:00
Areloch	847618f4af	Merge pull request #2323 from Areloch/getFieldValueCrashfix ... Sanity check for calling getFieldValue	2019-03-30 16:07:53 -05:00
Areloch	9a760c721e	Merge pull request #2321 from Areloch/textApplyFocus ... Updates TextEdit value when focus is lost.	2019-03-30 16:07:18 -05:00
Areloch	bf988be859	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	60f4e82cce	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	ed6046c0f5	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	2311120cbc	Update guiSplitContainer.cpp ... Corrected typo.	2019-03-30 14:40:58 -05:00
Areloch	2742558c6f	Merge pull request #2281 from marauder2k7/OpenALDevBuildBranch ... OpenALEffects	2019-03-30 14:39:06 -05:00
Areloch	7b4fdd8b81	Properly converted Spectator and FPS Gameplay modules' levels to utilize Scene	2019-03-16 03:13:47 -05:00
Areloch	cf21bf7dfd	Update simObject.cpp ... Accidental redefine	2019-02-23 21:41:22 -06:00
Areloch	a4fde427b7	Update simObject.cpp ... better way to handle the validity check for const char*	2019-02-23 20:14:10 -06:00
Areloch	6f418cc183	Sanity check so calling getFieldValue on a blank fieldName doesn't cause a crash.	2019-02-23 16:50:05 -06:00
Areloch	b865e1d181	Updates TextEdit value when focus is lost.	2019-02-23 16:18:03 -06:00
Areloch	1c2f90a190	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	41caeedb05	Tweaks to the Asset/Module info echo behavior to spam the console less.	2019-02-23 14:20:57 -06:00
Areloch	21aa13e0f0	Adds ability to set the split point of a guiSplitContainer	2019-02-23 13:55:29 -06:00
Areloch	e0627973fb	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	417a0f8ade	Merge pull request #2299 from Bloodknight/SQLiteConsoleRefactor ... Sqlite Console refactor,	2019-02-20 23:51:56 -06:00
Areloch	e7314dfa09	Merge pull request #2305 from Azaezel/copyCleanup ... corrects a copy-corruption flaw with GuiSwatchButtonCtrl::onMouseDragged	2019-02-20 23:12:58 -06:00
Areloch	c131084a0d	Merge pull request #2309 from suncaller/warning-purge ... Remove redundant variables and clean up C4312 and C4305 warnings	2019-02-20 23:01:31 -06:00
Areloch	1740bc094a	Merge pull request #2295 from Bloodknight/Add-editorconfig ... Add a .editorconfig file	2019-02-20 19:46:20 -06:00
Azaezel	90a93bd17d	wireframe capsule set to the contents of the solid capsule for corrections and backwards compatibility	2019-02-19 16:30:39 -06:00
Azaezel	2ac7d55be0	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	0bc332374f	corrects a parity flaw between wireframe and non wireframe box display	2019-02-19 13:13:23 -06:00
Azaezel	aeb43432fa	set gl vertcolor mapping to bgra format, the same as we do for stateblocks	2019-02-11 07:42:31 -06:00
Azaezel	008423bf32	add vertex colors to standard cube sample mesh as a validation tool	2019-02-11 07:41:09 -06:00
suncaller	5e8e7e7bf8	Clean up redundant variables	2019-02-06 15:03:06 -05:00
Marc Chapman	5e478291fb	Merge branch 'gg-development' into SQLiteConsoleRefactor	2019-02-04 18:02:30 +00:00
suncaller	7f7e402c42	Clean up MSVC warning [C4312] conversion from type to type * of greater size	2019-02-02 23:09:55 -05:00
suncaller	fcb906d598	Clean up MSVC warning [C4305]: truncation from 'double' to 'F32'	2019-02-02 23:07:44 -05:00
Areloch	e6ffe181f3	Update audioEnvironments.cs ... Fixed a typo and spacing issues(as much as github allows)	2019-02-01 23:32:28 -06:00
Areloch	489689aed3	Merge pull request #2286 from Azaezel/NFD_Update ... Nfd update	2019-02-01 19:34:38 -06:00
Areloch	e38eb34da6	Merge pull request #2298 from jmdejong/traviscompile ... Travis Compile	2019-02-01 19:34:21 -06:00
Azaezel	86947228d5	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	951e302cb1	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	a469f2b0a5	Merge pull request #2292 from Azaezel/highlightHax ... afxRenderHighlightMgr: account for hardware skinning	2019-01-21 15:18:19 -06:00
Areloch	77a316079a	Merge pull request #2300 from OTHGMars/SDL_Joystick2 ... Sdl joystick2	2019-01-21 15:17:31 -06:00
Areloch	e0cf7b8702	Merge pull request #2294 from OTHGMars/GuiInputCtrl ... Adds features to GuiInputCtrl	2019-01-21 15:14:37 -06:00
Areloch	0e5a975df5	Merge pull request #2296 from CouleeApps/patch-1 ... Fix SDL Input::getKeyCode on software keyboard layouts	2019-01-21 15:14:19 -06:00
OTHGMars	4fd6dfeaf0	Adds support for SDL joystick and game controllers.	2019-01-10 20:09:05 -05:00
OTHGMars	bc8796773c	Adds event codes for 2 POV hat masks, 2 trackballs and the guide button.	2019-01-10 20:06:54 -05:00
OTHGMars	2f3b3e87c2	Updated to work without keyboard event refactor.	2019-01-10 17:44:30 -05:00
Marc Chapman	9291bc6105	Sqlite Console refactor, also rename param to make tooltip function more helpful	2019-01-10 21:31:17 +00:00
troido	30d236cfb2	travis test whether compilation works on mac and linux ... This checks both gcc and clang on linux, but only clang on mac Becuse there are so many debug warnings they are supressed in a very hacky way: Make is run first with error output ignored. Then an incremental build is run which has the error output, but will only build the files that errored the first time (and will error again). If anyone knows a better way to ignore the warnings that would be great.	2019-01-10 12:39:27 +01:00
Glenn Smith	2739d8713a	Really, github?	2019-01-10 04:18:35 -05:00
Glenn Smith	c256ebdb5c	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	1acd8eb7c3	Merge pull request #2287 from Azaezel/macUpdates2 ... corrects compilation errors on mac	2019-01-09 09:42:19 -06:00
Marc Chapman	e2348f3d98	Add a .editorconfig file	2019-01-08 19:35:02 +00:00
Brian Roberts	d640eeb228	Update afxRenderHighlightMgr.cpp	2019-01-07 11:41:17 -06:00