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
fickleheart
0bbff7f6d4
[WIP, CRASHES] Save ghost data in netreplays
2019-02-16 12:42:24 -06:00
james
0c5cc4872f
Support splitscreen views in netreplays with less than four players
...
The first view is also not changed if there are no players to view.
2019-02-13 16:22:32 -08:00
fickleheart
1c6046ac43
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/g_game.c
# src/k_kart.c
2019-02-06 20:47:35 -06:00
fickleheart
e5cdf6d84d
Format for better consistency with the codebase
2019-02-06 20:25:45 -06:00
james
b17607c3c3
Expose G_ResetView and amend G_ResetViews
...
(fickle's suggestion.)
2019-02-04 20:13:30 -08:00
James R
8a1c6114a7
Add support for changing viewpoint via console
...
This isn't just a shameless console-empowerement. More precise "spying" can
benefit everybody. But especially in net-replays, this is almost necessary.
2019-02-04 03:09:40 -08:00
fickleheart
7d5649ad97
Make replays single-view by default unless requested
2019-02-01 20:19:52 -06:00
fickleheart
2a7bde2366
Refactor view changes a bit
2019-02-01 19:46:58 -06:00
fickleheart
4116c11152
Write skin/color/name changes to replay
2019-01-27 19:07:30 -06:00
toaster
e3836bf772
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods
2019-01-21 21:56:49 +00:00
TehRealSalt
815d287cbe
Final v1.0.2 commit (probably)
...
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
2019-01-18 04:30:38 -05:00
toaster
4a87838f06
* Refactor all instances of majormods = true; to route through G_SetGameModified, and catch a few spots I missed in the process.
...
* Make G_SetGameModified only console-print for major mods.
* Add amnesty to "major mod" detection while loading files with custom savedatas.
* Improved the console prints for command `isgamemodified`.
2019-01-17 22:01:28 +00:00
TehRealSalt
09da50000e
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
74aba46823
In-game music credits
2019-01-04 04:44:55 -05:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00