SteelT
d62229a25f
Merge branch 'nadraw-fix' into 'master'
...
Fix NiGHTS Attack crash after render mode change
See merge request STJr/SRB2!837
2020-03-14 22:19:35 -04:00
SteelT
f9912eaad5
Merge branch 'hwrflipcolchromakey' into 'master'
...
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
SteelT
6fa5ec298c
Merge branch 'tex' into 'master'
...
Replace NextTexAvail with glGenTextures
See merge request STJr/SRB2!828
2020-03-14 22:12:02 -04:00
SteelT
84d5b72735
Merge branch 'acz-fence' into 'master'
...
Fix ASTBlendPixel blending with nothing
See merge request STJr/SRB2!827
2020-03-14 22:11:23 -04:00
sphere
db26ce5139
Check if emblem hints are actually unlocked.
2020-03-13 10:46:57 -04:00
Monster Iestyn
8d7d0c4dc5
Merge branch 'master' into next
2020-03-09 19:53:08 +00:00
Monster Iestyn
fb2b105159
Merge branch 'archive-sprite2-hotfix' into 'master'
...
Archive sprite2 Hotfix
See merge request STJr/SRB2!845
2020-03-09 15:50:55 -04:00
LJ Sonic
bdbcdfe595
Merge branch 'patch-1' into 'master'
...
Fix desyncs never recovering if node and player mismatch
See merge request STJr/SRB2!842
2020-03-09 12:56:41 -04:00
Monster Iestyn
5defb33266
One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it
...
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
2020-03-09 15:04:22 +00:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Monster Iestyn
34c4da018a
Reorganise r_things.h
2020-03-08 21:17:30 +00:00
Monster Iestyn
d35464204e
Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
...
This way we don't have to make it some extern in order for r_skins.c to use it
2020-03-08 19:51:18 +00:00
Monster Iestyn
12468abff5
update Makefile, CMakeLists.txt and MSVC project files
2020-03-08 19:48:23 +00:00
Monster Iestyn
a12833ccd2
remove r_skins.c include in r_things.c, on second thoughts
2020-03-08 19:36:56 +00:00
Monster Iestyn
9013398151
Create r_skins.c/.h, to contain skins code formerly in r_things.c/h
2020-03-08 19:32:07 +00:00
colette
e4a3fcea26
Fix resyncs never recovering if node and player mismatch
2020-03-08 13:09:39 -04:00
Tatsuru
7532a4879f
I guess
2020-03-08 14:06:18 -03:00
Steel Titanium
b9c7eafdfe
Fix guest data being deleted regardless of choice
2020-03-08 00:34:15 -05:00
Steel Titanium
0cd8a94a5b
Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu
2020-03-08 00:02:43 -05:00
GoldenTails
69a9f44259
Fix spaces before someone yells at me for it
2020-03-07 21:48:40 -06:00
GoldenTails
e0f6559595
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
...
Disclaimer: I'm not actually from Florida.
2020-03-07 21:41:52 -06:00
SteelT
3117d2782c
Merge branch 'ss-damage-fix' into 'next'
...
Fix Special Stages crashing upon taking damage
See merge request STJr/SRB2!839
2020-03-06 17:59:57 -05:00
Zipper
5c9e689d04
Update p_inter.c
2020-03-05 18:48:20 -05:00
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
Zwip-Zwap Zapony
160b5b9b8e
More gamepad deadzone tweakage
2020-03-04 21:44:57 +01:00
Zwip-Zwap Zapony
c2a7f0c98e
Hotfix for 100% deadzone returning 0 input
...
It makes more sense for 100% deadzone to just make it so that
you have to push the axis all the way to trigger it,
rather than 100% deadzone resulting in no axis input
ever happening... So, let's make it be the former way instead
2020-03-04 21:11:55 +01:00
Zwip-Zwap Zapony
04921ab484
Fix division-by-0 crash with gamepad deadzones
...
Fix division-by-0 crash with gamepad deadzones
The problem was that it checked if A was more than B,
then lowered A to a max value, then subtracted B from A,
then divided something by that, without checking if A minus B was 0,
allowing division by 0 if B was the same as that max value
This fixes that by making sure that A is less than the max value
2020-03-04 17:31:52 +01:00
Jaime Passos
b800e013d0
Fix NiGHTS Attack crash after render mode change
2020-03-04 09:42:34 -03:00
Tatsuru
0e281a12e1
Separate PvP damage from non-friendly gametypes
2020-03-03 11:56:57 -03:00
Tatsuru
06a2882dc9
Never forget who your enemy is
2020-03-03 11:40:35 -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
Louis-Antoine
ad1b4066d9
Increase the length of the player input buffer
2020-03-02 15:36:28 +01: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
sphere
422bc7439b
Actually use the "SCREENSHOT OPTIONS" header for its menu.
2020-03-02 13:23:54 +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
Jaime Passos
fa8e87ea16
Set pixel RGBA to nothing instead of the alpha only
2020-02-29 19:36:50 -03: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
86dd35c32b
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
623974bf88
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
0b63c2a3cc
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00
Jaime Passos
d62090afae
Fix ACZ fence texture
2020-02-28 17:33:58 -03:00
Jaime Passos
875afea599
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
2020-02-28 17:31:41 -03:00
Jaime Passos
43efbe4ba5
Merge remote-tracking branch 'origin/master' into next
2020-02-25 22:43:15 -03:00