TehRealSalt
201466b1c1
Merge v1
2019-05-02 01:36:19 -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
fickleheart
d6e77fc12e
Merge remote-tracking branch 'remotes/internal/INTERNAL_netreplays' into INTERNAL_netreplays
2019-04-09 23:00:42 -05:00
fickleheart
15bb586c57
Only calculate vfx every other row to try to improve performance
2019-04-09 23:00:39 -05:00
Sryder
d579ee36bf
Turn the INT8's into SINT8's
2019-04-09 19:34:34 +01:00
fickleheart
fe3cd967d1
Unused var
2019-04-09 01:18:10 -05:00
fickleheart
56c1f05217
Potentially apply VHS distortion semi-transparently?
...
Pros: fuckin SMOOTH effect especially for 256-color sw
Cons: might lose the intended color distortion, maybe
not a great idea for FPS
Conclusion: put it behind an ifdef for now
2019-04-09 01:09:13 -05:00
fickleheart
ae473585b7
Add VHS pause/rewind effect
2019-04-08 23:21:11 -05:00
fickleheart
6267986c72
Add demo rewinding
...
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
fickleheart
d9bcb43d0b
Support non-green resolutions in the replay hut
2019-04-06 11:16:19 -05:00
fickleheart
7fc1f02b07
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
Latapostrophe
a119d1cddd
Lower default ping timeout + Fix chat arrows being missing while we're at it
2019-02-16 12:19:03 +01:00
wolfy852
07e56e550e
New visuals for ping and fps display alike [REDO]
2019-02-15 21:08:08 -06:00
Alam Arias
dc5024f94c
remove whitespaces
2019-02-05 15:42:37 -05:00
fickleheart
0ab690bc60
Draw player names in netreplays
2019-02-01 19:28:05 -06:00
TehRealSalt
72bc1b48f6
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
SeventhSentinel
49f2d65e95
Fix errors from merge
2019-01-06 01:00:30 -05:00
SeventhSentinel
73542c008c
merge srb2 next
2019-01-05 15:59:23 -05:00
SeventhSentinel
3e37d131ed
Minor touchups/cleanup
2019-01-04 16:47:03 -05:00
MPC
ca4329bcb6
fix the fucking warning
2018-12-17 18:09:29 -03:00
MPC
82601e881b
fix my fucking code
2018-12-17 17:57:53 -03:00
Latapostrophe
2fdf27c507
make sure to change p_dispy and not y for /pm list. Also make MPC happy.
2018-12-17 21:39:49 +01:00
Latapostrophe
45aba493c7
2.1.21 and all of the kart additions. Woo.
2018-12-17 20:43:59 +01:00
Latapostrophe
25e6d5388c
merge conflict
2018-12-16 16:48:15 +01:00
TehRealSalt
5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
TehRealSalt
516cda90ec
Default gr_md2 to on
2018-11-17 20:55:12 -05:00
MPC
ff642df1f2
Render the startup screen on OpenGL mode
2018-11-10 15:56:13 -03:00
TehRealSalt
499faec555
Merge remote-tracking branch 'srb2public/next'
...
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
Monster Iestyn
22e8dd1f9d
now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore
2018-10-30 14:22:21 +00:00
Monster Iestyn
df9c3ef3cd
Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own
2018-10-29 12:36:09 +00:00
Monster Iestyn
834a5e6b35
V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP
2018-10-29 12:06:22 +00:00
toaster
8b382d2e40
As requested by Jeck:
...
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.
Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
2018-10-27 21:16:19 +01:00
Latapostrophe
e5d4020f3e
Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill
2018-10-25 13:21:44 +02:00
toaster
791dc079ec
Merge branch 'master' into 'chat-changes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-21 08:27:28 -04:00
Latapostrophe
e2394d47a1
More messages in chatbox + new console backcolours
2018-10-21 14:09:25 +02:00
toaster
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
TehRealSalt
640e0e09c6
Merge branch 'master' into sal-cleanup
2018-10-08 00:22:44 -04:00
Monster Iestyn
1ec601af6b
Draw a star for continues if invalid skin numbers are somehow supplied
2018-10-05 22:42:36 +01:00
TehRealSalt
6bae5e952b
Brown text colormap instead of teal, revert sky-blue
2018-10-04 18:07:56 -04:00
TehRealSalt
e6fd41339a
DrawFill supports splitscreen offset flags
2018-10-01 08:41:44 -04:00
toaster
d2d6e67f48
Forgot I did this optimisation! Updated for the new colours.
2018-09-23 16:39:07 +01:00
toaster
6cc7f97d8a
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu
...
# Conflicts:
# src/m_menu.c
2018-09-22 23:00:46 +01:00
Sal
5f78807ef0
Merge branch 'encore' into 'master'
...
Encore
See merge request KartKrew/Kart!7
2018-09-22 17:52:33 -04:00
toaster
3a76605772
* Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar.
...
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
2018-09-22 18:22:04 +01:00
toaster
084b99a5c9
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore
...
# Conflicts:
# src/info.c
# src/m_menu.c
# src/y_inter.c
2018-09-21 20:54:38 +01:00
TehRealSalt
3b5f251ff0
Vote screen uses the font's intended character spacing
2018-09-02 22:53:40 -04:00
toaster
0776460643
* Make some minor performance improvements.
...
* Make the I_Errors in filesrch.c more descriptive.
* Fix up the loading of sounds.kart such that it has SOME protection against being loaded with game-modifying lumps.
* SERIOUSLY fix up the MD5/mainwads++ section in D_SRB2Main, since 1) I broke it and 2) it was already a little broken in the first place but we just didn't notice it because #ifndef DEVELOP.
2018-08-29 12:50:25 +01:00
toaster
b505ea43f0
Merge branch 'sonicitems' into encore
2018-08-26 12:45:02 +01:00
