James R
04b6911e21
Merge branch 'sloped-camera' into 22-merge-again
2021-04-01 20:55:22 -07:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
d63b428565
Merge Kart-Public next
2021-02-27 02:16:21 -05:00
Sally Coolatta
10319386c2
Do starttime calculation on second tick instead
...
Attempts to fix replays & adding bots.
2021-02-11 20:25:22 -05:00
Sally Coolatta
90ca38acb0
Store where the finish line beam should be displayed
...
Instead of figuring out where it should be every tick while it's visible, store where it'll be at the start of the map.
Also moved finish line beam into a new file, k_race.c/h, for any Race-specific code.
A few unused variables for sprint map support later too
2021-02-05 01:24:23 -05:00
Sally Coolatta
237f86749d
Merge branch 'master' into finish-line-beam
2021-02-01 23:31:19 -05:00
James R
2e649de64f
Merge branch 'high-resolution-timer-2' into next
2020-12-10 02:55:02 -08:00
James R
71553a8ad0
Merge branch 'battle-rethink' into 'master'
...
Battle rethink
See merge request KartKrew/Kart!335
2020-11-29 19:13:38 -05:00
toaster
762dfd3063
When resuming from a rewind, don't:
...
* run wipes again
* run titlecards again
* stop the music
2020-11-28 12:31:16 +00:00
toaster
f72108c4fa
A whole bunch of cleanup to get most record attack/replay stuff reasonably functional.
...
* Fix the screen being stuck black at the very start of start record attack.
* Bump up the demoversion to 7, because I want all previous v2 demos to be guaranteed kaput (it was previously 4, but 7 is a nice number).
* Fix a ton MORE shitcausing misalignments in the replay system, this time specifically focused on getting ghosts functional.
* Plug a few holes in the "best lap" record implementation that allowed for stupidly easy records due to the way v2's finish lines work.
* Make a few follower-related things sane, to prevent spurious console prints that were getting in the way of my test prints.
2020-11-27 20:30:28 +00:00
James R
fe031088ae
Lua: "defrosting" global to tell how many tics are processing in the preticker
2020-11-24 19:32:01 -08:00
Riku Salminen
0cefac70d3
Declared the cvar in netcmd to get rid of warnings
2020-11-10 13:53:31 +02:00
Riku Salminen
16a4ab37d3
Try to add cvars for old camera
2020-11-10 13:21:34 +02:00
Riku Salminen
27931ca32e
Update p_tick.c, Replacing mobj angle with cmd angleturn
2020-11-10 13:21:34 +02:00
Riku Salminen
bb16216839
Update p_tick.c, got rid of an useless angle change function
2020-11-10 13:21:34 +02:00
Riku Salminen
1d1b508cc8
Make the replay camera follow the player
2020-11-10 13:21:33 +02:00
Sally Coolatta
11872504ae
Merge master
2020-11-08 01:26:40 -05:00
James R
27fbf77922
Huge perfstats refactor
...
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
2020-11-07 01:32:59 -08:00
James R
cacca05ed3
PreThinkFrame and PostThinkFrame hooks
...
Changes from e4d1b9491c4456ff50ab20494c4c42ee0e68d8dc
2020-11-05 21:04:25 -08:00
Sally Coolatta
ddee6257e7
Move to P_RunThinkers
2020-10-26 23:46:56 -04:00
Sally Coolatta
62139f144a
Paper item spawners
...
Code is a little horrendous in a few places but I will hopefully fix later :V
2020-10-26 22:20:02 -04:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
James R
c5df256d9e
Make fucking with the window optional
2020-09-24 16:49:34 -07:00
James R
79fda7b814
bruhhhhh
2020-09-24 16:49:34 -07:00
James R
68bd632bac
You have entered the comedy area
2020-09-24 16:49:34 -07:00
James R
c82ac33c0c
Rumble rumble
2020-09-24 16:49:33 -07:00
Sally Coolatta
ef8f2e6fa4
Minor touchups to netcode
2020-09-22 01:53:28 -04:00
Sally Coolatta
99a1bacb81
Turning code overhaul
...
Packet drops are still broken, but at least netgames are playable now.
2020-09-22 00:35:44 -04:00
Sally Coolatta
0b31f71b61
Merge branch 'master' into finish-line-beam
2020-08-29 21:53:04 -04:00
Sally Coolatta
dfd733eb80
Up to screen.o
...
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Sally Coolatta
9b9ab8a2d5
Get up to p_user
2020-08-14 23:23:14 -04:00
Sally Coolatta
5a98c00405
NOW we make it past p_mobj
2020-08-14 22:28:49 -04:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
f8d1e75025
Merge remote-tracking branch 'public/next'
2020-08-12 18:50:41 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
c96bd5f64a
Many removals
...
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -04:00
Sally Coolatta
8071ec92e8
InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis
2020-08-10 17:00:45 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
SteelT
9cfe5513c2
Merge p_tick.c
2020-08-08 15:40:24 -04:00
AJ Martinez
e5463afb58
Fix Hyudoro cooldown never resetting
2020-08-06 10:51:53 -05:00
AJ Martinez
2422d1c5b7
Fix indirect item cooldown never resetting
2020-08-06 10:34:16 -05:00
Sally Coolatta
4e4598d784
Fault line is here
2020-07-30 06:25:34 -04:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
SteelT
dbd5198ac2
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Louis-Antoine
d886e35576
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
toaster
5495ea16aa
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default.
...
* Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 16:33:20 +01:00
Latapostrophe
6c68c95654
Make explosions cause earthquakes and initiate flashpals
2020-05-14 17:55:33 +02:00
