Sryder13
|
8444379d53
|
Free the zentries
|
2019-06-22 00:52:28 +01:00 |
|
Sryder13
|
83da71f809
|
Merge branch 'master' into pk3_leak
|
2019-06-22 00:28:14 +01:00 |
|
Sryder13
|
dcd4995eb3
|
Remember to end inflating
|
2019-06-22 00:19:34 +01:00 |
|
Monster Iestyn
|
f84c898040
|
Merge branch 'master' into next
|
2019-06-21 22:10:32 +01:00 |
|
Monster Iestyn
|
fb182369f6
|
Merge branch 'stand(alone)-lump-comedy' into 'master'
Stand(alone) lump comedy
See merge request STJr/SRB2!499
|
2019-06-21 17:06:23 -04:00 |
|
Monster Iestyn
|
04215b732e
|
Merge branch 'fof-slopes-level-load-fix' into 'next'
FOF slopes level load fix
See merge request STJr/SRB2!498
|
2019-06-21 17:05:54 -04:00 |
|
Monster Iestyn
|
bc2804d383
|
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
|
2019-06-20 13:24:54 +01:00 |
|
Monster Iestyn
|
62ed90b252
|
fix type mismatch by typecasting
|
2019-06-17 20:54:06 +01:00 |
|
Monster Iestyn
|
1638fad75e
|
Part 2 of fix, make sure copied slopes also pass on hasslope status to attached target sectors for FOFs
Also fix whitespace to use tab-style spaces instead of regular spaces, ew
|
2019-06-17 19:00:04 +01:00 |
|
Monster Iestyn
|
50e8f13c03
|
Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation
|
2019-06-17 18:46:51 +01:00 |
|
Monster Iestyn
|
96b12f098b
|
Merge branch 'apng-opengl' into 'master'
opengl apng fix
See merge request STJr/SRB2!497
|
2019-06-14 13:29:13 -04:00 |
|
Jaime Passos
|
c591633733
|
Update m_misc.c
|
2019-06-14 14:13:41 -03:00 |
|
Steel Titanium
|
bfa7325295
|
Merge branch '2.1.24-prep' into 'next'
Update version to 2.1.24
See merge request STJr/SRB2!495
|
2019-06-08 17:08:34 -04:00 |
|
Monster Iestyn
|
f5d883bd12
|
Merge branch 'next' into 2.1.24-prep
# Conflicts:
# debian-template/control
# debian/changelog
|
2019-06-07 23:18:31 +01:00 |
|
Alam Ed Arias
|
ea08ba3fba
|
Merge branch 'master' into next
|
2019-06-07 18:07:32 -04:00 |
|
Alam Ed Arias
|
83b8a98df4
|
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 |
|
Steel Titanium
|
c0c1e5416f
|
Merge branch 'next' into 2.1.24-prep
|
2019-06-07 18:02:09 -04:00 |
|
Alam Ed Arias
|
3edf73f181
|
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
|
3c08ee1313
|
Merge branch 'master' into travis-deployer
# Conflicts:
# .travis.yml
|
2019-06-07 16:56:19 -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
|
34ce368895
|
Merge branch 'next' into jimita-unfuck-awayview
|
2019-05-25 19:47:45 -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 |
|