Commit graph

19110 commits

Author SHA1 Message Date
Sally Coolatta
33f316ded2 Calculate FPS stuff even if frame is skipped
I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging.
2022-03-26 16:32:43 -04:00
James R
af1177a92e Merge branch 'spring-level-up' into 'master'
Increase spring strengths by ONE

See merge request KartKrew/Kart!560
2022-03-24 19:39:48 +00:00
SteelT
44c95916b6 Merge branch 'battlesync' into 'master'
BATTLE SYNC

See merge request KartKrew/Kart!564
2022-03-24 01:28:28 +00:00
SteelT
da7a8e09cf Merge branch 'mergeladder-colormap-plane-fix' into 'master'
Fix colormap bug on Software renderer planes

See merge request KartKrew/Kart!565
2022-03-24 01:27:52 +00:00
James R
db619f1ed6 Fix bad merge @ 37e16db41e 2022-03-23 13:52:59 -07:00
toaster
b9864c9294 BATTLE SYNC
* Fix majority of Battle resyncs.
    * Change how Paperitem spawners work. Instead of rerolling the RNG if a map spot is already used, maintain a list of available spots...
    * Correct over-the-network type of player->spheredigestion.
    * Remove the condition that prevented the spheres' spawnpoints from being sent over the network, which meant they were only respawning on the host's end...
* Fix itemroulette on Battle playerarrow. (Rarely seen these days but still possible to observe as spectator for Break the Targets)
* Change draw order of Position Faces and Tab Rankings to allow for players' numbers to draw on top of the big out-of-bumpers X.
2022-03-23 00:34:23 +00:00
toaster
982c6d9a2e Merge branch 'boss-code-extras' into 'master'
Extra code changes for boss

See merge request KartKrew/Kart!563
2022-03-22 13:06:15 +00:00
SteelT
002e07dceb Merge branch 'mergeladder' into 'master'
Merge Ladder

See merge request KartKrew/Kart!558
2022-03-22 03:34:08 +00:00
SteelT
dbdaebbb04 Merge branch 'droptarget' into 'master'
"Drop Target" item

See merge request KartKrew/Kart!562
2022-03-22 03:33:54 +00:00
SteelT
60948d887a Merge branch 'unnerf-wall-transfer' into 'master'
Unnerf wall transfer speed

See merge request KartKrew/Kart!559
2022-03-22 03:33:40 +00:00
toaster
3aba8084d4 FORGOT 2022-03-22 01:34:12 +00:00
toaster
1d74dae951 Change order of item constants (Capsules makes them hard to change, now...) 2022-03-22 01:31:14 +00:00
toaster
e2640cbe9e Shadow adjustment (per VC discussion) 2022-03-22 01:00:22 +00:00
toaster
ee18d281bd Merge branch 'boss' into 'master'
Battle-related cleanup + Boss API

See merge request KartKrew/Kart!556
2022-03-21 23:44:54 +00:00
toaster
52d2472ed7 "Drop Target" item initial commit.
Most of the way there, but still a bit left to do.
2022-03-21 23:40:30 +00:00
James R
6dd38f001a Fix boss flash in opengl 2022-03-21 13:05:01 -07:00
James R
fbe3106890 Refactor R_SpriteIsFlashing into R_ThingIsFlashing
Checks for boss fret AND hitlag.
2022-03-21 13:03:30 -07:00
Sally Coolatta
48160b6417 Increase spring strengths by ONE 2022-03-21 00:46:58 -04:00
Sally Coolatta
995ebae2bd Unnerf wall transfer speed
(Sorry Ramp Park...)
2022-03-20 23:50:42 -04:00
toaster
2a40ab39fa Made a HOSTTESTERS build for Tyron, fixed some stuff that came up:
* Grand Prix temp menu now won't open if there are no cups available
* No more Boss Missions entry on the menu, since that won't exist post-newmenus
2022-03-19 11:43:12 +00:00
toaster
60ff5de92d Made a HOSTTESTERS build for Tyron, fixed some stuff that came up:
* Grand Prix temp menu now won't open if there are no cups available
* No more Boss Missions entry on the menu, since that won't exist post-newmenus
2022-03-19 11:42:00 +00:00
toaster
a6f4890421 Figured out what was wrong with splatsprites by comparing their drawing functions to the current state of 2.2's codebase. 2022-03-18 21:55:31 +00:00
toaster
ef0de0dec2 Splat stretch and squash isn't on the same axis, so just... don't do it, at least for now. 2022-03-18 21:31:22 +00:00
toaster
6cbeda5ec6 Add Encore support to splats (software; GL can come later). 2022-03-18 21:20:34 +00:00
toaster
09a99fa06d * Make RunOverlays and A_OverlayThink more consistent.
* Incorporate drawangle support for both (flattened merge of STJr/SRB2!1599)
2022-03-18 20:59:18 +00:00
toaster
b270b67c1d Limit array access for placed emblems.
(Partial merge of STJr/SRB2!1757)
2022-03-18 20:52:53 +00:00
spherallic
07901a6364 oops 2022-03-18 20:50:24 +00:00
toaster
ed00874f5f wip: staterange actions
# Conflicts:
#	src/doomdef.h
2022-03-18 20:50:03 +00:00
Hannu Hanhi
09885ce34b did not mean to remove this line 2022-03-18 20:44:14 +00:00
toaster
336010e616 Fix portals
- Resetting portalcullsector fixes the major visual glitches

- Using 32 bits for nummasks and i fixes crashes when rendering lots of portals

# Conflicts:
#	src/r_main.c
2022-03-18 20:44:07 +00:00
GoldenTails
5dc9df4c6a Allow people to update their Master Server listing on command. 2022-03-18 20:41:49 +00:00
toaster
786d263019 Make dedicated servers not pop up that annoying SDL error window
So they don't mess with shell scripts that expect SRB2 to exit when it crashes (like most other programs)

# Conflicts:
#	src/sdl/i_system.c
2022-03-18 20:41:11 +00:00
Hannu Hanhi
b7c23b9187 Fix software splats breaking and crashing in skyboxes 2022-03-18 20:39:02 +00:00
Hannu Hanhi
3083d97e16 Fix software splats not being clipped by ceiling walls 2022-03-18 20:38:17 +00:00
Hannu Hanhi
115004d704 Add missing optimization to npo2 sloped floor sprites 2022-03-18 20:37:16 +00:00
LJ Sonic
4b1ba2974d Do not attempt to disconnect when a packet checksum is invalid 2022-03-18 20:35:07 +00:00
MascaraSnake
b42715a5ca Fix offset calculation for segs that represent linedef backsides 2022-03-18 20:34:29 +00:00
toaster
5783c5aace Only load map lumps that are WADs or have no extension
# Conflicts:
#	src/w_wad.c
2022-03-18 20:31:17 +00:00
Hannu Hanhi
2a92a80e7a Improve OpenGL GDI Generic error message 2022-03-18 20:24:34 +00:00
katsy
7ddaf60a54 alternate fix to #555 which doesn't crash the game 2022-03-18 20:24:06 +00:00
MascaraSnake
6cabe55d3b Speed up taglist creation 2022-03-18 20:23:31 +00:00
Vincent Robinson
1d7fa9e0f5 Make linedef 96 apply to tags from 97-99, but not to itself 2022-03-18 20:20:39 +00:00
GoldenTails
96976fdba3 You probably don't want to memorise the formula to convert arccos to arcsin so 2022-03-18 20:16:23 +00:00
MascaraSnake
a6d921e37c Fix "all players" check in T_EachTimeThinker 2022-03-18 20:15:10 +00:00
katsy
45f848c4ed null gamestate during pre-intermission to prevent unwanted interaction 2022-03-18 20:14:17 +00:00
toaster
c2f427d858 Call the Lua timestamp function getTimeMicros
# Conflicts:
#	src/lua_baselib.c
2022-03-18 20:08:45 +00:00
toaster
9577dc26b9 Timestamp function for Lua
# Conflicts:
#	src/lua_baselib.c
2022-03-18 20:07:49 +00:00
Jaime Ita Passos
d5d8124ab8 Remove misplaced line from R_DrawTiltedSplat_NPO2_8 2022-03-18 19:59:58 +00:00
toaster
78b8def506 Allow fromnetsave to be used in P_SpawnSpecialsThatRequireObjects (missed element of the level load executor fix). 2022-03-18 19:59:28 +00:00
toaster
134f3b5df5 fix water fof height calculation on slopes
# Conflicts:
#	src/p_mobj.c
2022-03-18 19:54:19 +00:00