Monster Iestyn
4a8dd8031e
dispoffset now works in OpenGL
2016-01-13 22:50:15 -08:00
Inuyasha
437b0ac692
Merge branch 'reduced_palette' into 'master'
...
Reduced palette
You guys should know what this is by now. If you don't, you really need to catch up. =P
We should check with toaster and others involved to check this thing is actually ready to go though, the number of changes to the palette itself over the last year has been absurd.
See also http://git.magicalgirl.moe/STJr/SRB2Internal/issues/8
See merge request !13
2016-01-13 21:03:12 -05:00
Inuyasha
dcde68912a
Merge remote-tracking branch 'remotes/origin/master' into repeat-monitors
2016-01-03 19:30:46 -08:00
Inuyasha
1b8a38bd56
Merge branch 'reduced_palette' into 'repeat-monitors'
...
Reduced palette -> repeat monitors
As the graphics use the new palette anyway.
https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
See merge request !15
2016-01-03 00:59:40 -05:00
RedEnchilada
b9b1e2b298
Fix MD2s
2016-01-02 21:53:43 -06:00
Inuyasha
265a607b58
rewrite of monitors to accomodate repeat use monitors.
...
It's a lot nicer in general, honestly. I think a couple bugs with custom monitors respawning got fixed in the process.
Note that a monitorgfx.wad is needed if you want to see things besides <!>s for monitors, due to graphic changes.
2015-12-31 08:38:23 -08:00
Monster Iestyn
30ef257050
dispoffset now works in OpenGL
2015-11-23 17:01:10 +00:00
Yukita Mayako
ca7151f1c2
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into reduced_palette
...
Conflicts:
src/dehacked.c
2015-11-09 14:34:26 -05:00
wolfy852
1ed5407821
update stuff
2015-11-07 13:56:21 -06:00
Sryder13
d050a60f36
Change a few colours.
2015-08-03 02:01:56 +01:00
Sryder13
cc3d3a67e6
Colour Changing MD2s
...
I don't know how I can move my old branch over so I've just created a new one.
2015-07-26 20:14:47 +01:00
Alam Ed Arias
fb5cba78d3
Merge branch 'public_next' into private
...
Conflicts:
src/p_mobj.c
2015-06-18 10:54:53 -04:00
Alam Ed Arias
f0054be951
whitespace fixup
2015-06-18 10:05:51 -04:00
MonsterIestyn
a797e88bb9
Red's last commit should have been using "pgl", not "gl" for function name prefixes, so the compiler would be happy. Also, more simplicity in my camera code please! Simplified some of the checks for whether a camera should chase or not etc
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9046 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:14 -04:00
RedEnchilada
308a958653
yellow wanted me to push this cus it fixed md2 translucency for her test cases
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9045 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:14 -04:00
RedEnchilada
ada9b6a9ea
I was helping yellow debug a crash and we found out this thing never actually fixed the crash like it was supposed to so it's fixed now -3-
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9044 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:14 -04:00
MonsterIestyn
6cff0bba70
Base draw distances on viewx/viewy coordinates, NOT the player object's coordinates (this can cause problems with things like skyboxes for instance). Splitscreen's player 2 should not affect what sprites player 1 can see, and vice versa! Especially not for precipitation, that just looks ridiculous.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9041 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
MonsterIestyn
af4c2fe391
Some minor cleanup for OpenGL sprite/MD2 code
2015-03-31 18:00:04 -04:00
MonsterIestyn
2d8868feca
Made HWR_InitMD2 and HWR_AddSpriteMD2/HWR_AddPlayerMD2 slightly less stupid with MD2-related searches in md2.dat: *Don't go barmy and search for a player skin called "THOK" when you already found the sprite called "THOK" beforehand! (or any other sprite prefix for that matter) *Don't make errors appear only for the last sprite/skin when it doesn't make sense to do so!!
...
Todo: Stop the redundancy that currently goes on with adding MD2s on game start-up (note that HWR_AddSpriteMD2/HWR_AddPlayerMD2 are run for all sprites/skins BEFORE HWR_InitMD2 is called)
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8988 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
MonsterIestyn
8232dbca10
*Fixed OpenGL's handling of cv_translucency effects (should not remove shadows if off, but perhaps make them use default alpha?), someone was a bit hasty! *De-stupified the MD2 status checks regarding drawing of sprites - if they're already checked before calling HWR_DrawSprite, there's no point doing them WITHIN the function as well *Split off sprite shadow code into HWR_DrawSpriteShadow for convenience
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8983 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
MonsterIestyn
d818b7af50
Red's last commit should have been using "pgl", not "gl" for function name prefixes, so the compiler would be happy. Also, more simplicity in my camera code please! Simplified some of the checks for whether a camera should chase or not etc
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9046 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:09:23 -06:00
RedEnchilada
f6de5cc4d9
yellow wanted me to push this cus it fixed md2 translucency for her test cases
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9045 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:09:22 -06:00
RedEnchilada
a30222d8e6
I was helping yellow debug a crash and we found out this thing never actually fixed the crash like it was supposed to so it's fixed now -3-
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9044 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:09:22 -06:00
MonsterIestyn
fb47b046da
Base draw distances on viewx/viewy coordinates, NOT the player object's coordinates (this can cause problems with things like skyboxes for instance). Splitscreen's player 2 should not affect what sprites player 1 can see, and vice versa! Especially not for precipitation, that just looks ridiculous.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9041 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:09:20 -06:00
MonsterIestyn
c93ae69d9d
Crawlas now use only one state for looking each SPR2_ constants added to dehacked.c for use in SOC/Lua (both "SPR2_RUN" and "SPR2_RUN_" are in theory the same thing in this implementation, likewise for other 3-char name cases) spr2names array/table also added for use in Lua - it works identically to Lua's sprnames, only with SPR2_ constants/string names instead Some minor cleanup for OpenGL sprite/MD2 code
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9004 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:03:01 -06:00
JTE
b2681984a6
Merge branch 'player-animations'
...
SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible.
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 01:59:38 -06:00
MonsterIestyn
93734b6d60
Made HWR_InitMD2 and HWR_AddSpriteMD2/HWR_AddPlayerMD2 slightly less stupid with MD2-related searches in md2.dat: *Don't go barmy and search for a player skin called "THOK" when you already found the sprite called "THOK" beforehand! (or any other sprite prefix for that matter) *Don't make errors appear only for the last sprite/skin when it doesn't make sense to do so!!
...
Todo: Stop the redundancy that currently goes on with adding MD2s on game start-up (note that HWR_AddSpriteMD2/HWR_AddPlayerMD2 are run for all sprites/skins BEFORE HWR_InitMD2 is called)
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8988 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 01:59:36 -06:00
MonsterIestyn
5d1ef1ff31
*Fixed OpenGL's handling of cv_translucency effects (should not remove shadows if off, but perhaps make them use default alpha?), someone was a bit hasty! *De-stupified the MD2 status checks regarding drawing of sprites - if they're already checked before calling HWR_DrawSprite, there's no point doing them WITHIN the function as well *Split off sprite shadow code into HWR_DrawSpriteShadow for convenience
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8983 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 01:59:34 -06:00
Alam Ed Arias
e28882a56d
oh, nPlaneVerts is a size_t?, well, then we need to use sizeu#()
2015-01-10 17:27:24 -05: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
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
Sryder13
3f1bb6359f
Merge remote-tracking branch 'upstream/master'
2014-11-14 22:21:07 +00:00
Sryder13
e90286ae52
Fix the polyobject crash
2014-11-14 22:19:44 +00:00
Ronald Kinard
d056e82b3b
Parse GL version correctly.
2014-11-13 18:20:32 -06:00
Ronald Kinard
d8484a86e0
Virtual resolutions in OpenGL
...
Also made fades use core functions if they are available.
2014-11-13 18:06:38 -06:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
6d773c54a5
Use OpenGL 1.3 in static builds and on SDL interfaces
2014-11-02 01:11:59 -05:00
JTE
9d1da548aa
Fix hardware / r_opengl warnings.
2014-11-02 01:31:38 -04:00
Alam Ed Arias
aa612bcf91
whiteline checkup
2014-11-02 01:31:36 -04:00
Sryder13
0c0ede6f18
OpenGL: Polyobject Planes
2014-10-27 20:57:45 +00:00
Sryder13
781dd16fa6
Fix THOK MD2's not rotating with camera
...
Will also fix any other case that an mobj has a skin and a single frame.
2014-09-10 00:22:39 +01:00
Sryder13
987f9f5c26
Quick sky fix 2
...
walls not extending down when a thok barrier has top textures and both
ceilings have sky.
2014-09-09 23:57:12 +01:00
Sryder13
cee8fff7b3
Quick sky fix
...
Avoid Z-Fighting on the depth wall with the regular walls to stop the
possibility of regular walls being made partially invisible.
2014-09-09 01:59:19 +01:00
Sryder13
b2852ec0f4
OpenGL: Sky culling
...
Gets rid of stuff being drawn where the sky should be being drawn.
2014-09-08 23:29:05 +01:00
Sryder13
bc0b5505a8
OpenGL: Fix sky drawing
...
sky positioning and scaling more correct compared to software.
2014-09-08 00:55:32 +01:00
Sryder13
ca0f0bf2fd
OpenGL Fade masks
...
I think I've done this all right, someone correct me if I haven't.
2014-09-04 01:35:29 +01:00
Sryder13
da2b6f2c01
Fix certain textures with holes in
...
see: CEZ1 skybox in linear filtermodes.
2014-09-03 02:10:47 +01:00
Sryder13
d96eaa768c
else added
...
less redundancy.
2014-08-30 14:36:18 +01:00
Sryder13
ae27ace7fe
Polyobject translucency quick fix.
...
I realise what I did before may cause FOF's in the same sector to not be
drawn, if they were before.
2014-08-30 14:20:07 +01:00
Sryder13
278f2e9b66
Polyobject top/bottom texture + translucency
...
polyobjects do have top/bottom textures, silly.
And translucency.
2014-08-30 14:10:55 +01:00
Alam Ed Arias
7cb77075d1
SRB2 2.1.11 release
2014-08-26 23:56:30 -04:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
Alam Ed Arias
f03e591f64
change SDL into HAVE_SDL
2014-07-25 19:10:24 -04:00
Alam Ed Arias
b511294749
Merge remote-tracking branch 'Sryder13/master'
2014-05-27 15:14:55 -04:00
ilag
1af18c7013
Redo all changes I ended up losing trying to undo the mess I made.
...
Also, fix the issue pointed out by Alam.
2014-05-02 14:24:20 -07:00
Sryder13
46e84465e8
OpenGL: FOF Cutting Fix 2
...
Fixes Translucent FOF's cutting Solid FOF's.
2014-04-20 10:35:50 +01:00
Sryder13
a230368c3d
Merge remote-tracking branch 'upstream/master'
2014-04-20 10:33:47 +01:00
Alam Ed Arias
8a9759a3e4
SRB2 2.1.8 release
2014-04-19 13:41:29 -04:00
Sryder13
bae7b5b2ac
OpenGL: FOF cutting fix
...
Fixes any FOF's with FF_SOLID not cutting each other.
2014-04-19 17:21:30 +01:00
Sryder13
098eb28036
OpenGL Multi-Property FOF's
...
Multi-Property FOF's have their multiple side properties display in
OpenGL.
2014-04-17 13:02:34 +01:00
Sryder13
5b324924ff
Undo MD2 Spin Frame Interpolation
...
Because apparently people don't like them like that.
2014-04-17 11:57:10 +01:00
Alam Ed Arias
02a3b0776c
SRB2 2.1.7 release
2014-04-14 01:14:58 -04:00
Alam Ed Arias
cec63aa4c0
restore ISO C90 support in r_opengl
2014-04-08 12:01:26 -04:00
Sryder13
b63e99efd8
OpenGL Screen Flip
...
Screen flipping in OpenGL is no longer done by inverting the screen
polygons.
2014-04-07 17:08:04 +01:00
Sryder13
7e04e679a9
Player Spin Frame MD2 Interpolation
...
Player spin frames on MD2's interpolate correctly when moving slowly.
2014-04-07 12:37:15 +01:00
Sryder13
56fbdfdad3
OpenGL Translucent Midtexture Fix
...
Translucent Midtextures using holes with textures in them now work when
there is no FOF's above their sector.
2014-04-05 22:13:09 +01:00
Sryder13
fc12fc7cd4
OpenGL Screen Fading Fix
...
Screen Wipes now work as they did in 2.0.x.
2014-03-31 23:47:12 +01:00
Sryder13
d75d7cd09a
OpenGL Splitscreen Fix
...
First screen in split-screen is now not completely black.
2014-03-31 00:07:55 +01:00
Sryder13
9f0aacb059
MD2 Texture load fix
...
Fixes MD2's using sprites on the first frame when they're loaded.
2014-03-30 17:45:58 +01:00
Sryder13
fc978c79bb
OpenGL wall Y offset
...
Fixed wall textures breaking when Y offset of the wall was too high.
2014-03-28 23:28:00 +00:00
Sryder13
b075d1e3fa
Redwall sky gone
...
More redwall sky shenanigans gone.
2014-03-24 17:29:14 +00:00
Sryder13
9e10e3278b
Negative Light
...
Light no longer goes wrong when lightlevel of a sector is negative.
2014-03-24 17:11:45 +00:00
Sryder13
770c7eeade
LightLevelToLum gone
...
LightLevelToLum unused by everything now, it seemed to be giving wrong
values for lightlevels.
2014-03-24 16:11:25 +00:00
Sryder13
103258e364
OpenGL Flipped Patch Drawing
...
V_FLIP in OpenGL.
2014-03-23 23:37:44 +00:00
Sryder13
734d6b56f0
OpenGL Flashpal Flashes
...
Fixed flashes for OpenGL Nukes/Teleports etc.
2014-03-23 00:04:35 +00:00
Sryder13
9386b3900b
OpenGL remove HOMs
...
Removes HOMs from OpenGL.
This also seems to have made skyboxes not draw ontop of everything else
on Intel GPU's.
2014-03-22 17:17:40 +00:00
Sryder13
1f452953b6
Post processor skybox
...
Post processing no longer done in the skybox.
2014-03-22 14:52:32 +00:00
Alam Ed Arias
ed72bd8fa1
SRB2 2.1.4 release
2014-03-21 19:21:06 +00:00
Sryder13
c72fc0f10d
Warning gone.
...
Hopefully.
2014-03-21 18:03:40 +00:00
Sryder13
24681013d1
Opaque translucent midtextures
...
Fixed translucent midtextures being opaque when there were multiple
lights in a sector.
2014-03-20 20:34:56 +00:00
Sryder13
dd16f58e38
OpenGL Skybox
...
OpenGL skyboxes.
Slight change to sky vertical offsetting.
2014-03-20 20:13:15 +00:00
Sryder13
2b80874646
MD2's replacing skinned mobj fix
...
MD2's that replace mobjs that have a skin, but the skin doesn't have an
MD2 now display.
2014-03-19 23:40:02 +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