Louis-Antoine
d3b113c84a
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
Louis-Antoine
28b0b7c404
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
MascaraSnake
302e122d64
Merge branch 'map-by-name' into 'master'
...
New map command
See merge request STJr/SRB2Internal!424
2019-11-13 13:45:36 -05:00
toaster
f7c5774b7e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
toaster
2a16cf539a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
91d2beebfa
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
James R
08ad257e17
Extend map name text matching code into a function
2019-10-27 14:23:03 -07:00
James R
96a12b6bed
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
TehRealSalt
c963a49542
Try fixing Auto causing desyncs
...
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)
Replay menu will still display wrong speed name, but it's fine in the replay itself.
2019-10-17 23:43:06 -04:00
Jaime Passos
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
toaster
eb315d3662
Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?)
2019-09-18 16:06:13 +01:00
Latapostrophe
0599d23254
get replays to save player lua vars
2019-09-10 11:59:17 +02:00
Latapostrophe
0505a6f0cc
fix rewind, fix sound local sound playing in freecam
2019-09-09 22:15:50 +02:00
Latapostrophe
1d66d8e213
replay freecam + enhancements
2019-09-05 23:24:23 +02:00
Jaime Passos
4304c34679
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 23:35:36 -03:00
James R
d51b516446
Show a negative number to indicate ammo penalty
2019-08-26 16:07:17 -07:00
mazmazz
4ac4034eb9
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
toaster
dec517f224
Merge branch 'ending' into 'master'
...
ENDINGS
See merge request STJr/SRB2Internal!264
2019-08-03 16:23:51 -04:00
toaster
ac91f122ce
* Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated.
2019-07-30 17:24:21 +01:00
toaster
8ac6d43886
* Made the evaluation screen even more attractive.
...
* Fixed an unused variable warning in lua_skinlib.c.
- fixed post-level cutscenes playing when you get game over in MP (still kinda on-topic)
Also with apologies to MI:
- golden egg statue mode for tutorial, since the grey doesn't contrast enough with the blue and lime green
- fixed closed captions for replaced player sounds being incorrect
- fixed closed captions overlapping tutorial text
2019-07-29 14:55:36 +01:00
mazmazz
14df513db6
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
11955ba838
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
Latapostrophe
a0e27c22e7
make followers work with replays
2019-05-12 13:41:46 +02:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
3a707c093b
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
2019-05-01 23:30:53 -04:00
TehRealSalt
089be795a2
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
fickleheart
fb3d5ec7f0
Record demos consistently and also other stuff
2019-04-07 17:59:32 -05:00
fickleheart
25ff05fdd0
Add demo rewinding
...
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
fickleheart
c466412902
Begin work on playback menu
2019-04-05 02:38:48 -05:00
fickleheart
b8ef18e983
Read and write standings to replays
2019-04-01 15:07:27 -05:00
fickleheart
aa1546a533
Show non-default lap count on replay screen too
2019-04-01 12:56:23 -05:00
fickleheart
3dd4e4aac7
Return to replay hut after watching a replay
2019-03-31 19:26:53 -05:00
fickleheart
f00f9c9a0a
Display infobox for the currently-selected replay
2019-03-31 02:54:09 -05:00
fickleheart
29a80e01eb
List demos by title in the replay hut
2019-03-31 01:22:41 -05:00
fickleheart
91868fc3a4
Allow entering a title for replays on save
2019-03-24 22:40:52 -05:00
fickleheart
8d9462d4aa
Refactor replay saving handler for later use
2019-03-24 21:55:08 -05:00
fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
fa28feb8db
Add command to lower netreplay sync frequency
...
This makes for smaller replay files while keeping
sync checks in place!
2019-03-19 23:39:04 -05:00
fickleheart
be458c1d05
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
Monster Iestyn
5d059da843
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
# Conflicts:
# src/doomstat.h
# src/m_menu.c
2019-03-18 22:00:23 +00:00
James R
b91701c948
Miscellaneous window de-focus options
...
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.
(showfocuslost now loads from config.)
2019-03-11 14:57:11 -07:00
fickleheart
ed16a35795
Don't force loading files for replays
2019-02-17 10:04:48 -06:00
fickleheart
63d07acc38
Fix duplicated player views from ResetViews
2019-02-16 22:24:37 -06:00
fickleheart
53fa9299c1
Fix views getting automatically changed in netreplays
2019-02-16 22:06:47 -06:00
fickleheart
5a5264e5dd
Fix multiplayer ghosts crashing the game sometimes
2019-02-16 21:55:08 -06:00
fickleheart
8ae26d24e3
Merge remote-tracking branch 'remotes/james/netreplays-viewcommand' into new_netreplays
...
# Conflicts:
# src/g_game.c
2019-02-16 20:20:11 -06:00
fickleheart
d2b34a0e20
Add cvar for netreplay saving options
2019-02-16 18:29:51 -06:00
fickleheart
7c6226ee91
Try to keep the RNG seed in sync
2019-02-16 14:24:00 -06:00
