f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04:00
5dc30cdac8
Fix skin shit
2019-05-02 00:39:49 -04:00
1f61397545
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
7fc1f02b07
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
50c0ed0f07
Fix bad merge in map data archiving code
2019-03-16 14:56:56 -05:00
fd92612382
Merge branch 'minor-item-tweaks' into 'next'
...
Assorted item tweaks
See merge request KartKrew/Kart-Public!85
2019-03-07 21:24:51 -05:00
4e0518a85a
Merge branch 'master' into next
2019-03-07 00:23:17 -06:00
f57335deef
Check that lumps are okay
2019-03-04 22:13:22 -08:00
014466cc67
Merge branch 'next' into minor-item-tweaks
2019-02-22 19:30:52 -05:00
0eb30bceb7
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
09c3fd4329
Hyu b gone
2019-02-19 23:15:31 -05:00
1785adffc2
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
26770c5103
[HACK] Save correct lap count on netreplays
2019-01-27 15:45:42 -06:00
0251814095
Minor whitespace
2019-01-15 21:56:46 -05:00
26af4e8561
Save stored turn ranges in NetArchivePlayers
2019-01-08 23:27:39 -06:00
2422501ab9
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
e2a9aeb34c
Require 3/5ths of checkpoints instead of 1/2
...
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00
b53cd70201
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
d467399480
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05:00
6f5e3d42ff
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
c548aaa347
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
3f35ffd7c6
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
9f18164ad4
The motherload: all of my Lua is hardcoded
...
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -04:00
08791269be
Merge branch 'new-spb' into 'master'
...
New SPB
See merge request KartKrew/Kart!56
2018-10-24 16:04:29 -04:00
d93a4106b6
Merge branch 'some_scaling_stuff' into 'master'
...
Two scale things I noticed.
See merge request KartKrew/Kart!51
2018-10-24 16:01:39 -04:00
2021897972
Merge branch 'master' into new-spb
2018-10-19 17:45:06 -04:00
1f15d87b68
No more whack-a-mole (not 100% certain all of these are correct, please check the diff closely before reinstating plusone sal)
2018-10-19 21:53:02 +01:00
8d6e203bd2
New SPB
...
May not make it to R1, but oh well
2018-10-18 04:43:50 -04:00
362cbeb6b5
Merge branch 'master' into no-spectate-griefing
2018-10-16 16:38:35 -04:00
01c48c88d0
Prevent spectate griefing
...
If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
2018-10-15 18:41:34 -04:00
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
8196c59557
Merge branch 'master' into next
2018-10-09 22:55:55 +01:00
b1e02467bf
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
ab59504be0
Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit
2018-09-29 20:28:27 +01:00
20c4702986
Line exec trigger netsync: Save var2s in addition to vars
2018-09-17 14:13:31 -04:00
546fa383c1
Make sure that T_MarioBlockChecker is synced in netgames, so that the textures of Mario Blocks can change when there are no more items
2018-09-14 21:01:07 +01:00
806353c86a
Fixed Encore remappings not being loaded when joining mid-netgame.
2018-08-12 11:20:53 +01:00
bd78c34b99
Encore mode - a fresh take on mirror mode!
...
* Palette remaps.
* Branding.
TODO:
* Doesn't work in GL. (Mostly.) I have SOME ideas on how to tackle this, but...
* Transmaps are broken in Encore for some reason.
* I tried to make in-level colormaps shimmy over, but it didn't quite work, so I commented it out and only semi-fixed it.
2018-07-23 23:50:41 +01:00
a4299ce069
Map reset timer
2018-07-21 15:54:05 -04:00
5d342f32c8
Merge branch 'master' into sonicitems
2018-07-06 23:33:54 +01:00
e37efda57e
Fix a crashy oversight in the archiving!
2018-07-06 23:18:18 +01:00
5c5cbeeea2
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems
2018-07-06 20:40:47 +01:00
6fc29ce37d
Always send gamestate to joiners.
...
It's cut down already outside of levels, needed to stop Lua sending mobj references during intermission though.
This is needed because in the past there was a separate way to send player information to joiners that has since been removed. Meaning player information is always desynched for joiners during anything but levels.
2018-07-06 20:25:13 +01:00
fbcf566874
WANTED recalculates on hit, tons of spectator changes
2018-07-03 21:12:25 -04:00
5c7b66cc0f
WANTED
2018-07-01 04:36:09 -04:00
dcec24605e
* AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN!
...
* Super important to allow dedicated servers to continue forever without needing to add Terminal.
* To facilitate understanding, add gametype dog-ears to the vote screen!
* To do the above, add V_DrawDiag! Works in GL, too!!
* Unrelated shit!
* Fix a buffer overrun in the randmapbuffer!
* Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn...
* Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 15:47:56 +01:00
1305befcde
Disable viewheight cvar and vanilla's irrelevant first person HUD stuff, move Viewpoint HUD to a nicer spot
2018-06-26 11:33:54 -04:00
TehRealSalt