Sally Coolatta
3d53adaa2b
Sliding HUD
...
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
2020-07-26 05:47:53 -04:00
Sally Coolatta
bdb871325f
Merge remote-tracking branch 'public/next'
2020-05-16 00:05:55 -04:00
Sal
135c9598a8
Merge branch 'hud-is-fucked' into 'next'
...
HUD inconsistency in Record Attack
See merge request KartKrew/Kart-Public!164
2020-05-15 19:26:26 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Latapostrophe
6bf117300b
Add back viewpoint names & fix console inputs in replays
2020-04-30 15:50:30 +02: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
James R
61be09e6bf
Merge remote-tracking branch 'origin/master' into gifs-port
2020-03-28 21:00:39 -07:00
Jimita the Cat
60624edc1a
Add support for flashpals in screenshots
...
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
2020-03-23 16:54:17 -07:00
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Sryder
da2f1fc972
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2020-03-21 23:27:55 +00:00
James R
fd1cb69a87
Merge remote-tracking branch 'origin/master' into parties
2020-03-21 12:45:23 -07:00
Sryder
c268313f0a
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/Makefile
# src/k_kart.c
# src/p_map.c
# src/p_setup.c
# src/p_spec.c
2020-03-16 00:13:42 +00:00
Latapostrophe
1f5bbb2c3d
Merge branch 'push-more-lua' into awful-mix
2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
James R
4f40edaf01
Maybe localdisplayplayers is a bad idea
2020-02-23 23:21:20 -08:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
James
94a00bb497
Option to hide/show viewpoint text
2019-11-16 16:28:48 -05:00
James R
90b0b7f498
Don't hide HUD with hu_showscores in single player/Record Attack
...
This also makes Lua game HUD consistent with the Kart HUD.
2019-10-19 14:11:24 -07:00
TehRealSalt
e84c618da8
Rudimentary Record Attack support
2019-09-24 07:17:05 -04:00
Latapostrophe
1d66d8e213
replay freecam + enhancements
2019-09-05 23:24:23 +02:00
TehRealSalt
aad0dbd076
Encore invert fade
2019-08-10 00:54:16 -04:00
Sryder
6bcc283d3b
Reimplement system for specials that activate when crossing a linedef from DOOM
...
Used for the finish line, crossing it the correct way increments the lap count, the wrong way decrements it
Remove usability of the sector special for the finish line
Undo another check of numstarposts to force all of them to need passing to complete the stage
player laps start from 0 now, it goes to lap 1 when you initially cross the start line.
2019-06-16 22:03:57 +01:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
ab7e747648
Fix warnings
...
Remove entries from dehacked, remove P_DoJump, remove debug stuff
2019-05-02 02:51:13 -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
fcc188ec0b
Show player names on the bottom in 4p
...
Also adjust margins to better match other HUD stuff
2019-04-14 23:52:03 -05:00
Jaime Passos
4548b4bb13
The player should be able to toggle shaders
2019-04-07 00:09:53 -03: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
557ac6f0d3
Move save replay prompt into the upper-right corner
2019-03-24 19:57:11 -05:00
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00
James R
50c42609a2
Merge remote-tracking branch 'origin/new_netreplays' into netreplays-errors
2019-03-03 19:53:25 -08:00
James R
bfcb6cc67e
Try to fix compiler errors
2019-02-24 17:47:33 -08:00
fickleheart
0b92743244
Support netreplays in titledemos
...
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -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
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
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
684ca46d8f
Draw player names in netreplays
2019-02-01 19:28:05 -06:00
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
wolfy852
600cf37c88
Remove facefreed/iconfreed
...
Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.
2019-01-05 20:40:47 -06:00
mazmazz
72ff758b07
Dummy out unused functions (OSX xcode errors)
2019-01-02 20:10:53 -05:00
Jimita the Cat
2cc6a22d12
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03:00
TehRealSalt
91448ddd95
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-12-05 20:46:48 -05:00
