Sryder
b341cacb0a
Subtractive translation map
2020-10-19 11:57:12 +01:00
Sryder
5558fb073a
Basic additive transmap/blend support
...
Can currently be used on sprites only
added to flames by default because it makes sense
2020-10-18 19:10:19 +01:00
James R
997d142cb5
SPLITSCREEN FOV
...
Object tracking is off, but it was off before so I don't know if I actually
broke it. Minor refactoring in HWR_RenderPlayerView and HWR_RenderSkyboxView.
2020-09-23 17:50:47 -07:00
Sally Coolatta
dfd733eb80
Up to screen.o
...
Lots of renderer files I didn't need to touch at all here :)
2020-08-15 00:55:30 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
d5397935cd
Merge r_draw.c
2020-08-10 15:01:57 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
d27f16c4d5
A bunch of easy files (1-5 conflicts)
...
g_state.h, hu_stuff.h, lua_hud.h, m_misc.h, p_polyobj.c, p_telept.c, r_draw.c, r_draw8.c, r_sky.c
2020-08-05 14:34:17 -04:00
SwitchKaze
4184d83ef2
Fix skincolor-related memory leak
2020-07-14 17:09:31 -05:00
kaysrishaq
be8f10d039
various color fixes
2020-07-12 07:39:52 -04:00
Latapostrophe
6ac63cca7a
Merge branch 'v2-master' into followme-internal
2020-06-02 22:21:16 +02: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
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Sally Coolatta
b4f5d931cc
Skincolor code cleanup
...
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
Latapostrophe
3f43107eea
Add Opposite option for followercolor
2020-05-09 12:12:29 +02:00
Latapostrophe
766f7f035f
Let followers change colour separatly from players
2020-05-04 18:08:41 +02:00
James R
ae3bf2498a
Merge branch 'supergoldedit' into 'next'
...
Change SKINCOLOR_SUPERGOLD1-5
See merge request STJr/SRB2!805
2020-04-09 19:50:06 -04:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01: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
Snu
8796517177
Merge branch 'master' into supergoldedit
2020-02-23 17:57:39 +00:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
Snu
36fc21790b
Change SKINCOLOR_SUPERGOLD1-5
2020-02-20 21:53:21 +00:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Steel Titanium
08533debe6
Add six new skin colors
2020-02-14 22:30:37 -05:00
Jaime Passos
96bfc1da8f
Merge remote-tracking branch 'origin/master' into ripple2
2019-12-14 19:36:54 -03:00
Jaime Passos
b47cc01f50
Separate non-powers-of-two draw routines into its own file
2019-12-13 13:11:56 -03:00
Jaime Passos
bd51f26807
Tilted water
2019-12-10 17:01:19 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
toaster
297f1ad9a6
Metal Sonic battle improvements.
...
* Tweaked to use new sprites.
* Jet fume behaves much closer to Lach's wonderful work.
* Instead of clobbering tracer to spawn powerup overlay, use hprev.
* Change timings. One second less to charge up, but two seconds less to spin them out.
* Remove terrible pinch overlay in favour of new dashmode-mimic flashing.
2019-10-29 23:11:12 +00:00
lachwright
24486f5cd9
Add new dashmode colormap
2019-10-21 04:37:56 +08:00
Jaime Passos
2574914843
Merge remote-tracking branch 'origin/master' into flats-png_port
2019-09-09 14:12:28 -03:00
Jaime Passos
b28af03b1c
Merge remote-tracking branch 'jimita/flats-png' into flats-png_port
2019-09-06 19:20:45 -03:00
toaster
b2d57e6045
Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it.
2019-08-30 19:19:54 +01:00
Monster Iestyn
febbe1425f
Fixed TC_RAINBOW so it doesn't accept invalid colors, whoopsies
2019-08-12 19:06:18 +01:00
Monster Iestyn
9efe0e2423
Added switch cases to skin color related functions in r_draw.c, added extra error checking
2019-08-12 15:02:36 +01:00
Monster Iestyn
aaa3467faa
Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua
2019-08-12 14:00:26 +01:00
toaster
168a7f4768
Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
...
This reverts commit c17ec4a77e
2019-07-03 00:58:02 +01:00
MascaraSnake
c17ec4a77e
Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
...
This reverts merge request !239
2019-07-02 23:49:10 +00:00
toaster
dbec3c7e54
Metal Sonic fixes!
...
* Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup.
* Make missiles able to vectorise him.
* Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1.
* Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing.
* Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.
2019-06-28 20:48:14 +01:00
toaster
b745b4fe1b
With permission from Kart Krew (Sal and Sryder specifically - they don't know WHY vanilla's using it):
...
* Port across the additional colour translation maps, including mobj-level support for "colorized" objects.
* Make Fangboss and both Metal Sonic objects greyscale if, on spawn, there is a player in the game who is not a spectator whose skin is that character.
* Allow bosses with MF_GRENADEBOUNCE to opt out of the MF2_FRET colour-flashing tomfoolery, and give this flag to Fang.
2019-06-18 17:55:57 +01:00
Jaime Passos
775b64f540
Support for patches and textures to be used in place of sector flats
...
Still a work in progress.
2019-05-21 00:28:52 -03:00
TehRealSalt
62aeeea9cb
Fix a couple of things not using pure white
2019-05-13 12:50:36 -04: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
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
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
TehRealSalt
a9342fe0fd
MT_FIREDITEM crash fix
2018-11-29 05:34:57 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
