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
81ad772a8b
Merge branch 'record-attack-changes' into v1.2-frankeinstein
2020-03-10 20:27:00 +01:00
Latapostrophe
bb1c320236
Merge branch 'fickle-replay-v1' into replay-freecam-rewind
2020-03-05 21:08:20 +01:00
TehRealSalt
190b0d4660
Replay playback changes:
...
- Store level state periodically
- Load the closest usable level state when done rewinding for
quicker resumes
- Make playback menu fade out after 5 seconds of no activity
(but not while paused)
- Remove wrapping from replay hut (original wrapping was broken
at some point before 1.1 and it's not necessary anyway)
- Allow holding enter on frame advance for noisy slow-mo
from fickleheart
2020-03-05 21:04:56 +01:00
fickleheart
9ecc48d0e4
Merge remote-tracking branch '[remote name redacted]/jimita-shaders'
...
# Conflicts:
# src/hardware/hw_main.c
2019-12-01 11:58:24 -06:00
Latapostrophe
45b62aa8a4
replay freecam + enhancements
2019-09-05 23:24:23 +02:00
Latapostrophe
eb8cef41e4
shorten RA intro & allow to restart with pause
2019-09-01 23:04:07 +02:00
Sryder
bcae3898dd
Merge branch 'lemme-outa-room-menu' into 'master'
...
Don't get stuck in room menu in a modified game
See merge request KartKrew/Kart-Public!145
2019-06-27 14:16:37 -04:00
James R
5f4f10fdbe
Spell it "forward"
2019-06-22 21:40:20 -07:00
James R
ec369e8d21
Don't get stuck in room menu in a modified game
2019-06-19 14:32:11 -07:00
Latapostrophe
b9b76e739c
change default fog settings, put sprite billboarding in menus and attempt to make colormaps look nicer still
2019-06-17 21:27:31 +02:00
Jaime Passos
5e14fd4ae4
software is better
2019-06-13 21:10:01 -03:00
Jaime Passos
df789e1d67
Open Graphics Library (OpenGL) is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. The API is
...
typically used to interact with a graphics processing unit (GPU), to achieve hardware-accelerated rendering.
2019-06-12 23:01:18 -03:00
Latapostrophe
53df420546
Fix stuff and reimplement the kart features that went poof
2019-06-12 21:36:47 +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
James R
2fb4dd73fc
Move FOV option out of OGL options
2019-05-22 23:16:20 -07:00
James R
05dde43423
Acknowledge fallback models as an OGL option indeed
...
(You may also be able to actually read that code too.)
2019-05-22 23:15:46 -07:00
wolfy852
334056a77d
whoops
...
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05: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
90e4a45aa4
Have Look Back reset your color to prefcolor
2019-05-12 03:21:46 -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
47484c5b6b
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
TehRealSalt
f720dd3ddb
Merge v1
2019-05-06 21:23:29 -04:00
wolfy852
97493fdfd7
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/hw_main.h
# src/m_menu.c
# src/r_main.c
# src/v_video.c
2019-05-06 14:26:09 -05:00
wolfy852
535b386f8e
Merge remote-tracking branch 'remotes/pub/master' into next
2019-05-06 14:17:02 -05:00
wolfs
58c5979a1e
Merge branch 'newping' into 'master'
...
New ping command
See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
TehRealSalt
25f277e185
ENSURE viewcount slider is present for multiplayer demos
2019-05-02 12:42:29 -04:00
TehRealSalt
86dfd70c6f
Add message boxes for file add errors
2019-05-02 12:03:50 -04:00
TehRealSalt
73e152a01c
HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects
2019-05-02 12:00:51 -04:00
Sal
0cd815cb44
Merge branch 'deadzone-bullshit' into 'v1'
...
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
See merge request KartKrew/Kart!147
2019-05-02 09:25:07 -04:00
TehRealSalt
201466b1c1
Merge v1
2019-05-02 01:36:19 -04:00
TehRealSalt
285ab9c9b9
Menu fix-up
...
- Use center menu style for the tiny extras menu
- Move Screenshot Options, Add-on Options, Replay Options, and Erase Data into Data Options again
2019-05-02 01:33:11 -04:00
TehRealSalt
17de62894a
Remove bad +1
2019-05-02 00:49:05 -04:00
Sal
b410b216a4
Merge branch 'default-md2' into 'v1'
...
Add option to turn off the PLAY default md2
See merge request KartKrew/Kart!140
2019-05-02 00:03:18 -04:00
TehRealSalt
39bea80b9e
Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
2019-05-01 23:30:53 -04:00
wolfs
a0b1fce139
Merge branch 'md3-vanilla-kart' into 'next'
...
MD2/MD3 support rewritten + optimizations [GCC port]
See merge request KartKrew/Kart-Public!19
2019-04-30 15:22:30 -04:00
Latapostrophe
2350405ad3
Terminology changes
2019-04-23 23:49:46 +02:00
Latapostrophe
0f43546ada
Add option to turn off the PLAY default md2
2019-04-22 11:29:44 +02:00
James R
4b05199b9f
Show rooms list in server browser initially
...
If you haven't selected a room yet, you're
shown the room list instead of server list.
2019-04-18 22:41:50 -07: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
430831423c
Strip out things that limit wad files added by filename
2019-04-17 23:09:10 -05:00
fickleheart
9e3ee274fb
Keep playback menu bar on the top in non-green reses
2019-04-14 23:22:24 -05:00
fickleheart
ad52f80627
Add scroll bar to replay hut
2019-04-14 23:17:12 -05:00
Jaime Passos
6b6485159f
Add "Software Perspective" toggle on the "GPU Options" menu
2019-04-14 19:44:56 -03:00
fickleheart
5ec6517a54
Temporarily disable Extra Options menu
2019-04-13 15:23:31 -05:00
fickleheart
295b53801d
Change color of active playback items
2019-04-13 15:23:23 -05:00
fickleheart
10d70f5447
Playback menu improvements
2019-04-13 14:42:15 -05:00
fickleheart
eb9c9885a9
Fix being able to carry rewind state where it shouldn't be
2019-04-13 14:22:48 -05:00
wolfy852
052104999f
Generic model terminology
2019-04-12 00:35:35 -05:00