Monster Iestyn
|
502c80eaac
|
Merge branch 'master' into hardcoding-time-again
|
2018-08-02 16:04:54 +01:00 |
|
Latapostrophe
|
c2ff88bb62
|
Fixed sub 400p chat for console
|
2018-07-31 23:56:23 +02:00 |
|
Monster Iestyn
|
1b6e85fda0
|
Merge branch 'pk3-wad-map-noreload-hotfix' into 'master'
PK3 WAD Map NoReload hotfix
See merge request STJr/SRB2Internal!148
|
2018-07-31 14:43:14 -04:00 |
|
Monster Iestyn
|
f6b8206660
|
Merge branch 'public_next'
# Conflicts:
# src/hardware/hw_md2.c
|
2018-07-31 19:41:54 +01:00 |
|
Monster Iestyn
|
10668f14b8
|
Merge branch 'master' into next
|
2018-07-31 19:36:30 +01:00 |
|
Monster Iestyn
|
e4f38995e7
|
Merge branch 'gme-lowvolume-fix' into 'master'
GME low volume fix
See merge request STJr/SRB2!248
|
2018-07-31 14:35:32 -04:00 |
|
Monster Iestyn
|
6bf3274452
|
Merge branch 'gme-pause' into 'master'
Fix pausing on gme
See merge request STJr/SRB2!251
|
2018-07-31 14:33:56 -04:00 |
|
Latapostrophe
|
ac8920ac7a
|
Repositionning chat & bugfixes
|
2018-07-31 15:57:19 +02:00 |
|
Latapostrophe
|
a4bded8e9e
|
SRB2chat test rework
|
2018-07-31 11:10:02 +02:00 |
|
Steel Titanium
|
d649700abf
|
Re-did this fix.
|
2018-07-28 01:58:25 -04:00 |
|
Monster Iestyn
|
5ec9ab373f
|
fix visual studio complaining about negating an unsigned var
|
2018-07-25 22:19:07 +01:00 |
|
Alam Ed Arias
|
6d9bf3c5b3
|
Merge branch 'master' into next
|
2018-07-20 17:35:53 -04:00 |
|
Alam Ed Arias
|
f80b4e18a2
|
Fixup PROFILEMODE
|
2018-07-20 17:35:18 -04:00 |
|
Monster Iestyn
|
594eb92bed
|
Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx.
This should prevent I_FreeSfx making a mess of things later, hopefully.
|
2018-07-14 18:15:59 +01:00 |
|
Monster Iestyn
|
b86318a58e
|
Merge branch 'master' into fof-slope-skew-backport
|
2018-07-11 21:38:09 +01:00 |
|
Monster Iestyn
|
107dbf7496
|
Merge branch 'master' into next
|
2018-07-11 21:37:23 +01:00 |
|
Monster Iestyn
|
1e4e0006cb
|
Merge branch 'opengl-fof-lowerunpegged' into 'master'
OpenGL: FOF walls + Lower unpegged
See merge request STJr/SRB2!258
|
2018-07-11 16:36:26 -04:00 |
|
Monster Iestyn
|
e9339b6356
|
Merge branch 'master' into next
|
2018-07-11 21:18:39 +01:00 |
|
Monster Iestyn
|
c8aaad253d
|
Merge branch 'opengl-projectsprite-fix' into 'master'
OpenGL HWR_ProjectSprite fix
See merge request STJr/SRB2!255
|
2018-07-11 16:15:42 -04:00 |
|
Monster Iestyn
|
dce1e1a103
|
Backport Kart Krew's fix for the 1px HOM with horizon lines
|
2018-07-08 22:30:37 +01:00 |
|
colette
|
639f0d335b
|
Update f_finale.c
|
2018-07-07 20:20:46 -04:00 |
|
Alam Ed Arias
|
e219f92c6b
|
Merge branch 'master' into next
|
2018-07-07 16:42:50 -04:00 |
|
Alam Arias
|
57f74bcc82
|
Update m_misc.c
|
2018-07-07 20:41:11 +00:00 |
|
Alam Arias
|
b4d84a171e
|
Update m_misc.c
|
2018-07-07 20:33:19 +00:00 |
|
Monster Iestyn
|
71a40a8125
|
Merge branch 'md2-fopen-error' into 'master'
More helpful error messages
See merge request STJr/SRB2!243
|
2018-07-06 14:38:59 -04:00 |
|
Monster Iestyn
|
5758beb6b2
|
Merge branch 'md2-smoother-interpolation' into 'master'
Smoother MD2 interpolation
See merge request STJr/SRB2!224
|
2018-07-06 14:38:37 -04:00 |
|
MonsterIestyn
|
a1ebb61b0a
|
Merge pull request #252 from GoldenTails/patch-1
Fixed MD2 models not loading correctly on Linux
|
2018-07-06 19:12:21 +01:00 |
|
GoldenTails
|
cdaadc0037
|
Merge remote-tracking branch 'STJrSRB2/master' into patch-1
|
2018-07-05 16:44:34 -05:00 |
|
Monster Iestyn
|
15812dfb30
|
Merge branch 'master' into next
|
2018-07-05 21:09:39 +01:00 |
|
Monster Iestyn
|
2004a852a6
|
Merge branch 'lua-exploit-fix' into 'master'
Lua exploit fix
See merge request STJr/SRB2!259
|
2018-07-05 16:08:08 -04:00 |
|
MonsterIestyn
|
e536a5fb28
|
Merge pull request #264 from LJSonik/password-security-fix
Disable admin password by default
|
2018-07-05 20:16:19 +01:00 |
|
LJSonik
|
333a98fb59
|
Merge branch 'master' into password-security-fix
|
2018-07-05 20:58:00 +02:00 |
|
MonsterIestyn
|
b6881d75db
|
Merge pull request #232 from LJSonik/minor-net-command-fixes
Minor net command fixes
|
2018-07-05 19:56:17 +01:00 |
|
LJSonik
|
5c246dfcac
|
Merge branch 'master' into minor-net-command-fixes
|
2018-07-05 20:00:38 +02:00 |
|
LJSonik
|
48a1e4b63c
|
Merge branch 'master' into password-security-fix
|
2018-07-05 19:46:36 +02:00 |
|
Steel Titanium
|
2075925ac8
|
Merge remote-tracking branch 'upstream/master' into responsefile-fix
|
2018-07-05 01:24:51 -04:00 |
|
Steel Titanium
|
6d1a8703c7
|
Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation
|
2018-07-05 01:23:56 -04:00 |
|
Steel Titanium
|
deb0d72094
|
Merge remote-tracking branch 'upstream/master' into defaultsoundvol
|
2018-07-05 01:22:39 -04:00 |
|
Steel Titanium
|
d47e7014bc
|
Merge remote-tracking branch 'upstream/master' into md2-fopen-error
|
2018-07-05 01:21:09 -04:00 |
|
Steel Titanium
|
b7776da524
|
Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix
|
2018-07-05 01:20:32 -04:00 |
|
Steel Titanium
|
e104e01057
|
Merge remote-tracking branch 'upstream/master' into gme-pause
|
2018-07-05 01:16:43 -04:00 |
|
Monster Iestyn
|
56ccf5ab7c
|
Fixed the Lua crash exploit.
|
2018-07-04 20:15:36 +01:00 |
|
Monster Iestyn
|
1c30318bd3
|
fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype)
|
2018-07-02 21:03:04 +01:00 |
|
Monster Iestyn
|
4fc9ec6cba
|
remove MF_RUNSPAWNFUNC from MT_CACOLANTERN
|
2018-07-02 20:35:39 +01:00 |
|
Monster Iestyn
|
e662d6cbf1
|
Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore.
Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.
|
2018-07-01 22:01:00 +01:00 |
|
Monster Iestyn
|
a23d5cf101
|
huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems
|
2018-07-01 19:47:26 +01:00 |
|
Monster Iestyn
|
a1f742a0d4
|
Fix special stage map end var defaults to use the correct map numbers
|
2018-06-30 18:14:04 +01:00 |
|
Monster Iestyn
|
90b56b7386
|
Don't re-enable MD5 checks yet, we're not even near RC phase yet
|
2018-06-30 18:09:39 +01:00 |
|
Monster Iestyn
|
28702eeed1
|
Merge branch 'master' into next
|
2018-06-27 15:06:12 +01:00 |
|
Monster Iestyn
|
c5a82d22c9
|
Merge branch 'mp-menu-playername-fix' into 'master'
Multiplayer menu playername fix
See merge request STJr/SRB2!256
|
2018-06-27 10:01:39 -04:00 |
|