stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-26 22:31:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
14642 commits 173 branches 41 tags 186 MiB
Commit graph

14642 commits

This branch
This branch
All branches
Author SHA1 Message Date
sphere
4bd296f98f Merge branch 'issue933' into 'next' 
Fix for issue #933 - special stage tokens should divert player until after the...

See merge request STJr/SRB2!1910
 2023-08-21 08:20:43 +00:00
spherallic
40d9614c32 Clear thing flags for NiGHTS bumpers/hoops again 2023-08-21 00:43:01 +02:00
spherallic
ce721f9f78 Allow input during title animation after 1st play 2023-08-20 23:40:13 +02:00
sphere
32a40e3dbe Merge branch 'alphabetsoup' into 'next' 
Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen

See merge request STJr/SRB2!1642
 2023-08-20 17:29:03 +00:00
katsy
1a0d9eab79 Add supername parameter to S_SKIN: displays a custom super name on the GOT THEM ALL screen 2023-08-20 17:29:03 +00:00
sphere
d4aac9a857 Merge branch 'fix-freebsd-build' into 'next' 
Fix FreeBSD build errors

See merge request STJr/SRB2!2071
 2023-08-20 17:19:39 +00:00
sphere
3d0457d58b Merge branch 'preserve-texture-col-frac' into 'next' 
Use separate table for maskedtexturecol (resolves #635)

Closes #635

See merge request STJr/SRB2!2073
 2023-08-20 17:19:18 +00:00
sphere
8b7978ec35 Merge branch 'color-tweaks' into 'next' 
Small color tweaks

See merge request STJr/SRB2!2116
 2023-08-20 17:18:58 +00:00
sphere
4a89fc77c1 Merge branch 'fof-rendering-mishaps' into 'next' 
Fix a couple of FOF rendering issues

See merge request STJr/SRB2!2115
 2023-08-20 17:17:41 +00:00
sphere
5069e77d20 Merge branch 'fix-misplaced-color' into 'next' 
Resolve #1086

Closes #1086

See merge request STJr/SRB2!2114
 2023-08-20 17:17:34 +00:00
sphere
5dba53009e Merge branch 'recap-flip-spin' into 'next' 
Fix interpolation when curling up or scaling while flipped

Closes #983

See merge request STJr/SRB2!1979
 2023-08-20 17:16:53 +00:00
sphere
b533594a33 Merge branch 'udmf-absolutez' into 'next' 
Add absolute Z height flag for mapthings in UDMF

See merge request STJr/SRB2!2015
 2023-08-20 17:16:02 +00:00
sphere
9d6578d42f Merge branch 'weaponshadow' into 'next' 
Correct emerald & weapon ring/panel hitboxes, give drop shadows to weapon rings & panels

See merge request STJr/SRB2!2036
 2023-08-20 17:15:44 +00:00
spherallic
b52a36f04c Small tweaks to Foundation and Midnight 2023-08-20 18:38:14 +02:00
spherallic
50fc1abf9a Revert invcolor tweaks for Red/Rosy/Lavender 2023-08-20 18:30:30 +02:00
Sally Coolatta
40c37ce4c2 Revert left/right movement 2023-08-20 12:05:58 -04:00
Sally Coolatta
9c8dd54751 Fix color grid not extending to the very bottom 2023-08-20 11:56:55 -04:00
spherallic
f62c2f4c75 Fix arg # typos for "visible from inside" checks 2023-08-20 17:55:06 +02:00
spherallic
259732cccb Make FOF fades use 0-255 alpha, not 1-256 2023-08-20 17:42:27 +02:00
Sally Coolatta
4d1e6df2d7 Fix color grid input bugs 
There's still some slight awkwardness trying to wrap downwards into uneven row grids, but this is significantly better and this already took up way more time than I wanted it to.
 2023-08-20 11:28:39 -04:00
Sally Coolatta
2f1db66e78 Fix drawing of final color 2023-08-20 07:37:10 -04:00
Sally Coolatta
91fc3302cd Merge branch 'master' into next 2023-08-20 07:32:09 -04:00
James R
909e07be65 Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile 
- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
 2023-08-20 07:31:10 -04:00
Sally Coolatta
b5b7b7c1e3 Merge remote-tracking branch 'upstream/master' into next 2023-08-20 00:23:26 -04:00
Sal
ec559612b9 Merge branch 'nights-pull-emblem-fix' into 'next' 
Don't NiGHTS pull emblems you can't collect

See merge request STJr/SRB2!2113
 2023-08-20 04:03:07 +00:00
Sally Coolatta
9d9b6d83c2 Don't NiGHTS pull emblems you can't collect 2023-08-19 23:58:43 -04:00
Sal
3bcd1dc25a Merge branch 'write-color-properly' into 'next' 
Fix P_WriteSkincolor

Closes #1068

See merge request STJr/SRB2!2112
 2023-08-20 03:41:51 +00:00
Sally Coolatta
d589953fc4 Fix P_WriteSkincolor 2023-08-19 23:39:54 -04:00
Sal
b6f41bd7b8 Merge branch 'cheated-fixes' into 'next' 
Level select cheat fixes

Closes #1090

See merge request STJr/SRB2!2111
 2023-08-20 03:16:14 +00:00
Sal
7ef7de1bc5 Level select cheat fixes 2023-08-20 03:16:14 +00:00
Sal
f0b09dec6b Merge branch 'linux-render-switching-fix' into 'master' 
fix linux renderer switching

See merge request STJr/SRB2!2110
 2023-08-20 02:43:26 +00:00
bitten2up
93f11508fc
remove stray else 2023-08-19 19:52:10 -05:00
spherallic
623fa126ad Fix backside ceiling vertex slopes 2023-08-18 15:08:12 +02:00
spherallic
07ef7c4639 Prevent FOF alpha from wrapping around in OpenGL 2023-08-17 20:15:03 +02:00
spherallic
66cc6a5f44 Correct flags for partially intangible FOFs 2023-08-17 19:31:55 +02:00
spherallic
9b296a1547 Disable Makefile deprecation warning for now 2023-08-17 19:27:33 +02:00
Zwip-Zwap Zapony
db59ec5998 Fix interpolation when curling up while flipped 
Also fix scaling interpolation while flipped, and fix the NiGHTS Drone flip interpolation on its first tic
 2023-08-17 17:39:24 +02:00
sphere
207aba0a52 Merge branch 'fix-segfault-emerald-hunt-spec' into 'next' 
Fix segfault when spectating on an Emerald Hunt map

See merge request STJr/SRB2!2105
 2023-08-16 11:12:40 +00:00
Lactozilla
976b9b862d Restore player skins if forced skin restrictions are lifted 2023-08-15 13:51:12 -03:00
Monster Iestyn
3eaa365706 Merge branch 'fix-mobj-flag-fumblings' into 'next' 
Fix Mobj Flag Fumblings

See merge request STJr/SRB2!2107
 2023-08-15 16:12:24 +00:00
Lactozilla
dd4deaa5e9 Reduce code duplication 2023-08-15 12:43:31 -03:00
Lactozilla
8d56a4d32e Move splitscreen code path out of SetSkinLocal and into SendNameAndColor 2023-08-15 12:37:18 -03:00
Lactozilla
a745997243 Better handling of cv_skin/cv_playercolor in singleplayer 2023-08-15 12:27:38 -03:00
Lactozilla
e106b56b53 Only set the picked character once 2023-08-15 04:45:50 -03:00
Lactozilla
062af20628 Don't change cv_skin or cv_playercolor if there is no need to 2023-08-15 04:29:50 -03:00
Lactozilla
0bb65166c9 Always allow changing color in multiplayer player setup menu 2023-08-15 03:49:31 -03:00
Lactozilla
9dc2447559 Ensure the correct color is set for the player object in splitscreen 2023-08-15 03:46:55 -03:00
Zwip-Zwap Zapony
5830ff500f Fix mobj flag fumblings 2023-08-14 19:05:48 +02:00
Gustaf Alhäll
3d14d155e0
Fix segfault when spectating on an Emerald Hunt map 2023-08-12 12:31:59 +02:00
SteelT
3fbdaa61b7 Merge branch 'cherry-pick-86367e4e' into 'next' 
Add gametype parameter to G_SetCustomExitVars and G_ExitLevel

See merge request STJr/SRB2!2101
 2023-08-10 00:01:24 +00:00