Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd1c87ea71
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-06-07 18:07:32 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5c1fe6467
								
							
						 | 
						
							
							
								
								Merge branch 'gme-msvc' into 'master'
							
							
							
							
							
							
							
							Add GME to MSVC 10 solution
See merge request STJr/SRB2!448 
							
						 | 
						
							2019-06-07 18:06:51 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alam Ed Arias
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c352b856d
								
							
						 | 
						
							
							
								
								Merge branch 'travis-deployer' into 'master'
							
							
							
							
							
							
							
							Deploy OS X and Debian packages from Travis-CI
See merge request STJr/SRB2!449 
							
						 | 
						
							2019-06-07 17:57:29 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d5207975d
								
							
						 | 
						
							
							
								
								Merge branch 'master' into travis-deployer
							
							
							
							
							
							
							
							# Conflicts:
#	.travis.yml 
							
						 | 
						
							2019-06-07 16:56:19 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								6c4253a680
								
							
						 | 
						
							
							
								
								Merge branch 'jimita-flashpals-on-screenshots' into 'next'
							
							
							
							
							
							
							
							Flashpals on screenshots
See merge request STJr/SRB2!492 
							
						 | 
						
							2019-06-07 16:37:59 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								2e8aae5d6a
								
							
						 | 
						
							
							
								
								Merge branch 'next' into jimita-flashpals-on-screenshots
							
							
							
							
							
						 | 
						
							2019-05-25 19:37:17 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c8e3748a1c
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-05-13 16:07:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								11cc332378
								
							
						 | 
						
							
							
								
								Merge branch 'archiveworld-sigsegv-fix' into 'next'
							
							
							
							
							
							
							
							Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.
See merge request STJr/SRB2!490 
							
						 | 
						
							2019-05-13 07:02:48 -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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								f235f45431
								
							
						 | 
						
							
							
								
								Merge branch 'no-frameskip' into 'next'
							
							
							
							
							
							
							
							Don't skip frames when connecting or paused
See merge request STJr/SRB2!489 
							
						 | 
						
							2019-05-13 00:35:11 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f616a7141
								
							
						 | 
						
							
							
								
								Properly fix crash due to duplicated lines.
							
							
							
							
							
						 | 
						
							2019-05-13 00:23:43 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steel Titanium
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ec6d5e653
								
							
						 | 
						
							
							
								
								Revert "Check that lumps are okay"
							
							
							
							
							
							
							
							This reverts commit 3f4121085b. 
							
						 | 
						
							2019-05-13 00:20:39 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									James R
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f4121085b
								
							
						 | 
						
							
							
								
								Check that lumps are okay
							
							
							
							
							
						 | 
						
							2019-05-08 20:30:19 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5756583612
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-05-08 16:31:05 +01: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wolfy852
								
							 
						 | 
						
							
							
							
							
								
							
							
								93c706bfb8
								
							
						 | 
						
							
							
								
								Don't skip frames when connecting or paused
							
							
							
							
							
						 | 
						
							2019-05-08 09:39:45 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									wolfs
								
							 
						 | 
						
							
							
							
							
								
							
							
								10b47550a4
								
							
						 | 
						
							
							
								
								Merge branch 'public-musicplus-tagfix' into 'next'
							
							
							
							
							
							
							
							Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486 
							
						 | 
						
							2019-05-07 22:42:13 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0e135f1b8
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-05-06 19:38:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nev3r
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a66fabf4f
								
							
						 | 
						
							
							
								
								Merge branch 'banip-command' into 'next'
							
							
							
							
							
							
							
							Ban IP command
See merge request STJr/SRB2!460 
							
						 | 
						
							2019-05-06 13:09:14 -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
								
							 
						 | 
						
							
							
							
							
								
							
							
								cbb20fc147
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-05-03 16:40:13 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								57edf46531
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-05-03 16:00:45 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								d2236a32c3
								
							
						 | 
						
							
							
								
								Remove song_length tag search
							
							
							
							
							
							
							
							Because songs without this tag will skiplag when loading. 
							
						 | 
						
							2019-05-02 19:14:23 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									mazmazz
								
							 
						 | 
						
							
							
							
							
								
							
							
								7301140b10
								
							
						 | 
						
							
							
								
								Remove MP3 widechar tag searching
							
							
							
							
							
							
							
							1. It's slow, 2. It's incorrect 
							
						 | 
						
							2019-05-02 19:13:56 -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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Monster Iestyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f58d00eec
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-04-02 15:47:07 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								247c9429d2
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-03-27 19:03:36 -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
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ef12f7dd7
								
							
						 | 
						
							
							
								
								Merge branch 'master' into next
							
							
							
							
							
						 | 
						
							2019-03-26 13:46:15 +00: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 | 
						
						
							
							
							
								
							
							
						 |