stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
2391 commits 171 branches 41 tags 312 MiB
Commit graph

2391 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
06b7367941 Added I_GetMusicType and removed midimode variable 
* Revised S_PlayMusic arguments
* Now music plays again!

(cherry picked from commit 55f3803e4b)
 2018-09-14 09:42:29 -04:00
mazmazz
b59aa27104 Loose ends other targets 
(cherry picked from commit 9a5fc5f66a)
 2018-09-14 09:41:08 -04:00
Monster Iestyn
1199a5f9b4 Merge branch 'colormap-code-cleanup' into 'master' 
Colormap code cleanup

See merge request STJr/SRB2!275
 2018-09-11 11:31:56 -04:00
PrisimaTheFox
4ada0b0a9e Update m_anigif.c 
Remember gif_frames starts at 0
 2018-09-10 17:12:10 +01:00
PrisimaTheFox
d26ba2ee54 Update m_anigif.c 
More accurate GIF delay.
 2018-09-10 17:12:04 +01:00
Monster Iestyn
40ff436829 Remove commented out stuff, now I've confirmed everything works fine without them 2018-09-10 15:49:21 +01:00
Monster Iestyn
c0bf79ad8e R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be! 
With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup
 2018-09-09 22:48:09 +01:00
Monster Iestyn
4b5ebef6c2 Merge branch 'homremoval-nongreenfix' into 'master' 
Fix for HOM removal in non-green resolutions

See merge request STJr/SRB2!273
 2018-09-01 20:53:49 -04:00
Monster Iestyn
322da62b3c Fix HOM removal not working properly for non-green resolutions 2018-08-31 17:14:44 +01:00
Monster Iestyn
c67767c580 Merge branch 'yo_screen_so_wide_y_is_invalid' into 'master' 
Yo Screen So Wide y Is Invalid

See merge request STJr/SRB2!271
 2018-08-26 16:07:06 -04:00
toaster
710550bb9d Missed one! 2018-08-26 12:38:53 +01:00
Monster Iestyn
d5ab3e75a5 Merge branch 'v_video_killed_the_r_radio_star' into 'master' 
v_video Killed The r_radio Star

See merge request STJr/SRB2!270
 2018-08-25 16:43:25 -04:00
Monster Iestyn
ed5bed4d2c Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master' 
Zalloc Potter and the Death-Free Hallows

See merge request STJr/SRB2!269
 2018-08-25 16:43:14 -04:00
Monster Iestyn
0b8c231989 Merge branch 'lighting_fixes_plane_n_simple' into 'master' 
Lighting fixes? Plane and simple!

See merge request STJr/SRB2!268
 2018-08-25 16:43:00 -04:00
toaster
85474e33dd Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP. 2018-08-25 21:17:34 +01:00
toaster
80ac2366ba Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions. 
* V_DrawFixedPatch and ilk:
	* Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from.
	* Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions.

* V_DrawFill:
	* Reduce number of operations performed upon `c`.

* V_DrawString and ilk:
	* Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.
 2018-08-25 19:52:17 +01:00
toaster
91eb248e46 Fix up them there ghosts! 
* Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know?
* Make ghosts spawn properly on slopes.
 2018-08-25 17:11:49 +01:00
toaster
973b3c3f5e Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs: 
* Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community!
	* For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright.
	* For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2.
* Change the fadestart and fadeend range in which colormaps are generated.
	* The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps.
	* The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...
 2018-08-25 16:46:45 +01:00
Monster Iestyn
9d3aad9036 Merge branch 'XPMupdate' into 'master' 
update XPM icon

See merge request STJr/SRB2!267
 2018-08-21 10:31:25 -04:00
Monster Iestyn
dcf843e485 Merge branch 'defaultsoundvol' into 'master' 
Change default sound volume

See merge request STJr/SRB2!238
 2018-08-20 09:41:04 -04:00
Monster Iestyn
febefd41ba Fix glitches with flats visible when looking up/down in 1st person 2018-08-18 23:31:20 +01:00
Monster Iestyn
364339e1ce Merge branch 'sdl_mixer_fixes' into 'master' 
SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260
 2018-08-16 16:57:14 -04:00
Alam Ed Arias
01a023206f Merge branch 'master' into XPMupdate 2018-08-11 21:59:39 -04:00
Alam Ed Arias
7d3e4f729f TravisCI: also remove gcc-6 2018-08-11 21:59:08 -04:00
Alam Ed Arias
b5cc11f7d8 TravisCI: gcc-4.9 is also gone 2018-08-11 21:44:07 -04:00
Alam Ed Arias
bb94d9fa3a Merge branch 'master' into XPMupdate 2018-08-11 20:37:34 -04:00
Alam Ed Arias
6603f26772 Merge branch 'xpm_fix' into 'XPMupdate' 
Fix white being treated as transparent.

See merge request STJr/SRB2!266
 2018-08-11 20:36:57 -04:00
Steel Titanium
d9c7334dea Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
Alam Ed Arias
0575d2f1f9 TravisCI: remove gcc-5 test, gcc-5 package is gone 2018-08-10 17:16:26 -04:00
Alam Ed Arias
3479310546 SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
Monster Iestyn
653fd3038d Merge branch 'woops!_all_trans' into 'master' 
Woops! All trans

See merge request STJr/SRB2!265
 2018-08-10 14:27:45 -04:00
toaster
145c050e14 ...and R_DrawTranslucentSplat_8, even though it isn't used! 2018-08-09 17:08:20 +01:00
toaster
5daeaf529f Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well. 2018-08-09 16:56:43 +01:00
Monster Iestyn
c8ea5cfcaa Merge branch 'transparency_i_hardly_knew_er' into 'master' 
Transparency? I hardly knew 'er!

See merge request STJr/SRB2!264
 2018-08-07 15:29:35 -04:00
toaster
ecc9ebe8c1 Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice). 
Please note I haven't touched the ASM equivalent, given as it's not actually used.
 2018-08-07 19:12:10 +01:00
Monster Iestyn
8d54d8adaa Merge branch 'password-fix-hotfix' into 'master' 
Password fix hotfix

See merge request STJr/SRB2!261
 2018-08-06 09:43:54 -04:00
Monster Iestyn
8d622ff6f8 Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server! 2018-08-05 20:17:30 +01:00
Monster Iestyn
485d990949 Merge branch 'gme-lowvolume-fix' into 'master' 
GME low volume fix

See merge request STJr/SRB2!248
 2018-07-31 14:35:32 -04:00
Monster Iestyn
16999b7080 Merge branch 'gme-pause' into 'master' 
Fix pausing on gme

See merge request STJr/SRB2!251
 2018-07-31 14:33:56 -04:00
Steel Titanium
c02ee9a502 Re-did this fix. 2018-07-28 01:58:25 -04:00
Alam Ed Arias
1ee7eda0ad Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00
Monster Iestyn
6b1fa399dc Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx. 
This should prevent I_FreeSfx making a mess of things later, hopefully.
 2018-07-14 18:15:59 +01:00
Monster Iestyn
8e19611033 Merge branch 'opengl-fof-lowerunpegged' into 'master' 
OpenGL: FOF walls + Lower unpegged

See merge request STJr/SRB2!258
 2018-07-11 16:36:26 -04:00
Monster Iestyn
c127ea3ceb Merge branch 'opengl-projectsprite-fix' into 'master' 
OpenGL HWR_ProjectSprite fix

See merge request STJr/SRB2!255
 2018-07-11 16:15:42 -04:00
colette
0a931a1364 Update f_finale.c 2018-07-07 20:20:46 -04:00
Alam Arias
a79b9a9127
Update m_misc.c 2018-07-07 20:41:11 +00:00
Alam Arias
7da6aca450
Update m_misc.c 2018-07-07 20:33:19 +00:00
Monster Iestyn
f1bba60373 Merge branch 'md2-fopen-error' into 'master' 
More helpful error messages

See merge request STJr/SRB2!243
 2018-07-06 14:38:59 -04:00
Monster Iestyn
130de10f97 Merge branch 'md2-smoother-interpolation' into 'master' 
Smoother MD2 interpolation

See merge request STJr/SRB2!224
 2018-07-06 14:38:37 -04:00
MonsterIestyn
3e9103bec2
Merge pull request #252 from GoldenTails/patch-1 
Fixed MD2 models not loading correctly on Linux
 2018-07-06 19:12:21 +01:00