Latapostrophe
e2c72c08cd
Fix map load crash and other additions / clean ups
2019-03-07 23:10:07 +01:00
Jimita the Cat
f8ed0857c0
a
2019-03-06 21:40:38 -03:00
Alam Arias
c4c744d27a
Merge branch 'next' into followme
2019-03-04 17:17:35 -05:00
Alam Arias
aaccb4edff
fixed compiling for MSVC 2017
2019-03-04 16:33:06 -05:00
Latapostrophe
169ec43eec
add some Lua support, hit confirm animations and fix some stuff
2019-03-04 21:35:58 +01:00
fickleheart
843bc6bc1b
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
2019-03-03 20:24:39 -06:00
Latapostrophe
d8576b0bbc
Add more customization options & fix some dumb things
2019-03-03 21:12:21 +01:00
Alam Arias
6071b78cf3
fixed compiling for MSVC
2019-03-02 18:57:52 -05:00
Alam Arias
2ff308251c
Merge branch 'next' into followme
2019-03-02 18:42:21 -05:00
Latapostrophe
b5b1ca6e26
Fix splitscreen, offline and death
2019-03-02 22:39:42 +01:00
Monster Iestyn
974e3aa4f2
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00:00
wolfy852
2c85e79c6a
Fix players crashing when joining netgames with active followers
2019-02-26 17:09:24 -06:00
Monster Iestyn
e7952e4de7
Make sure that B_CheckRespawn can be called even if Tails is dead
2019-02-26 21:14:22 +00:00
fickleheart
39603af6a1
Add field-of-view support in software mode
2019-02-23 10:31:37 -06:00
fickleheart
bca918cdbf
Let titledemos play while game is unfocused
2019-02-18 20:51:28 -06:00
fickleheart
d2b34a0e20
Add cvar for netreplay saving options
2019-02-16 18:29:51 -06:00
fickleheart
0bbff7f6d4
[WIP, CRASHES] Save ghost data in netreplays
2019-02-16 12:42:24 -06:00
Latapostrophe
92ab2845c8
Followers but they crash when you join netgames
2019-02-14 03:56:28 +01:00
Monster Iestyn
2ef1d63b63
Fix compiler warnings
2019-02-13 18:06:56 +00: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
Sally Cochenour
3d84c7c6c5
Merge branch 'next'
2019-02-05 22:02:08 -05:00
Sally Cochenour
fc7ad66497
Merge branch 'next'
2019-02-05 21:10:55 -05:00
Alam Arias
380bce88a0
remove whitespaces
2019-02-05 15:42:37 -05: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
Sally Cochenour
475b35fa33
Instant lookback
...
Still weird snap but this is as good as it'll get short of throwing away all of the camera code
2019-02-03 23:13:42 -05:00
Sally Cochenour
3d64a98684
Merge branch 'next' into ingame-player-cap
2019-02-03 17:23:50 -05:00
Sally Cochenour
2c8c994324
In-game player cap & spectator queue
...
Force everyone beyond a certain point to spectate -- spectators get to queue up. In response to me doing a 1v1 match, tons of people wanting to join to watch, and just relying on honor system to prevent mid-joiners. Spectators are prioritized by how long they've been waiting. I'm thinking of hijacking base SRB2's team scramble for a scramble option later.
2019-02-03 16:43:11 -05:00
fickleheart
3618de853e
Play generic intermission music after netreplays
...
Mostly because I kept cycling to other people after the
top half finished and always got the lose music as a
result lol
2019-02-02 10:54:24 -06:00
toaster
4e4d663b3e
Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream.
...
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
2019-01-26 19:13:49 +00:00
fickleheart
03f9459257
Merge remote-tracking branch 'remotes/internal/master' into movementchecks
...
# Conflicts:
# src/g_game.c
# src/p_user.c
2019-01-15 21:01:30 -06:00
fickleheart
029a16125c
Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff
2019-01-08 20:56:14 -06:00
fickleheart
92c5a0836b
Remove filthy filthy cheats
2019-01-08 20:36:06 -06:00
Sal
900c6df765
Merge branch 'mobjscale-global' into 'next'
...
Add a global for mobjscale
See merge request KartKrew/Kart-Public!10
2019-01-08 17:00:34 -05:00
TehRealSalt
ab76725038
Merge remote-tracking branch 'master' into next
2019-01-08 16:29:14 -05:00
mazmazz
4f40d2abdb
Merge errors for compile
2019-01-07 17:05:20 -05:00
SeventhSentinel
046d66d803
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
fickleheart
f7aa9ebb25
Determine latency with leveltime BS instead of nettics
2019-01-05 01:13:16 -06:00
SeventhSentinel
b9ea18c030
turn these signed before abs-ing em
2019-01-05 00:42:36 -05:00
fickleheart
cc9bf72513
test stuff
2019-01-04 23:09:29 -06:00
fickleheart
b3432cef05
Don't turn players more than they're allowed to
...
This should account for latency properly.
2019-01-04 23:09:27 -06: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
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
Monster Iestyn
94f0eedb60
Fix bot players using the respawning code meant only for real players to use
2018-12-24 17:59:12 +00:00
Digiku
b6ff4b8930
Merge branch 'camera-backport' into 'next'
...
Suggestion: 2.2 camera changes backport
See merge request STJr/SRB2!393
2018-12-20 16:57:23 -05:00
toaster
28a87242f8
lj dm'd me so here's a second, more sensible crack at it
2018-12-18 19:40:38 +00:00
toaster
d5bddafd0f
Move some sidemove/forwardmove checks to playsim code rather than have them happen in ticcmd generation.
...
pGetPlayerControlDirection has to die since it was the only other usage of sidemove, and wasn't even relevant anymore anyways.
2018-12-18 18:05:11 +00:00
Jimita
180de2fbb2
Merge branch 'next' into the_second_remote_view_camera_fix
2018-12-17 15:40:20 -02:00
TehRealSalt
fad18c421e
2.2 camera changes backport
...
- Very slightly less claustrophobic camera defaults
- Changed camera settings are saved
- Camera distance increases relatively with splitscreen & analog mode.
These changes are kind of debatable because them not saving was an intentional decision initially, and the camera being farther out could potentially clip more geometry where it previously didn't... still, thought I'd open this for consideration
2018-12-16 18:18:59 -05:00
