Steel Titanium
|
c0c1e5416f
|
Merge branch 'next' into 2.1.24-prep
|
2019-06-07 18:02:09 -04:00 |
|
Steel Titanium
|
e1d025cd2b
|
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
|
eb99ad0437
|
Merge branch 'more-limits' into 2.1.24-prep
|
2019-06-07 11:28:43 -04:00 |
|
Monster Iestyn
|
6f6d912fa6
|
Update version to 2.1.24
|
2019-06-07 15:48:33 +01:00 |
|
Steel Titanium
|
d4dac52766
|
Upped freeslots limit
|
2019-06-03 15:23:48 -04:00 |
|
Steel Titanium
|
dc273d3f23
|
Merge branch 'next' into jimita-flashpals-on-screenshots
|
2019-05-25 19:37:17 -04:00 |
|
Monster Iestyn
|
600a373739
|
Merge branch 'master' into next
|
2019-05-13 16:07:30 +01:00 |
|
Monster Iestyn
|
2a9019c15e
|
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
|
addf2bb3c4
|
Fix NONET build
|
2019-05-13 01:51:36 -04:00 |
|
Steel Titanium
|
8a14427420
|
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
|
06961a8f5e
|
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
|
cad65ad5e9
|
Properly fix crash due to duplicated lines.
|
2019-05-13 00:23:43 -04:00 |
|
Steel Titanium
|
4e0cc2505a
|
Revert "Check that lumps are okay"
This reverts commit 7ac0a8b4d2.
|
2019-05-13 00:20:39 -04:00 |
|
James R
|
7ac0a8b4d2
|
Check that lumps are okay
|
2019-05-08 20:30:19 -04:00 |
|
Monster Iestyn
|
f0e16cad32
|
Merge branch 'master' into next
|
2019-05-08 16:31:05 +01:00 |
|
Monster Iestyn
|
8ea9d0e95c
|
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
|
8f05d75926
|
Don't skip frames when connecting or paused
|
2019-05-08 09:39:45 -05:00 |
|
wolfs
|
e394f41c52
|
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
|
406c3619d7
|
Merge branch 'master' into next
|
2019-05-06 19:38:53 +01:00 |
|
Nev3r
|
aab2f55aec
|
Merge branch 'banip-command' into 'next'
Ban IP command
See merge request STJr/SRB2!460
|
2019-05-06 13:09:14 -04:00 |
|
Nev3r
|
ae25e8ea07
|
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
|
8b8e165d19
|
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
|
8273534967
|
Add a cvar for sprite billboarding, off by default.
|
2019-05-06 16:57:32 +01:00 |
|
Monster Iestyn
|
454306cf86
|
Merge branch 'master' into next
|
2019-05-03 16:40:13 +01:00 |
|
Monster Iestyn
|
a5dfbe7eff
|
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
|
d4ab2837bb
|
Merge branch 'master' into next
|
2019-05-03 16:00:45 +01:00 |
|
wolfs
|
1f2d720363
|
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
|
904b00e921
|
Remove song_length tag search
Because songs without this tag will skiplag when loading.
|
2019-05-02 19:14:23 -04:00 |
|
mazmazz
|
3e5b0c4531
|
Remove MP3 widechar tag searching
1. It's slow, 2. It's incorrect
|
2019-05-02 19:13:56 -04:00 |
|
Sryder
|
4d77ed925e
|
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
|
26fdee8217
|
Don't enable UPnP support if NONET is defined.
|
2019-04-16 15:05:09 -04:00 |
|
James R
|
36e678b292
|
Don't count down wait timer when executing a command
|
2019-04-14 15:17:47 -07:00 |
|
Monster Iestyn
|
797ca99f42
|
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
|
ab0fe6b164
|
Merge branch 'master' into next
|
2019-04-02 15:47:07 +01:00 |
|
Nev3r
|
6d95f3ceb2
|
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
|
42d25f67ca
|
Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
|
2019-03-31 12:29:55 -07:00 |
|
Nev3r
|
2966c99fd8
|
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
|
c9cee39745
|
Merge branch 'master' into next
|
2019-03-27 19:03:36 -04:00 |
|
Alam Ed Arias
|
4d34841a53
|
CircleCI: use libpng-dev
|
2019-03-27 18:51:20 -04:00 |
|
Alam Ed Arias
|
e6c6f048e4
|
CircleCI: Debian Jessie is dead, long live Debian Stretch
|
2019-03-27 18:23:03 -04:00 |
|
James R
|
917edf720d
|
Don't close console when starting title screen
|
2019-03-26 13:05:19 -07:00 |
|
James R
|
9a350eb879
|
Don't close console when changing map
|
2019-03-26 13:04:11 -07:00 |
|
James R
|
69d7e98f34
|
Remove redundant CON_ClearHUD calls
|
2019-03-26 12:59:13 -07:00 |
|
James R
|
e8071e66e4
|
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
|
b9b36a44a8
|
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
|
587586f4bb
|
Scroll console immediately upon pressing PageUp
|
2019-03-26 12:05:23 -07:00 |
|
Monster Iestyn
|
a01a0a3dc3
|
Merge branch 'master' into next
|
2019-03-26 13:46:15 +00:00 |
|
Monster Iestyn
|
9ef98471a4
|
Merge branch 'buildbot' into 'master'
Buildbot changes
See merge request STJr/SRB2!477
|
2019-03-26 09:44:56 -04:00 |
|
Monster Iestyn
|
8e78369f83
|
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
|
7758b28164
|
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 |
|