Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d5207975d
								
							
						 | 
						
							
							
								
								Merge branch 'master' into travis-deployer
							
							
							
							
							
							
							
							# Conflicts:
#	.travis.yml 
							
						 | 
						
							2019-06-07 16:56:19 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								be13ab4830
								
							
						 | 
						
							
							
								
								Fix NONET build
							
							
							
							
							
						 | 
						
							2019-05-13 01:51:36 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c4555493d
								
							
						 | 
						
							
							
								
								Merge branch 'perpetual-modifier-updates' into 'master'
							
							
							
							
							
							
							
							Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456 
							
						 | 
						
							2019-05-13 00:36:06 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b636ae614
								
							
						 | 
						
							
							
								
								Merge branch 'alias_recursion_hotfix_2' into 'master'
							
							
							
							
							
							
							
							Alias recursion hotfix 2
See merge request STJr/SRB2!482 
							
						 | 
						
							2019-05-08 11:25:15 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nev3r
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a43511cf6
								
							
						 | 
						
							
							
								
								Merge branch 'console-wait-fix' into 'master'
							
							
							
							
							
							
							
							Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483 
							
						 | 
						
							2019-05-06 12:56:07 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nev3r
								
							 
						 | 
						
							
							
							
							
								
							
							
								809975b1ff
								
							
						 | 
						
							
							
								
								Merge branch 'opengl-sprite-billboarding' into 'master'
							
							
							
							
							
							
							
							OpenGL Sprite Billboarding
See merge request STJr/SRB2!485 
							
						 | 
						
							2019-05-06 12:45:53 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sryder
								
							 
						 | 
						
							
							
							
							
								
							
							
								64fb7f90f0
								
							
						 | 
						
							
							
								
								Add a cvar for sprite billboarding, off by default.
							
							
							
							
							
						 | 
						
							2019-05-06 16:57:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5cd8ff01ba
								
							
						 | 
						
							
							
								
								add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
							
							
							
							
							
							
							
							not making a merge request because this is so laughably stupidly simple 
							
						 | 
						
							2019-05-03 16:38:59 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wolfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d24bf11af
								
							
						 | 
						
							
							
								
								Merge branch 'nonet-upnp' into 'master'
							
							
							
							
							
							
							
							Don't enable UPnP support if NONET is defined.
See merge request STJr/SRB2!484 
							
						 | 
						
							2019-05-03 06:40:22 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sryder
								
							 
						 | 
						
							
							
							
							
								
							
							
								913d5dd595
								
							
						 | 
						
							
							
								
								OpenGL sprite billboarding
							
							
							
							
							
							
							
							Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly. 
							
						 | 
						
							2019-05-01 20:15:00 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								877e149908
								
							
						 | 
						
							
							
								
								Don't enable UPnP support if NONET is defined.
							
							
							
							
							
						 | 
						
							2019-04-16 15:05:09 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								b28221bdb2
								
							
						 | 
						
							
							
								
								Don't count down wait timer when executing a command
							
							
							
							
							
						 | 
						
							2019-04-14 15:17:47 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e501d9c6af
								
							
						 | 
						
							
							
								
								Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
							
							
							
							
							
							
							
							(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well) 
							
						 | 
						
							2019-04-14 16:39:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nev3r
								
							 
						 | 
						
							
							
							
							
								
							
							
								00e90db72a
								
							
						 | 
						
							
							
								
								Merge branch 'less-obtuse-console-fixes' into 'master'
							
							
							
							
							
							
							
							Console quality of life changes
See merge request STJr/SRB2!479 
							
						 | 
						
							2019-03-31 16:15:05 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa82d67fca
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
							
							
							
							
							
						 | 
						
							2019-03-31 12:29:55 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nev3r
								
							 
						 | 
						
							
							
							
							
								
							
							
								938e4477f6
								
							
						 | 
						
							
							
								
								Merge branch 'do-not-disturb-console' into 'master'
							
							
							
							
							
							
							
							Keep console open in certain instances
See merge request STJr/SRB2!480 
							
						 | 
						
							2019-03-31 05:54:11 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d51de4993
								
							
						 | 
						
							
							
								
								CircleCI: use libpng-dev
							
							
							
							
							
						 | 
						
							2019-03-27 18:51:20 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								af1682d758
								
							
						 | 
						
							
							
								
								CircleCI: Debian Jessie is dead, long live Debian Stretch
							
							
							
							
							
						 | 
						
							2019-03-27 18:23:03 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ebf19fd00
								
							
						 | 
						
							
							
								
								Don't close console when starting title screen
							
							
							
							
							
						 | 
						
							2019-03-26 13:05:19 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								841daf940f
								
							
						 | 
						
							
							
								
								Don't close console when changing map
							
							
							
							
							
						 | 
						
							2019-03-26 13:04:11 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7ad7a4f40
								
							
						 | 
						
							
							
								
								Remove redundant CON_ClearHUD calls
							
							
							
							
							
						 | 
						
							2019-03-26 12:59:13 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								f995e8c241
								
							
						 | 
						
							
							
								
								Resize console upon resolution change
							
							
							
							
							
							
							
							Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore. 
							
						 | 
						
							2019-03-26 12:30:02 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									jameds
								
							 
						 | 
						
							
							
							
							
								
							
							
								a8aea17469
								
							
						 | 
						
							
							
								
								Keep color across wrapped lines
							
							
							
							
							
							
							
							And this works by inserting the same color code on each wrapped line. 
							
						 | 
						
							2019-03-26 12:07:11 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									jameds
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6143dafb0
								
							
						 | 
						
							
							
								
								Scroll console immediately upon pressing PageUp
							
							
							
							
							
						 | 
						
							2019-03-26 12:05:23 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0194922509
								
							
						 | 
						
							
							
								
								Merge branch 'buildbot' into 'master'
							
							
							
							
							
							
							
							Buildbot changes
See merge request STJr/SRB2!477 
							
						 | 
						
							2019-03-26 09:44:56 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a1c30e3b6a
								
							
						 | 
						
							
							
								
								Merge branch 'dedicated-server-credits-fix' into 'master'
							
							
							
							
							
							
							
							Dedicated server credits fix
See merge request STJr/SRB2!476 
							
						 | 
						
							2019-03-26 09:44:21 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e51cad3d6
								
							
						 | 
						
							
							
								
								Merge branch 'mi-side-discolor-fix' into 'master'
							
							
							
							
							
							
							
							MI's side discolor fix
See merge request STJr/SRB2!475 
							
						 | 
						
							2019-03-26 09:43:20 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								9da1033467
								
							
						 | 
						
							
							
								
								Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
							
							
							
							
							
						 | 
						
							2019-03-25 21:35:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8a527b6dc
								
							
						 | 
						
							
							
								
								TravisCI: use stock sdl2_mixer for prebuild bottle
							
							
							
							
							
						 | 
						
							2019-03-25 16:59:47 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								05d2dcca97
								
							
						 | 
						
							
							
								
								travisCI: add sdl2_mixer from mazmazz's srb2 tap
							
							
							
							
							
						 | 
						
							2019-03-25 16:43:33 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								208a835479
								
							
						 | 
						
							
							
								
								TravisCI: install deps on sdl2_mixer
							
							
							
							
							
						 | 
						
							2019-03-25 16:30:02 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								15dbe3730b
								
							
						 | 
						
							
							
								
								TravisCI: try updating homebew
							
							
							
							
							
						 | 
						
							2019-03-25 16:02:30 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								e47bf6274f
								
							
						 | 
						
							
							
								
								TravisCI: build custom sdl2_mixer build
							
							
							
							
							
						 | 
						
							2019-03-25 15:51:13 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								d69d834c6a
								
							
						 | 
						
							
							
								
								use default osx image
							
							
							
							
							
						 | 
						
							2019-03-25 15:48:33 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								45c641204b
								
							
						 | 
						
							
							
								
								TravisCI: move homebrew packages for all mac builds
							
							
							
							
							
						 | 
						
							2019-03-25 15:44:33 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								042b30c6e5
								
							
						 | 
						
							
							
								
								CircleCI: rebuild depend file with BLUA
							
							
							
							
							
						 | 
						
							2019-03-25 15:34:25 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								17768854e0
								
							
						 | 
						
							
							
								
								P_SuperDamage() is too big for inlining
							
							
							
							
							
						 | 
						
							2019-03-25 15:30:25 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								0fbca9a84b
								
							
						 | 
						
							
							
								
								CircleCI: also test compiling without BLUA support
							
							
							
							
							
						 | 
						
							2019-03-25 15:21:52 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								853855eb69
								
							
						 | 
						
							
							
								
								Travis-CI: use a new version of xcode and use homebrew add-on to install packages
							
							
							
							
							
						 | 
						
							2019-03-25 15:16:43 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa3349a117
								
							
						 | 
						
							
							
								
								R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
							
							
							
							
							
						 | 
						
							2019-03-25 18:54:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nev3r
								
							 
						 | 
						
							
							
							
							
								
							
							
								64353bf373
								
							
						 | 
						
							
							
								
								Merge branch 'allow-localhost' into 'master'
							
							
							
							
							
							
							
							Allow connecting to localhost / 127.0.0.1
See merge request STJr/SRB2!474 
							
						 | 
						
							2019-03-23 05:16:44 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								6939dca52a
								
							
						 | 
						
							
							
								
								Actually allow connecting to "localhost"
							
							
							
							
							
							
							
							Because IPv6 doesn't seem to work anyway. 
							
						 | 
						
							2019-03-20 20:37:00 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								25bd4a0876
								
							
						 | 
						
							
							
								
								Let localhost connections
							
							
							
							
							
						 | 
						
							2019-03-20 20:37:00 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce37e4c9c8
								
							
						 | 
						
							
							
								
								Merge branch 'sdl-noxinput-nohidapi' into 'master'
							
							
							
							
							
							
							
							-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468 
							
						 | 
						
							2019-03-20 17:33:04 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								fa6f9062fe
								
							
						 | 
						
							
							
								
								Merge branch 'errorifpng' into 'master'
							
							
							
							
							
							
							
							Error if the lump is a PNG lump
See merge request STJr/SRB2!466 
							
						 | 
						
							2019-03-20 16:26:28 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								94e29d1bb4
								
							
						 | 
						
							
							
								
								CMake: have funny check for empty CMAKE_SIZEOF_VOID_P
							
							
							
							
							
						 | 
						
							2019-03-19 09:10:25 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								727d9cae23
								
							
						 | 
						
							
							
								
								CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac?
							
							
							
							
							
						 | 
						
							2019-03-19 00:04:14 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								4cb71746a7
								
							
						 | 
						
							
							
								
								Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check"
							
							
							
							
							
							
							
							This reverts commit 7d14342a8f. 
							
						 | 
						
							2019-03-18 23:58:31 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d14342a8f
								
							
						 | 
						
							
							
								
								Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check
							
							
							
							
							
						 | 
						
							2019-03-18 16:50:17 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								4757031929
								
							
						 | 
						
							
							
								
								Remove the define.
							
							
							
							
							
						 | 
						
							2019-03-15 18:46:25 -04:00 | 
						
						
							
							
							
								
							
							
						 |