TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2750 commits 5 branches 33 tags 958 MiB
Commit graph

2750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch 4b1f421df4 Merge pull request #2238 from Areloch/SDL_Install_Fixup 
Makes it so the SDL directory files aren't copied during a template install.
 2018-04-05 00:30:48 -05:00
Areloch 27446b1d6a Merge pull request #2106 from block8437/development 
Fixed a typo where the value of outBytesWritten was being clamped incorrectly.
 2018-04-03 21:24:43 -05:00
Areloch 840d53c283 Merge pull request #1959 from Areloch/SDLSplashScreenCleanupSanity 
Does better sanity checking on cleanup for the splash screen closing in SDL
 2018-04-03 00:14:08 -05:00
Areloch 0f1d270411 Merge pull request #2014 from RichardsGameStudio/windows10-creator-DesktopRes 
Solves issue with getDesktopResolution and Windows 10 Creator update
 2018-04-03 00:08:51 -05:00
Areloch e149024b8f Merge pull request #2002 from OTHGMars/VolFogLeak 
VolumetricFog memory leak fix
 2018-04-03 00:06:10 -05:00
Areloch f264054405 Merge pull request #2123 from nev7n/forestEditorFix 
Fix forest editor failing to load forest
 2018-04-03 00:02:50 -05:00
Areloch 763504f275 Merge pull request #2030 from Areloch/2017TemplateFix 
VS2017 compiler workaround
 2018-04-02 01:42:00 -05:00
Areloch 8684cd1a65 Merge pull request #1944 from GarageGames/development 
Release 3.10
 2017-02-07 19:11:32 -06:00
Areloch 5c8a82180b Merge pull request #1938 from John3/add_strikeObject 
added strikeObject lightning feature
 2017-02-04 23:10:12 -06:00
Areloch b6cbac0a08 Merge pull request #1942 from Areloch/forestEditingFixes 
Fixes some issues with forest editor.
 2017-02-04 22:50:09 -06:00
Areloch 2db03e47e9 Fixes a crash when you try to delete things without being in selection mode in the forest editor. Adds a sanity check that everything is properly set up before attempting the delete action. 
Also adds a fix to the mesh item tab in the forest editor to correct odd selection behavior that could erroneously cause selection of two items in the list when you only clicked one.
 2017-02-04 22:45:49 -06:00
Johxz 84f610f2f2 fix tabs vs space, fix net strikepoints 2017-02-03 18:23:34 -06:00
Areloch 3717e3b670 Merge pull request #1937 from John3/fixLightningWarningFlashes 
fix warningFlashes() of lightning class
 2017-01-31 20:02:17 -06:00
Areloch a987bb9523 Merge pull request #1939 from Areloch/StaticNetFuncFix 
Hotfix to re-add the prior static function fix in platformNet
 2017-01-31 19:18:32 -06:00
Areloch 73752ff061 Hotfix to re-add the prior static function fix for these functions that was accidentally removed. 2017-01-31 19:16:34 -06:00
Johxz 3cd82d9229 add strikeObject functionality feature 2017-01-31 18:38:09 -06:00
Johxz 381169c3c2 fix warningFlashes() of lighting 2017-01-31 15:25:50 -06:00
Areloch 8b4b467bff Merge pull request #1932 from Areloch/cmake_cleanse 
Cleans up a few cmake options and flags
 2017-01-31 09:47:08 -06:00
Areloch 87c9fce380 Merge pull request #1907 from elfprince13/osxDedeprecation 
OSX de-deprecation (profiler and macFileIO)
 2017-01-31 09:46:44 -06:00
Areloch 8f420893eb Merge branch 'development' into osxDedeprecation 2017-01-31 09:44:52 -06:00
Areloch 15ef6bda92 Merge pull request #1935 from Areloch/RecordingSafetyCheck 
Adds a check to the record movie call
 2017-01-30 20:41:07 -06:00
Areloch 501b55d939 Adds a check to the record movie call so that it only happens in Release mode, to avoid crash issues with theora and debug mode. 2017-01-30 20:36:48 -06:00
Areloch 8985cbb0d3 Merge pull request #1894 from John3/enableVideoRecording 
enable video recording
 2017-01-30 18:26:50 -06:00
Areloch ca4204be14 Merge pull request #1933 from Areloch/SDLMenubarFixins 
Fixes editor handling of menubars when opening/closing.
 2017-01-30 13:31:46 -06:00
Areloch 810117bb66 Merge pull request #1934 from Areloch/menubaracceleratorfix 
SDL Menubar accelerator fix
 2017-01-30 01:29:36 -06:00
Areloch 48bd911dcb Made sure the old code was still there for non-SDL usage. 2017-01-29 04:12:32 -06:00
Areloch a8f2fc567b Fixes up the handling of accelerator keybinds for SDL - specifically compound ones with several modifier keys, ie ctrl-alt-shift-up. 2017-01-29 03:22:25 -06:00
Areloch ac19e0e84c Merge pull request #1928 from lukaspj/particle-manager-lmactivate-cleanup 
Cleanup when deactivating light manager instead of reinitializing
 2017-01-25 21:23:36 -06:00
Areloch 7185d9664d Merge pull request #1923 from elfprince13/stringTableEmptyString 
String table empty string
 2017-01-25 21:06:44 -06:00
Areloch 08432978bf Merge pull request #1922 from elfprince13/perProjectCmakes 
Optionally include a CMake configurations file from the project directory
 2017-01-25 21:06:05 -06:00
Areloch 1523fe55de Merge pull request #1931 from Areloch/LightingFix 
Fixes some issues with lightning
 2017-01-24 23:43:19 -06:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Areloch 80a2a8c29a Fixed the fadeout coloration when using textures, as well as some cleanup for the code. 2017-01-23 18:52:30 -06:00
Areloch f8b650f7a1 Reworks the open/close functions of the gui and world editors so they will properly toggle between and clean up when closed. 2017-01-21 17:11:54 -06:00
Areloch ec8b657b71 Adds support for multiple textures used in the strike rendering per @RichardsGameStudio's help. 2017-01-19 19:15:50 -06:00
Areloch 18f77a240d Merge pull request #1925 from elfprince13/sdlUpdateFix 
Sdl update fix
 2017-01-17 21:13:52 -06:00
Areloch f43bfd6ca2 Cleans up a few cmake options and flags a most of the alsoft and sdl options as advanced so they're not cluttering up the regular view for no reason 2017-01-17 01:10:24 -06:00
Areloch c7b041f545 Fixes the debug netevent packing error by keeping the mStart value as it's proper 0-1 range until it gets to the client, using a temporary world-space var for finding strike target objects in the radius. 
Also add a checker for if there is a texture or not set for the lighting bolt. If it use, set the stateblock description to support it and set the texture, if not, only utilize the color blend.
 2017-01-16 22:11:32 -06:00
Anis 16baa4d51a Merge pull request #1929 from lukaspj/renderpasmanager-initpersistfields 
Make RenderPassManager call Parent::InitPersistFields
 2017-01-16 15:56:41 +01:00
Anis 0911311e98 Merge pull request #1930 from rextimmy/texture_crash 
Texture crash
 2017-01-16 15:55:34 +01:00
Areloch 0aea1d5c33 Merge pull request #1878 from Areloch/splashAndWindowIcons 
Fixes window icons with SDL
 2017-01-16 00:18:31 -06:00
Areloch 6a204f3528 Missed removing the old BMP splash for the new PNG one. 2017-01-16 00:16:17 -06:00
Areloch f02d0d6c4e Hooks the splash window code up to the same image loading code as the icon code, and also adds a check if it tries to load a BMP for either(this is a bad format and really shouldn't be used for pretty much anything). 
Also includes a icon for the templates.
 2017-01-16 00:09:55 -06:00
Areloch 713c93d328 Merge branch 'splashAndWindowIcons' of https://github.com/Areloch/Torque3D into development 2017-01-15 23:37:06 -06:00
rextimmy f6d624be8f Fix mipmap count and potential crash for non square textures that are allocated with GBitmap class 2017-01-16 15:36:52 +10:00
rextimmy 11532e10cc Add log2 function to mMathFn.h 2017-01-16 15:35:25 +10:00
Areloch 598756f134 Merge pull request #1921 from Azaezel/lostLast 
address #1914
 2017-01-15 23:35:08 -06:00
LukasPJ f50d46dffc Cleanup when deactivating light manager instead of reinitializing 2017-01-15 23:23:55 +01:00
LukasPJ 2029e3eb22 Make RenderPassManager call Parent::InitPersistFields 2017-01-15 23:22:46 +01:00
Anis c702ba0f12 Merge pull request #1926 from elfprince13/patch-1 
Call the correct system rename
 2017-01-14 18:42:27 +01:00