Commit graph

2185 commits

Author SHA1 Message Date
fickleheart
00f8e8b0e6 Here too 2019-01-09 09:07:41 -06:00
fickleheart
00c658fccd Make sure cmd.latency is always 0 in mode attack? 2019-01-09 09:05:57 -06:00
TehRealSalt
09da50000e Merge branch 'next' into music-credits 2019-01-09 03:08:20 -05: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
TehRealSalt
f8a1cf849f Merge branch 'master' into fortnite 2019-01-08 18:17:09 -05:00
wolfy852
5c5e6a26dd Merge remote-tracking branch 'remotes/public/next' into gamepad-tweaks
# Conflicts:
#	CMakeLists.txt
#	appveyor.yml
#	src/command.c
#	src/command.h
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/dehacked.c
#	src/doomdef.h
#	src/hu_stuff.c
#	src/m_misc.c
2019-01-08 16:32:24 -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
mazmazz
6ae27013f2 Misssed alwaysfreelook defaults (first person) 2019-01-08 01:29:12 -05:00
mazmazz
4f40d2abdb Merge errors for compile 2019-01-07 17:05:20 -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
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
fickleheart
7dcee6f0b4 Send latency in players' ticcmds 2019-01-04 23:09:26 -06:00
SeventhSentinel
74aba46823 In-game music credits 2019-01-04 04:44:55 -05:00
SeventhSentinel
8391dd520a Add item spinning, turn into papersprites, spawn more orbs
Also tried to fix a memory issue I only get from Sev's compiles by removing the need to free memory for this... but didn't fix anything :/
2019-01-02 14:08:00 -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
mazmazz
2326a58bc7 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
fe93469dc4 Add CSV functionality to timedemo
* Append timedemo trials to timedemo.csv
* Specify -csv <trialid> to toggle CSV behavior
* Specify -quit to immediately quit after timedemo
* Add ticrate, rendermode, video mode, demo name, bits to CSV timedemo row
2018-12-29 04:51:00 -05:00
mazmazz
87c40b2dc5 Add framecount to timedemo message 2018-12-28 22:59:54 -05:00
mazmazz
96b42605d6 Reset timedemo counters after wipe 2018-12-27 23:23:09 -05:00
mazmazz
610d43cc84 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
mazmazz
3e712b57c5 Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
Latapostrophe
47a329807a Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Latapostrophe
09dbb6d631 Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01: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
TehRealSalt
4ad9801b21 Revert default changes
Digiku said they'd handle the new button defaults so \m/
2018-12-18 12:55:05 -05:00
Latapostrophe
4c88271cfb 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01: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
TehRealSalt
edd3259cf4 2.2 backport of jump/spin axes
Needs the config default-changing shenanigans done still, not sure how to tackle that yet. Now the game is TOTALLY playable from a fresh install if you just plug in a controller.
2018-12-16 17:45:49 -05:00
Latapostrophe
34f13e9f20 merge conflict 2018-12-16 16:48:15 +01:00
wolfy852
ac62575896 Print GameController info when detected, use proper 360 controller defaults for triggers 2018-12-14 11:50:53 -06:00
SeventhSentinel
d9a3b37e30 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
TehRealSalt
dfa0522326 Battle Mode overtime
After the time limit is up, spawn a shrinking kill-field. This is one hefty initial commit!
2018-12-06 13:46:38 -05:00
Digiku
31b88c5195 Merge branch 'execversion' into '21-version'
Block previous versions' config defaults with EXECVERSION consvar

See merge request STJr/SRB2!371
2018-12-06 12:41:20 -05:00
mazmazz
fd6f5a9fbd Add alwaysfreelook2 and mousemove2 to config versioning
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
mazmazz
d488dd0763 Move joyaxis_fire default to right trigger 2018-12-06 05:55:56 -05:00
mazmazz
0e0ccf2ae6 Change 2p controller defaults 2018-12-06 05:26:28 -05:00
TehRealSalt
7f335e9c46 Actually, best of both:
Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.
2018-12-05 23:28:44 -05:00
TehRealSalt
d7ee931a16 Cut this down slightly 2018-12-05 20:54:58 -05:00
TehRealSalt
91448ddd95 Merge remote-tracking branch 'srb2public/next' into merge-next 2018-12-05 20:46:48 -05:00
Digiku
d6dd0c8fef Merge branch 'joystick-juggling-two' into 'next'
Joystick additions for menu, axis defaults, and vertical look toggle

See merge request STJr/SRB2!359
2018-12-03 22:59:19 -05:00
mazmazz
22232847e2 Hardcode Screenshot, GIF, and Viewpoint to their F keys 2018-12-03 13:21:16 -05:00
mazmazz
3bdb738888 thisjoyaiming fix for chasefreelook 2018-12-03 13:13:01 -05:00
mazmazz
098f02fc95 Reset vertical look when toggling joyaiming 2018-12-03 13:10:24 -05:00
mazmazz
faeb2ff430 Add joyaiming qualifier for joystick look up/down 2018-12-03 13:10:19 -05:00
mazmazz
ad9f7853f4 Change PC axis defaults to 360-friendly values 2018-12-03 13:10:15 -05:00