Commit graph

4520 commits

Author SHA1 Message Date
Monster Iestyn
3e6388c183 use UINT8 * instead of void or Bytef * 2018-11-27 15:49:41 +00:00
Monster Iestyn
6e839d30a2 Merge branch 'master' into next 2018-11-27 15:31:28 +00:00
Monster Iestyn
95e13d9ad3 Merge branch 'save-soundmenu-toggles' into 'master'
Save sound toggles to config

See merge request STJr/SRB2!348
2018-11-27 10:07:06 -05:00
Monster Iestyn
1889c36dea add HAVE_ZLIB around the rest of the zlib stuff in w_wad.c/h, move zlib.h inclusion down below doomdef.h etc includes in case that does anything for compiling (?) 2018-11-27 13:57:32 +00:00
TehRealSalt
92225748e5 Fix order so the new sound can actually play 2018-11-26 23:34:43 -05:00
Alam Ed Arias
b7f7c2ecf7 PK3: fixup support for newer version of zlib 2018-11-26 20:08:26 -05:00
Alam Ed Arias
9a042cd5e2 Merge branch 'master' into next 2018-11-26 19:49:19 -05:00
Alam Ed Arias
776e920895 TravisCI: need WFLAGS for cmake builds 2018-11-26 19:39:36 -05:00
Alam Ed Arias
5ba788e089 Revert "TravisCi: remove WFLAGS"
This reverts commit fd12e85697.
2018-11-26 19:38:30 -05:00
Alam Ed Arias
78a1931bdf Makefile: disable implicit-fallthroug warnings 2018-11-26 19:38:14 -05:00
Alam Ed Arias
5a3f469593 Makefile: skip implicit-fallthroug warnings 2018-11-26 19:28:55 -05:00
Alam Ed Arias
fd12e85697 TravisCi: remove WFLAGS 2018-11-26 19:20:12 -05:00
Alam Ed Arias
ac2ec6c982 Makefile: disable some warnings for GCC 8.x 2018-11-26 19:01:40 -05:00
Alam Ed Arias
4e332b3848 Fix MSVC build 2018-11-26 18:27:07 -05:00
Sryder
ab5dc3226b Revert change to P_SlopeLaunch
Don't call slopelaunch just from object z difference if the slope has no physics.
2018-11-26 23:10:24 +00:00
Digiku
a2678dcb2e Merge branch 'public-nights-invertloopfix' into 'next'
NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2!300
2018-11-26 16:08:24 -05:00
Digiku
fd891aa21d "Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk 2018-11-26 15:48:08 -05:00
Monster Iestyn
4b0d45afd8 Merge branch 'opengl-noloading' into 'master'
Hide OpenGL loading screen

See merge request STJr/SRB2!349
2018-11-26 15:30:45 -05:00
Latapostrophe
ec279da272 classic lat forgot whitespaces meme 2018-11-26 21:24:57 +01:00
Latapostrophe
0175e5b6a5 Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players. 2018-11-26 21:23:41 +01:00
MonsterIestyn
9940b53742
Merge pull request #348 from Nevur/PK3-BackportNext
Pk3 backport next
2018-11-26 20:14:45 +00:00
MonsterIestyn
b53cd70201
Merge branch 'next' into PK3-BackportNext 2018-11-26 18:56:51 +00:00
TehRealSalt
732e0447a5 Merge branch 'master' into 102-gameplay 2018-11-26 10:14:41 -05:00
TehRealSalt
38ebc4d838 Update version to v1.0.2 2018-11-26 09:34:15 -05:00
Monster Iestyn
a71ca1d259 Merge branch 'fof-slope-skew-backport' into 'master'
FOF wall slope skewing backport

See merge request STJr/SRB2!341
2018-11-26 08:54:29 -05:00
Sal
fcba636616 Merge branch 'deadtweaks' into 'master'
Update HUD anim counters when dead.

Closes #49

See merge request KartKrew/Kart!106
2018-11-26 08:03:17 -05:00
Sal
159d8040b8 Merge branch 'sounddistfix' into 'master'
Sound volume distance indication now scales with mapheader scale.

See merge request KartKrew/Kart!105
2018-11-26 08:02:26 -05:00
TehRealSalt
1c907667fc Slow down animation 2018-11-26 07:43:05 -05:00
TehRealSalt
4ad32b23d9 Find bestrank for 7 sec limit enforcement 2018-11-26 07:18:21 -05:00
TehRealSalt
5dbd747237 Flush map buffer early, again
Now it's directly in G_AddMapToBuffer
2018-11-26 06:09:26 -05:00
TehRealSalt
4bd6ae3f04 Calculate buffer size manually
(Yes, I checked; this always outputs "3" for its current usage.)
2018-11-26 05:09:56 -05:00
TehRealSalt
494fa55390 Accidental removal 2018-11-26 04:42:14 -05:00
TehRealSalt
e59a675eb3 Mistakes 2018-11-26 04:28:39 -05:00
TehRealSalt
478f895ea0 Remove previous commit's votebuffer, allow an external optional buffer to be passed into G_RandMap
I meant to fix the previous method, but I didn't even understand how it knew it was in a vote or not... so I just did it my own way :V

(Shouldn't FLUSHMAPBUFFEREARLY be on now...?)
2018-11-26 04:27:31 -05:00
TehRealSalt
62b9754407 This sound doesn't exist yet, but I'm defining it anyway 2018-11-26 03:19:31 -05:00
TehRealSalt
2a573c2072 Merge branch 'master' into 102-gameplay 2018-11-26 03:13:17 -05:00
TehRealSalt
ba28f1c65f Add confirmation to reset controls 2018-11-26 03:12:22 -05:00
TehRealSalt
b5bf8e09c3 Karma fireworks
Additionally:
- FZ boom no longer has that weird smoke bit before it spawns the smoke column
- Item blinking color is brighter
2018-11-26 02:17:14 -05:00
Steel Titanium
ba111d42ca Last minute changes. 2018-11-26 00:24:11 -05:00
Steel Titanium
cf01e820c4 Take the command line params into account
Really I'm just making it return early if either of the parms are used.
2018-11-25 22:39:11 -05:00
mazmazz
930835f1a2 Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show 2018-11-25 21:47:56 -05:00
TehRealSalt
b68a58d5b2 Make sure spbplace is set better during SEEKING 2018-11-25 20:24:47 -05:00
TehRealSalt
e82c7cb230 Make the WAIT phase work better with SPB rush 2018-11-25 20:23:09 -05:00
TehRealSalt
0f1206af6f Shrink no longer causes old-style wipeout, getting squished reduces the timer on it.
Maybe this might help some of the desyncing, too! Mainly done for gameplay reasons, though :p
2018-11-25 20:14:01 -05:00
Sryder
683ebec120 Rotate All MD2s to match their standing slopes
Needs to be tested in gravity flip
Also flips the normal on linedef based slopes so that it's facing the correct direction
Also makes it so slopelaunch doesn't always remove the standingslope (going down some slopes would cause it to be constantly unset and reset)
2018-11-26 00:17:34 +00:00
Monster Iestyn
1c5bd554c2 Merge branch 'ms-sqlexample' into 'master'
Add example SQL file.

See merge request STJr/SRB2!330
2018-11-25 15:59:17 -05:00
Monster Iestyn
1b2aea81dc Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
Steel Titanium
7d4c9dda91 Add newline to end of file 2018-11-25 14:24:50 -05:00
Steel Titanium
981a1192fb Save sound toggles to config 2018-11-25 14:22:52 -05:00
Monster Iestyn
aaabf062b8 Merge branch 'ms-cvars-fix' into 'master'
Update server name insantly

See merge request STJr/SRB2!344
2018-11-25 14:04:12 -05:00