Commit graph

46 commits

Author SHA1 Message Date
Jimita the Cat
9ded0d1770 dumb
(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
2020-03-23 17:03:35 -07:00
Jimita the Cat
a3732678e0 Add support for flashpals in screenshots
(cherry picked from commit e765b9400cf741eb8aaa72768ef677769ee5c12b)
2020-03-23 17:03:34 -07:00
Jimita the Cat
d6493c9101 dumb
(cherry picked from commit 892e65071281e1aa2bd6158748120cf4b7cd81c2)
2020-03-23 16:54:18 -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
toasterbabe
56ac088443 Screenshots now contain the palette you're actively looking at, as opposed to the palette the game/map has! This makes sense for colorblind users being able to store their precious memories, and it matches up with how gifs palettise.
(cherry picked from commit 9d46ba281f)
2020-03-23 16:34:59 -07:00
SeventhSentinel
046d66d803 Fix errors from merge 2019-01-06 01:00:30 -05:00
SeventhSentinel
1d58c6b8c2 merge srb2 next 2019-01-05 15:59:23 -05:00
Latapostrophe
1b8be7f1a4 Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
mazmazz
c4939212dc Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
Digiku
7920dbe4a8 Merge branch 'float_equal' into 'master'
Clear Float equal warnings

See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
Latapostrophe
34f13e9f20 merge conflict 2018-12-16 16:48:15 +01:00
Alam Ed Arias
261e1e623c Clear float equal warnings 2018-12-14 20:34:06 -05:00
MPC
3e70ce2565 Fix the automap 2018-12-12 18:01:52 -03:00
toaster
5fe9cbba3d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
# Conflicts:
#	src/d_clisrv.c
#	src/m_misc.c
2018-11-18 18:26:50 +00:00
Monster Iestyn
0ed4efdb58 Fix V_SNAPTOx code to consider dupx/dupy the same way as Software mode 2018-11-13 18:13:51 +00:00
TehRealSalt
c7b0df8172 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
a56074b238 Fix an error I made in HWR_DrawFixedPatch 2018-10-30 13:44:01 +00:00
Monster Iestyn
ffe3b57f29 add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well 2018-10-29 13:34:54 +00:00
Monster Iestyn
80573f266f HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields 2018-10-29 13:29:16 +00:00
TehRealSalt
32bb288b84 DrawFill supports splitscreen offset flags 2018-10-01 08:41:44 -04:00
Latapostrophe
5aba0a4b5a merge sonicitems into chat-changes so that it's not lagging 10 years behind 2018-07-31 19:45:49 +02:00
Latapostrophe
a4bded8e9e SRB2chat test rework 2018-07-31 11:10:02 +02:00
TehRealSalt
ef16b32a6e HERE COMES A NEW CHALLENGER 2018-07-22 00:31:02 -04:00
toaster
990f9be612 * Modified, maybe-improved title. May need to be selectively reverted, but...
* To go with this, have the HUD fade in as the title goes away.
* After complaints, only do dogear gametype indicators on the voting screen for levels which don't match the prevailing gametype, and use thin font to intrude on the level pic less.
* Make the voting screen background a different graphic in battle.
* Improve behaviour of DrawDiag in GL.
2018-06-28 19:07:04 +01:00
toaster
2efe86e387 * AN OPPORTUNITY FOR GAMETYPE CHANGES ON THE VOTE SCREEN!
* Super important to allow dedicated servers to continue forever without needing to add Terminal.
    * To facilitate understanding, add gametype dog-ears to the vote screen!
    * To do the above, add V_DrawDiag! Works in GL, too!!
* Unrelated shit!
    * Fix a buffer overrun in the randmapbuffer!
    * Disable spectating in splitscreen... Not 100% sure, but in 2p battle, if you spectate, you just lose one balloon and respawn...
    * Improve all the string drawing functions' behaviour - both with being SLIGHTLY clipped by the edge of the screen, and when confronted with drawing off the base 320*200 internal area
2018-06-28 15:47:56 +01:00
SeventhSentinel
55b29504ae Fade-in intro
Also made flashing not-local, again.
2018-06-26 10:14:59 -04:00
wolfy852
eca78519e4 Chat Manager 2018-06-15 05:20:01 -05:00
TehRealSalt
8fe068ef46 Merge remote-tracking branch 'refs/remotes/srb2public/next'
# Conflicts:
#	src/f_finale.c
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/m_misc.c
2018-04-07 18:43:59 -04:00
Sryder
9c1bf9798a Revert "Fix screenshot functionality in fullscreen in SDL2"
This reverts commit 83d4f29367.

The reason I am reverting this is because the last commit actually fixes the *old* screenshot functionality, as the screen is being drawn back onto the buffer after they're swapped in the "real" size. Meaning the old function actually works perfectly fine now.
2018-03-18 18:33:53 +00:00
Sryder
7df299d5e4 Match HWR_DrawCroppedPatch to V_DrawCroppedPatch 2018-03-17 13:58:44 +00:00
Sryder
8ed6d9c31c Add the full-screen drawfill functionality to HWR_DrawFixedPatch 2018-03-17 13:26:43 +00:00
Sryder
7308e391a9 Make HWR_DrawFill match V_DrawFill 2018-03-16 19:46:45 +00:00
Sryder
7812c55e57 Match HWR_DrawFixedPatch to V_DrawFixedPatch 2018-03-16 18:08:24 +00:00
Sryder
83d4f29367 Fix screenshot functionality in fullscreen in SDL2 2018-03-08 22:28:38 +00:00
TehRealSalt
d2425329ca HUD 2017-12-17 20:42:17 -05:00
TehRealSalt
1f958091df OpenGL rendering 2017-12-17 16:33:21 -05:00
Monster Iestyn
42f985cda5 Remove pdupx/y and just use sdupx/y for everything, thanks Inuyasha 2016-11-16 12:10:56 +00:00
Monster Iestyn
0726dbe018 Started work on making HWR_DrawFill support V_NOSCALESTART properly ...so far I've got the console text select highlight in the right place outside of 320x200 (and 320x200 is still fine), but for whatever reason it's too large in width and height
Oh well, we're part of the way there, anyway
2016-11-15 20:33:07 +00:00
Inuyasha
0dd92e9396 V_DrawFill in OGL now consistent with software 2016-04-06 18:33:38 -07:00
Alam Ed Arias
f5cd1d5ebc add check on write failed in old TGA screenshot code 2015-01-10 17:26:29 -05:00
Alam Ed Arias
8a9759a3e4 SRB2 2.1.8 release 2014-04-19 13:41:29 -04:00
Alam Ed Arias
02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
Sryder13
103258e364 OpenGL Flipped Patch Drawing
V_FLIP in OpenGL.
2014-03-23 23:37:44 +00:00
Alam Ed Arias
ed72bd8fa1 SRB2 2.1.4 release 2014-03-21 19:21:06 +00:00
Sryder13
ba0c93d814 MD2 & Patch drawing fixes
MD2's can be translucent again.
MD2's can use sprites instead of another random texture if they have no
texture.
Patches are drawn in the correct place on non aspect correct
resolutions.
Cropped Patches are drawn.
2014-03-19 23:10:37 +00:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00