Sally Coolatta
cb5ab33a93
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
James R
04d774c765
Fix NOHW compiling
2020-08-24 18:06:00 -07:00
Sally Coolatta
e2f3e76db8
Merge branch 'next' into discord-rpc-support
2020-08-23 05:32:32 -04:00
FlykeSpice
c09cb6d762
Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
FlykeSpice
00137ef4ea
Remove ESLOPE #ifdef(backport from srb2 2.2)
2020-08-20 13:02:13 -04:00
Sally Coolatta
83192827dc
Fix ZONE being all caps, standardize the function comments
2020-08-17 06:13:32 -04:00
Hannu Hanhi
44159de7f3
Colormap alpha handling was still wrong, hopefully it's correct now
2020-06-14 15:03:40 +03:00
Hannu Hanhi
c382794109
Fix uninitialized alpha when reading colormaps
2020-06-13 23:34:13 +03:00
Hannu Hanhi
d9e2336277
Guil's encore color bugfix with some additional cleanup
2020-06-01 21:14:17 +03:00
Ashnal
e33e15d87f
Fix dedicated servers not waiting for client wipes.
...
Now they run wipe logic to wait the same amount of
time that clients do, without actually rendering anything.
Previously, the server would start the new map immediately,
and clients would frameskip up to the server when they were done wiping.
2020-04-21 19:16:31 -05:00
Wolfy
da2a640c6c
Merge remote-tracking branch 'remotes/bird/isolatedbatching' into awful-mix
...
# Conflicts:
# src/hardware/hw_cache.c
# src/hardware/hw_draw.c
# src/hardware/hw_glob.h
# src/hardware/hw_main.c
# src/r_bsp.h
# src/r_data.c
2020-04-11 23:47:25 -05:00
Latapostrophe
43e5718851
Merge branch 'push-more-lua' into awful-mix
2020-03-11 07:37:47 +01:00
Latapostrophe
37c733b8c2
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Latapostrophe
6da057167d
Merge branch 'antifreeze' of https://gitlab.com/fickleheart/srb2kart-mods into awful-mix
2020-03-10 21:46:12 +01:00
Latapostrophe
d43ed7f74c
Merge branch 'gl-qol' into v1.2-frankeinstein
2020-03-10 20:34:20 +01:00
fickleheart
b8e4af3f8d
SUPER EXPERIMENTAL FREEZE-B-GONE
2020-03-05 22:19:39 -06:00
Latapostrophe
aab87012df
dontencoreremap flag + colormaps
2019-11-12 00:40:25 +01:00
Latapostrophe
18c8f47f9a
fix rewind, fix sound local sound playing in freecam
2019-09-09 22:15:50 +02:00
Latapostrophe
bf13726c1e
encore colormaps, fixups + flat align
2019-06-13 10:14:07 +02:00
Latapostrophe
ff04e0c103
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
de5e44cfbc
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
wolfy852
f61f7f4411
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
2c363c4e1e
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
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
fickleheart
6267986c72
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
4b7d2aea84
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
4f8d1383b0
Self-reminder...
2019-03-19 23:45:45 -05:00
fickleheart
3d36f531b9
Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays
2019-03-19 23:44:39 -05:00
fickleheart
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
Jaime Passos
1cfdd07ee0
gl4
2019-03-17 22:27:50 -03:00
mazmazz
6cf05a4613
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
James R
af19a2c29d
Do not record replays when dedicated
2019-03-04 22:26:05 -08:00
fickleheart
c6f6783f3e
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
2019-03-03 20:24:39 -06:00
Sally Cochenour
4f01202bb5
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:22:38 -05:00
fickleheart
d6b9a75230
Move fov cvar out of OGL-specific code
2019-02-23 10:18:20 -06:00
James
09c3fd4329
Hyu b gone
2019-02-19 23:15:31 -05:00
fickleheart
dd75c1621c
Fix compile warnings
2019-02-06 21:03:05 -06:00
fickleheart
6da810a994
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
Sryder
caba5cb02e
P_NetKeepAlive should also be here because it potentially pauses mid-game!
2019-02-04 21:54:10 +00:00
fickleheart
7aa83635ae
Record net replays to replay/online/
2019-02-03 14:29:54 -06:00
fickleheart
43c4917e96
Tack on a timestamp to replay filenames
2019-02-01 01:01:14 -06:00
fickleheart
ab226c1e39
Move where multiplayer replays are started
...
This particularly allows a server to record the
first map after startup as a replay. Players
joining mid-map can no longer record replays tho
2019-01-27 15:45:08 -06:00
toaster
1a21c5efbe
Code cleanup as requested by Sal and Sryder.
...
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
toaster
66273898b7
* 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
toaster
081872aa85
First steps at implementing a mechanism that allows you to load non-cheaty good-faith mods such as custom characters with no Lua scripting, and play record attack with them. Features a few bad hacks and a few more areas of improvement; I'll try to iron them out before they hit next or master.
2019-01-15 19:01:55 +00:00
TehRealSalt
37e79ebfbd
Redone credits for joiners in a less stupid way, + redone start ambience in a less stupid way
2019-01-10 01:03:53 -05:00
TehRealSalt
de72403fb9
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
TehRealSalt
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
TehRealSalt
5e8e08ad95
Misc level init fixes
2019-01-08 20:14:58 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
