3445 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Areloch	7b4fdd8b81	Properly converted Spectator and FPS Gameplay modules' levels to utilize Scene	2019-03-16 03:13:47 -05: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	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
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	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
Azaezel	8d770c5609	afxRenderHighlightMgr: account for hardware skinning	2019-01-07 06:22:24 -06:00
Azaezel	aebbb1e3d8	tabspace	2019-01-06 15:50:19 -06:00
Azaezel	831e9db5a5	constant consistency creates continuums	2019-01-06 15:42:18 -06:00
Azaezel	95eb2fc626	zenity backend file filter fix	2019-01-06 14:24:33 -06:00
Areloch	6a0ef46c05	Merge pull request #2282 from OTHGMars/CanvasResize ... Fixes CanvasSizeChangeSignal and Canvas::onResize() under SDL	2019-01-06 04:51:18 -06:00
Areloch	480818795f	Merge pull request #2288 from Azaezel/unixUpdates ... corrects compilation errors on non-mac unix derivatives	2019-01-06 02:12:45 -06:00
Azaezel	e4206c4ae3	no message	2019-01-02 17:53:17 -06:00
Azaezel	7695c56f08	use the newer c_controlInterface file	2019-01-02 17:52:20 -06:00
Azaezel	9d59caae35	corrects compilation errors on non-mac unix derivatives	2019-01-01 15:41:59 -06:00
Azaezel	8304168365	linux compilation, defaults to using the older gtk solution till more folks have a chance to beat up the zenity one.	2019-01-01 15:40:44 -06:00
Azaezel	a5bdbd47a2	corrects compilation errors on mac	2019-01-01 13:11:46 -06:00
Azaezel	989662774e	blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux	2019-01-01 11:00:05 -06:00
Azaezel	b5815bde22	NFD updated to 1.1.4	2019-01-01 10:58:53 -06:00
Areloch	6a6f452dad	Merge pull request #2285 from Azaezel/method_Unmangle ... corrects a pair of conversions. one object oriented, one not.	2018-12-13 09:38:59 -06:00
Azaezel	450080de6a	corrects a pair of conversions. one object oriented, one not.	2018-12-12 14:52:14 -06:00
Areloch	18c054f3b1	Merge pull request #2284 from OTHGMars/SDLMonitor ... Fills in monitor functions in PlatformWindowManagerSDL	2018-12-09 15:36:15 -06:00
Areloch	9303fa8089	Merge pull request #2283 from OTHGMars/SDLFocus ... Adds handlers for sdl focus events.	2018-12-09 15:36:00 -06:00
Areloch	738e2d5088	Merge pull request #2258 from Areloch/OthroCameraFix ... Fixes the front/back ortho views in the editors	2018-12-09 15:35:38 -06:00
Areloch	bdd0c94a36	Merge pull request #2103 from Areloch/ConvexProxies ... Adds functionality to automate convex proxy objects	2018-12-09 15:34:22 -06:00
Areloch	8c2e27057e	Merge branch 'development' into ConvexProxies	2018-12-09 15:34:12 -06:00
Areloch	7fdd60a9b6	Merge pull request #2186 from rextimmy/physx_3_4 ... Physx 3.4	2018-12-09 15:28:43 -06:00