Zipper
cc26d9d2bf
Update p_inter.c
2020-03-05 18:30:27 -05:00
ZipperQR
3ec5c0fa89
fix source player being nil
2020-03-05 12:26:27 +03:00
SteelT
84f90df6af
Merge branch 'tolflag-fix' into 'next'
...
Fix G_TOLFlag returning the wrong type
See merge request STJr/SRB2!834
2020-03-02 21:27:45 -05:00
Steel Titanium
3d623577fb
Merge branch 'master' into next
2020-03-02 15:26:01 -05:00
SteelT
800d277dec
Merge branch 'fix-ogllib' into 'master'
...
Fix -OGLlib
See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00
Jaime Passos
1b272067ad
Merge remote-tracking branch 'origin/next' into tolflag-fix
2020-03-02 13:14:12 -03:00
LJ Sonic
cb2528ccc8
Merge branch 'fix-io-warning' into 'next'
...
Fix compiler warning
See merge request STJr/SRB2!833
2020-03-02 07:46:46 -05:00
Louis-Antoine
af5500575b
Fix warning and formatting
2020-03-02 13:33:12 +01:00
Jaime Passos
84f977ff7a
Fix G_TOLFlag returning the wrong type
2020-03-02 00:20:53 -03:00
Jaime Passos
ef7855fca4
Merge branch 'tol-moment' into 'next'
...
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
See merge request STJr/SRB2!825
2020-03-01 11:14:29 -05:00
LJ Sonic
e0f3a5b8f5
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
Monster Iestyn
97f8526e01
Merge branch 'follow-is-mobj' into 'next'
...
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
2020-02-29 12:48:39 -05:00
Jaime Passos
43efbe4ba5
Merge remote-tracking branch 'origin/master' into next
2020-02-25 22:43:15 -03:00
Jaime Passos
2d1321e310
Merge branch 'new-color-chat-fix' into 'master'
...
Fix new skin colors using default chat color
See merge request STJr/SRB2!822
2020-02-25 20:38:36 -05:00
Jaime Passos
ea6a35f3cd
Merge branch 'amycrash' into 'master'
...
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
See merge request STJr/SRB2!823
2020-02-25 20:38:15 -05:00
Jaime Passos
c1156ef29c
Fix (technically functional) string comparison counting an extra character in the comparison length
2020-02-25 22:34:19 -03:00
Jaime Passos
31be6ef867
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
2020-02-25 22:30:34 -03:00
LJ Sonic
9a23fface3
Merge branch 'realmo' into 'next'
...
Let Lua access spectator mobjs
See merge request STJr/SRB2!756
2020-02-25 15:06:29 -05:00
Jaime Passos
b8e8b5517d
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
2020-02-24 20:03:08 -03:00
Steel Titanium
fcfaa0efde
Fix new skin colors using default chat color
2020-02-24 16:58:19 -05:00
Jaime Passos
03f81accc2
Merge branch 'spectator-is-it' into 'next'
...
Don't get chosen as the tagger if you're a spectator
See merge request STJr/SRB2!815
2020-02-23 20:37:27 -05:00
James R
c69ca7381c
Merge branch 'console-in-menus-mk-ii' into 'master'
...
Console in menus again!
See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
James R
a1fd09c7bc
Merge branch 'nomd5-crash' into 'master'
...
Fix crash under NOMD5
See merge request STJr/SRB2!807
2020-02-23 18:15:04 -05:00
James R
7becbcefbe
Merge branch 'exitmove-hideflags' into 'master'
...
Don't spawn the exitmove flags in Single Player
See merge request STJr/SRB2!813
2020-02-23 18:13:38 -05:00
Jaime Passos
75ff8c1789
Don't get chosen as the tagger if you're a spectator
2020-02-23 19:28:16 -03:00
Tatsuru
9368818731
Oopsie 2
2020-02-22 22:36:44 -03:00
Tatsuru
2e71bbf96e
Oopsie
2020-02-22 21:14:05 -03:00
SteelT
8328c2a9b7
Merge branch '2.2.2-prep' into 'next'
...
2.2.2 preparation
See merge request STJr/SRB2!811
2020-02-22 17:27:19 -05:00
Steel Titanium
4f5694fa14
Enable use of the patch file
2020-02-22 16:42:24 -05:00
Steel Titanium
c7778af7d6
Update version number to 2.2.2
2020-02-22 16:37:13 -05:00
James R
f8c9912d25
Merge remote-tracking branch 'origin/master' into next
2020-02-21 21:06:27 -08:00
James R
1a251ccee2
Fix NOMD5 compiling
2020-02-21 21:06:04 -08:00
James R
4d77611752
Register servername etc. under NOMD5
...
This fixes crashes in the menus.
2020-02-21 20:04:28 -08:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
SteelT
0d02983d97
Merge branch 'warp-gamedata-corruption-fix' into 'next'
...
Warp gamedata corruption fix
See merge request STJr/SRB2!802
2020-02-21 21:00:29 -05:00
SteelT
fcb0c62bf7
Merge branch 'update-copyright-year' into 'master'
...
Update copyright year
See merge request STJr/SRB2!801
2020-02-21 20:59:56 -05:00
Louis-Antoine
6739fcff69
Replace MAX_WADPATH with plain numbers
...
This is not ideal either, but I would rather
not use a constant for something unrelated.
2020-02-21 17:31:32 +01:00
Louis-Antoine
325872de4e
Fix weird comment style
2020-02-21 17:17:39 +01:00
James R
e6dafe3002
Merge remote-tracking branch 'origin/master' into next
2020-02-20 17:30:50 -08:00
James R
441be52fd8
Fix NOPNG compiling
2020-02-20 17:30:32 -08:00
James R
168a1325f7
Fix NO_LUA compiling
2020-02-20 17:20:50 -08:00
James R
26ff2e0355
Fix compiler warnings
2020-02-20 17:18:26 -08:00
James R
aa0d40212e
Merge branch 'ogl-colorbug' into 'master'
...
Fix OpenGL "color bug"
See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R
4331b13952
Merge branch 'thin-fixed' into 'next'
...
Add more strings (and respective functions) for v.drawString().
See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
Sally Cochenour
18e3134efd
Make hook_FollowMobj a mobj hook instead of a player hook
...
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
2020-02-20 16:40:39 -05:00
Monster Iestyn
8eb80cbf75
clarify the situation a bit more in the comments
2020-02-20 20:38:01 +00:00
Monster Iestyn
7ee6ff2b03
move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified
2020-02-20 20:31:11 +00:00
Louis-Antoine
36a7539f33
SpaceSpaceSpaceSpace
2020-02-20 01:15:54 +01:00
James R
185c8a073e
:)
2020-02-19 14:44:22 -08:00
James R
ccfea66d68
Regex bruh moment
2020-02-19 14:37:42 -08:00
