Jaime Passos
|
8362710e50
|
Merge remote-tracking branch 'origin/flats' into flats-png
|
2019-06-25 16:04:24 -03:00 |
|
Jaime Passos
|
28566008b4
|
Merge remote-tracking branch 'upstream/master' into flats-png
|
2019-06-25 16:02:35 -03:00 |
|
Jaime Passos
|
5047f4e7f0
|
Fix slope flat offsets
|
2019-06-25 14:58:34 -03:00 |
|
Jaime Passos
|
0af9e865f9
|
Delete R_CropFlat
|
2019-06-25 14:41:07 -03:00 |
|
Jaime Passos
|
02c3710211
|
hHA
|
2019-06-25 14:40:00 -03:00 |
|
Jaime Passos
|
a39c52708c
|
Merge remote-tracking branch 'upstream/master' into flats
|
2019-06-25 12:56:03 -03:00 |
|
Monster Iestyn
|
1af969d579
|
Merge branch 'pk3_leak' into 'master'
Pk3 Leaks
See merge request STJr/SRB2!500
|
2019-06-22 15:56:52 -04:00 |
|
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
|
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
|
bc2804d383
|
Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone
|
2019-06-20 13:24:54 +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 |
|
Jaime Passos
|
39857a846a
|
PNG support
|
2019-05-26 23:37:23 -03:00 |
|
Jaime Passos
|
0bcf89679e
|
Hardware renderer: Fix polyobjects
|
2019-05-26 18:16:13 -03:00 |
|
Jaime Passos
|
a4a529bdb5
|
Hardware renderer: Disable Glide-specific texture handling
|
2019-05-26 17:41:10 -03:00 |
|
Jaime Passos
|
dfd8beae27
|
Merge remote-tracking branch 'upstream/jimita-flats' into flats
|
2019-05-26 16:43:33 -03:00 |
|
Jaime Passos
|
93f60267c1
|
Minor fixes
|
2019-05-26 16:22:33 -03:00 |
|
Nev3r
|
36036b6cfd
|
Permit textures to use the "TEXTURE" tag in addition to "WALLTEXTURE".
It's pointless to make any distinctions anymore IMO, given flats can load them just fine now.
|
2019-05-26 12:02:43 +02:00 |
|
Steel Titanium
|
dc273d3f23
|
Merge branch 'next' into jimita-flashpals-on-screenshots
|
2019-05-25 19:37:17 -04:00 |
|
Jaime Passos
|
dbb1575a6d
|
Animations, better flat management.
|
2019-05-21 15:24:26 -03:00 |
|
Jaime Passos
|
869f1e4e8d
|
Fix warnings
|
2019-05-21 11:03:53 -03:00 |
|
Jaime Passos
|
35d6da159d
|
HOLD UP
|
2019-05-21 09:50:39 -03:00 |
|
Jaime Passos
|
714c997aac
|
Support for patches and textures to be used in place of sector flats
Still a work in progress.
|
2019-05-21 00:28:52 -03: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 |