Commit graph

182 commits

Author SHA1 Message Date
Sally Coolatta
cd8862f0bc New input handling
Events have a player ID instead of adding billions of keys for separate gamepads. Axis movement (mouse movement, analog sticks) now are counted as keys, so axes don't need to be separately implemented for all controls. Game controls emulate a Saturn controller (some of the external functions like screenshot / gif should be readded, but I got lazy)

This will allow later us to save a config for a controller that can be reused for any player slot, which is one of the main goals for profiles.

Only just enough was made to use the new input system to make it compile. Menus in this branch should aim to move to using PlayerInputDown entirely, instead of using hardcoded keys & simply remapping to those
2021-11-26 14:56:25 -05:00
Sally Coolatta
2af75a2bd1 Fix merge conflicts 2021-01-11 00:06:34 -05:00
Sally Coolatta
e6a9e5a68e Merge branch 'master' into new-menus 2020-11-08 02:49:28 -05:00
Sally Coolatta
7c2bd0d1c2 Merge remote-tracking branch 'srb2/next' into the-scary-22-merge 2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea Merge remote-tracking branch 'srb2/master' into the-scary-22-merge 2020-10-24 19:28:06 -04:00
James R
eae76ee759 Reset wait period for COM_BufInsertText 2020-10-21 12:34:26 -07:00
James R
4c7400b27e Merge branch 'save-netvars' into 'next'
Save netvars

See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
James R
bc637afd09 Show revert value of cvar with help command 2020-10-09 16:28:03 -07:00
James R
c920e688c0 When save/loading config use revert value for netvars if you are not the server 2020-10-09 16:22:17 -07:00
James R
6363162826 Merge branch 'sanity-meter-empty' into 'next'
Replace cvar initializers with a macro

See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
14e586bfd3 Merge branch 'autocomplete-aliases' into 'next'
Autocomplete aliases in console

See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
2a316e49e5 Revert netvars after leaving a netgame 2020-10-06 23:32:11 -07:00
James R
b7c4a82a0f Replace C90's junk with a modest macro 2020-10-06 23:04:23 -07:00
James R
9adbb7dfa3 Fix off by one 2020-10-01 16:55:17 -07:00
Lachlan
6b738da309 Fix compiler warning 2020-09-28 11:38:56 +08:00
Lachlan Wright
325f4757f0 Merge branch 'console-silly-characters' into 'next'
Get rid of some silly behavior with certain characters in console

See merge request STJr/SRB2!1110
2020-09-25 08:31:08 -04:00
James R
6c94b9d07e Fix netid overflow check 2020-09-05 23:23:54 -07:00
James R
0b1f7792e9 Start netid at 1 to avoid CV_FindNetVar returning a regular cvar for netid 0 2020-09-05 22:03:14 -07:00
James R
67fbce8532 Autocomplete aliases in console 2020-08-14 00:00:45 -07:00
James R
74af607d0c Stop treating apostrophes, parenthesis and curly braces as separate arguments 2020-08-13 21:11:45 -07:00
Sally Coolatta
8731c6b7a4 Another round of fixing up
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes
LOTS of stuff I changed to use arrays instead of constantly duplicated code
2020-08-10 23:38:32 -04:00
Sally Coolatta
e14f4a5842 Merge g_demo.c, remove OLD22DEMOCOMPAT 2020-08-10 12:14:23 -04:00
Sally Coolatta
71375e412b Merge command.c 2020-08-10 11:42:12 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
James R
f8b659e4bd Merge branch 'various-color-fixes' into 'next'
Various color fixes

See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
James R
e09a430804 Merge remote-tracking branch 'origin/next' into remove-glide-2 2020-07-12 16:05:15 -07:00
kaysrishaq
be8f10d039 various color fixes 2020-07-12 07:39:52 -04:00
James R
d06eb9dc5f Merge branch 'netid-take-2' into 'next'
Use ordered id for netvars instead of shitty hash

See merge request STJr/SRB2!1010
2020-07-11 02:00:06 -04:00
Louis-Antoine
b063f57be2 Fix autoexec file trying to set netvars when joining from command-line 2020-07-07 16:19:25 +02:00
Jaime Passos
615c7121ed gr_ -> gl_ 2020-07-06 01:15:08 -03:00
James R
3554cc8b1b Actually save the cvar name in demos 2020-07-04 12:51:07 -07:00
James R
785ff5b8eb I meant consvar_number_of_netids to be exclusive :V 2020-06-20 00:53:51 -07:00
James R
f7503adbde Actually print a warning if the old demo id collides 2020-06-19 19:59:14 -07:00
James R
b89be9f179 Cvar compatibility with older demos 2020-06-19 18:04:20 -07:00
James R
31cf034d63 Save cvar names in demos; refactor cvar loading 2020-06-19 17:58:42 -07:00
James R
df19ededb8 Use ordered ids instead of hashes for cvar netid
Originally 6acd99c0a465ab1594edc12502f71a5e0a3af938
2020-06-19 16:36:36 -07:00
toaster
555d7f960b Merge conflict resolution for command.c 2020-05-31 23:42:59 +01:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
0dd19f4f50 Merge branch 'master' into new-menus 2020-05-16 04:37:44 -04:00
Sally Coolatta
8be2d12b99 Merge remote-tracking branch 'public/master' 2020-05-16 00:08:53 -04:00
Monster Iestyn
49ff331ac0 Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a.
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)

(cherry picked from commit e501d9c6af)
2020-05-13 16:03:26 -07:00
Sally Coolatta
15d18640de Merge remote-tracking branch 'public/master' into merge-12 2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f8d708a4 Merge branch 'master' into new-menus 2020-05-09 17:04:10 -04:00
James R
67c355e571 Use COM_ImmedExecute to load the config, so the buffer size doesn't matter 2020-05-04 12:19:53 -07:00
James R
6613b19220 Merge remote-tracking branch 'lat/remove-passwords' into awful-mix-fucked 2020-04-26 01:16:27 -07:00
James R
28b1e8de1c Merge remote-tracking branch 'origin/master' into next 2020-04-18 17:20:33 -07:00
Wolfy
5e4ec61d82 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
Hannu Hanhi
bba15645fb Don't destroy my config file 2020-04-12 02:18:12 +03:00
James R
ccc746fbf4 Change netvars in replays 2020-04-09 17:21:30 -07:00