stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-13 22:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
12702 commits 173 branches 41 tags 250 MiB
Commit graph

1160 commits

Author SHA1 Message Date
Monster Iestyn
41dfba65c9 Hack to make sure even (extra)subsectors without planepolys have segs adjusted 
this fixes a crash in (old) GFZ2 at the ramp as a result of creating pv1/pv2. This probably means before pv1/pv2 there could have been some silly typecasting from vertex_t to polyvertex_t to get fixed vertex coords and such...
 2016-12-21 22:10:27 +00:00
Monster Iestyn
106e1aa8d5 Merge branch 'master' into opengl-improvements 2016-12-21 19:49:02 +00:00
Monster Iestyn
a9cfd12e04 Created R_GetTextureNum to make sure top/bottom/midtexture texture ids are always valid in rendering code for both software and OpenGL (and also for the Solid Midtexture effect physics code) 2016-12-16 21:38:53 +00:00
Sryder
2e72539df2 Remove accidental leftovers 
Accidentally left a comment and stuff in there from previous attempts
 2016-12-13 21:22:40 +00:00
Sryder
4fb2a18846 Fix a one character bug with clipping 2016-12-13 21:18:05 +00:00
Sryder
39d4f22660 Flat sprites for OGL 2016-12-13 21:02:23 +00:00
toasterbabe
85fb02aaf6 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 
# Conflicts:
#	src/p_inter.c
#	src/p_user.c
#	src/st_stuff.c
 2016-11-20 16:44:38 +00:00
Monster Iestyn
eab2df5627 Merge branch 'public_next' 2016-11-16 12:20:37 +00:00
Monster Iestyn
694bb73ef7 Merge branch 'master' into next 2016-11-16 12:16:51 +00: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
toasterbabe
645e7298c0 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-12 13:43:02 +00:00
Monster Iestyn
5be8e4f1b0 Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore 
Yes I know they're void * in r_defs.h's seg_t definition, it's quicker than trying to figure out if including hardware/hw_glob.h is a good idea or not
 2016-11-07 21:55:56 +00:00
Monster Iestyn
817f0908e4 made HWR_CreateBlendedTexture's color switch case take up not so many lines, and only one V_GetColor call is used now 2016-11-07 18:34:51 +00:00
Monster Iestyn
bbd67a6960 Merge branch 'master' into opengl-improvements 2016-11-06 18:02:34 +00:00
Monster Iestyn
cb1fbbf345 Merge branch 'public_next' 2016-11-06 18:02:12 +00:00
Monster Iestyn
f97301b8b8 Merge branch 'master' into next 2016-11-06 17:59:35 +00:00
Monster Iestyn
2dfb841c38 Correcting slight mistake I made 2016-11-06 17:50:04 +00:00
toasterbabe
b5a6bfe046 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-11-06 16:03:12 +00:00
Monster Iestyn
05860b2fa1 Ensure file is closed whenever MD2 reading errors happen 2016-11-05 20:51:48 +00:00
Monster Iestyn
b00c680437 Add MD2_INDENT and MD2_VERSION so we can cleanly check that it's a valid MD2 from magic number/version 2016-11-05 20:40:48 +00:00
Monster Iestyn
2df7d8c4aa Merge branch 'public_next' 2016-11-05 19:52:27 +00:00
Monster Iestyn
7b9328781f Merge branch 'master' into next 2016-11-05 19:36:04 +00:00
Monster Iestyn
8909b7c27b Change >= to >, I THINK having exactly 4096 vertices is safe? 2016-11-05 17:38:36 +00:00
Monster Iestyn
efe02e2a42 allow triangle/frame limits too 2016-11-03 22:53:49 +00:00
Monster Iestyn
561a0fe768 Attempt loading of an MD2 only once; if we failed then don't bother again 
This keeps my new error messages from flooding the console and log.txt
 2016-11-03 21:06:23 +00:00
Monster Iestyn
2ec972af54 check numVertices, bail out and print error message if there are too many 
I added similar checks for the other num* but it seems some MD2s break the other limits without knowing anyway ...so I've commented these checks out for now, unless we have further discussion regarding them later on
 2016-11-03 20:40:17 +00:00
toasterbabe
5a798bddbd Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-29 17:14:45 +01:00
Monster Iestyn
cd3895f676 Merge branch 'public_next' 2016-10-29 17:03:38 +01:00
toasterbabe
ab6fd676b5 YUP, I just fixed OGL Precipitation with this branch too. What the fuck? Squashing ancient bugs, woo. 2016-10-29 11:54:51 -04:00
toasterbabe
c18c014bef Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions 2016-10-23 14:47:37 +01:00
toasterbabe
3aa9d2a1b1 Sonic 3 shields implemented at a basic visual/functional level - no abilities yet. 2016-10-15 23:39:54 +01:00
Inuyasha
ff4b39bab4 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into nix-srb1 
# Conflicts:
#	src/info.c
 2016-10-05 18:47:32 -07:00
toasterbabe
5614ff5691 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites 
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
 2016-10-02 19:38:53 +01:00
Inuyasha
f1b8bfcfe7 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors 
# Conflicts:
#	src/info.c
#	src/p_map.c
 2016-09-29 18:08:50 -07:00
Inuyasha
d7aae15a6f Merge branch 'animated-sky' into 'master' 
Animated sky support

What it says on the tin: skies can be animated textures now. Just set them up as normal animated textures (keeping in mind the starting texture still has to comply with the SKYn/SKYnn/SKYnnn naming format) and hey presto, your sky animates.

See merge request !34
 2016-09-29 08:34:12 -04:00
toasterbabe
c70661186a Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites 
# Conflicts:
#	src/dehacked.c
#	src/p_inter.c
#	src/p_pspr.h
 2016-09-27 18:11:20 +01:00
Inuyasha
1a4b894589 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors 
# Conflicts:
#	src/info.c
 2016-09-24 23:05:01 -07:00
toasterbabe
50a44d96b1 Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta). 2016-09-24 17:15:42 +01:00
toasterbabe
28523760c3 FF_VERTICALFLIP, since I've been messing around with sprite stuff. 
* flips the sprite ala MFE_VERTICALFLIP except you don't need to flip the direction of gravity for the object just to draw upside down
* stacks properly with reverse gravity
 2016-09-24 14:23:00 +01:00
toasterbabe
8d8be8a7b2 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements 2016-08-30 13:30:56 +01:00
toasterbabe
c5675c0725 Merge branch 'new_spriteframe_angle' of http://git.magicalgirl.moe/STJr/SRB2.git into public_flatsprite 
# Conflicts:
#	src/r_things.c
 2016-08-22 22:56:30 +01:00
toasterbabe
9c02c81095 Now that it's not 3am, here's some fixes to what I pushed last night. 
* That hacky anti-NiGHTS-deaxisment code I commented out because I thought it was visual only? Reimplemented in a way that is both more and less hacky. It's identical in result to the original code, but takes a roundabout method to get there.
* Sprite references for SUPE, SUPZ and NDRL are removed because they are now unused.
* Helper's flashing conditional is restructured to do less flag swapping.
* The check for super setting FF_FULLBRIGHT is limited to MAXTRANSLATIONS now, and also correctly takes into account MAXSKINCOLORS == SKINCOLOR_SUPERSILVER1.
* NiGHTS collision bounds aren't hardcoded anymore.
* NiGHTS link will never display when leaving stage.
* Slightly tweaked rules for the supercolor setting when doing a NiGHTS transformation, but only meaningful for setting FF_FULLBRIGHT.
 2016-08-12 14:42:22 +01:00
Alam Ed Arias
074dde5f78 Merge branch 'public_next' into master 2016-08-11 12:59:04 -04:00
toasterbabe
3310b02b68 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements 2016-08-11 17:46:08 +01:00
toasterbabe
b3b6d5c4f9 woops, renamed superwhite to supersilver during writing and forgot to change this comment 2016-08-10 19:54:07 +01:00
toasterbabe
810e1ec041 SUPERCOLOR BONANZA COMMIT. 
* Several new supercolours.
	- SKINCOLOR_SUPERSILVER1-5 (for fun) - "Silver"
	- SKINCOLOR_SUPERPERIDOT1-5 (nyeheheh) - "Peridot"
	- SKINCOLOR_SUPERCYAN1-5 (for fun) - "Cyan"
	- SKINCOLOR_SUPERPURPLE1-5 (for fun) - "Purple"
	- SKINCOLOR_SUPERRUST1-5 (mecha/metal sonic) - "Rust"
	- SKINCOLOR_SUPERTAN1-5 (shadow/silver the hedgehog) - "Tan"
* SKINCOLOR_SUPER1-5 renamed to SKINCOLOR_SUPERGOLD1-5, one index for darkest is changed - "Gold"
* SKINCOLOR_TSUPER1-5 renamed to SKINCOLOR_SUPERORANGE1-5, ported properly to the new palette - "Orange"
* SKINCOLOR_KSUPER1-5 renamed to SKINCOLOR_SUPERRED1-5, ported properly to the new palette - "Red"

* new S_SKIN attribute - supercolor - uses an entirely different function to get the names (R_GetSuperColorByName instead of R_GetColorByName)

* a fun little secret - typing "god on" in the console whilst super makes the player hyper (visual only, no sparkles - just rainbow flash) - can be removed if no fun is allowed
 2016-08-10 19:48:20 +01:00
toasterbabe
76e658bf1b Minor re-ordering to optimise this branch. 2016-08-07 00:21:16 +01:00
Monster Iestyn
fe5b8c58af Add basic support for animated sky textures 2016-07-31 20:51:39 +01:00
Monster Iestyn
2870e19f7f Take out fixedheight-based hacks for checking if floor or ceiling! Use an "isceiling" boolean for that instead 
This apparently fixes most of the issues with ceiling slopes in Boinciel's SUGOI map
 2016-07-27 19:56:21 +01:00
toasterbabe
333d8c882e Recreating NAMEcLcR sprite angle loading in internal, as Inu requested. 2016-07-19 00:04:00 +01:00
toasterbabe
f757fb3545 SF_MACHINE. Currently only changes drowning, but could do more. 
* Electric sparks coming off entire body instead of bubbles coming out mouth
* Different sounds.
* Different icons.

These sprites are currently local only, but I'll be doing a lot of asset updating this evening since Rob asked me to so it won't be long until you can get them.
 2016-07-16 22:43:49 +01:00
Alam Ed Arias
8f0994b38b Merge branch 'public_next' into master 2016-07-11 16:22:05 -04:00
Alam Ed Arias
0c8fcb5e4d Merge branch 'master' into repeat-monitors 2016-07-11 15:29:06 -04:00
toasterbabe
41b35a923f Gave the new flag-based system for sprite angles actual flag names instead of relying on magic numbers. 
Also, I did a wee smidgen of reorganisation.
 2016-06-16 14:20:03 +01:00
toasterbabe
52bf13367f New rotation functionality. 
* NAMEcL refers to a frame which is seen for the entirety of an object's left side.
* NAMEcR refers to a name which is seen for the entirety of an object's right side.
* NAMEcLcR does both sides.
* Having just a NAMEcL requires you to fill in the opposite side either with NAMEcn where n is 1 and 5 to 8 OR fill in with a NAMEcR
* Switches down the centerline of the object instead of at the ANGLE_202h interval for normal sprites.
* Characters were selected for 1) ease of use and 2) not getting in the way of adding support for zdoom's totally bananas 16-way sprite system at a later date if we so choose
 2016-06-16 00:59:54 +01:00
Alam Ed Arias
2c8008e11e NULL checks 2016-06-13 10:07:10 -04:00
Alam Ed Arias
1e507d3d1e added printf checks to hardware's I_Error 2016-06-12 16:08:48 -04:00
Alam Ed Arias
1e3631425f r_opengl: move DrawMD2i code to DrawMD2Ex 2016-06-12 16:08:48 -04:00
Alam Ed Arias
b9a39f3043 Merge branch 'public_next' into master 2016-06-04 22:36:55 -04:00
Monster Iestyn
4c422f6605 OpenGL: closed door/window detection code now accounts for slopes, just like in software 2016-06-04 18:31:21 +01:00
Alam Ed Arias
c23b40fa9c Merge branch 'public_next' into master 2016-06-02 18:39:08 -04:00
Monster Iestyn
c863e311fe OpenGL: Fix upper texture Effect 1 only skewing 2016-06-01 19:22:54 +01:00
Monster Iestyn
bf85cc25bd OpenGL: Fix lower unpegged texture offset, fix lower unpegged + effect 1 so the texture actually skews 2016-06-01 18:51:38 +01:00
Alam Ed Arias
e5a14d859e Merge branch 'public_next' into private 2016-05-27 11:37:09 -04:00
Monster Iestyn
0081397920 OpenGL: Fix MD2s on player 2's screen breaking when reverse gravity is involved 2016-05-27 14:53:36 +01:00
Alam Ed Arias
20dcf138e2 hardware: let not break MSVC support 2016-05-27 01:28:21 -04:00
Alam Ed Arias
008be7c90d hardware: start the surf as clean 2016-05-27 01:19:16 -04:00
Alam Ed Arias
b51a1148d1 Merge branch 'public_next' into master 2016-05-25 10:21:55 -04:00
Alam Ed Arias
57091261d9 MSVC: fixed up MSVC project 2016-05-21 23:53:04 -04:00
Alam Ed Arias
032313260a Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
Alam Ed Arias
e2a5783521 Merge branch 'master' into next 2016-05-19 01:39:45 -04:00
Alam Ed Arias
ab9f2ea831 MSVC: fixup Debug build linked 2016-05-18 21:11:30 -04:00
Alam Ed Arias
7058baed44 Merge branch 'master' into next 2016-05-18 20:07:27 -04:00
Alam Ed Arias
5aa48cf7ca fixed up old VS 2010 project to work with VS 2015, tested with FMOD/DirectX 2016-05-18 01:35:35 -04:00
Monster Iestyn
01debc27a2 Merge branch 'public_next' 2016-05-06 18:06:18 +01:00
Monster Iestyn
f0bea2cebf Merge branch 'next' into gl-slopes 2016-05-02 22:51:51 +01:00
Alam Ed Arias
be63e6b860 Merge branch 'public_next' into private 2016-04-30 11:51:55 -04:00
Alam Ed Arias
26f78de3b4 Merge branch 'master' into next 2016-04-30 11:45:11 -04:00
Sean Ryder
0eb41b4450 Flip fade mask Y coordinates 
For some reason every texture and flat loaded into GL is vertically flipped
 2016-04-30 13:40:00 +01:00
Sean Ryder
d2d73f085d Change internal formats of screen fade texture to RGB 
Don't think either of them need RGBA
 2016-04-29 20:56:46 +01:00
Sean Ryder
55a1de899c The fade masks textures should use an alpha format 
So they don't get effected by the texture format set by the screen depth
GL_RGB5_A1 from 16-bit was removing all alpha from the texture
 2016-04-29 18:58:20 +01:00
Alam Ed Arias
fbd9cb73c3 Merge branch 'public_next' into private 2016-04-27 16:54:37 -04:00
Inuyasha
b288d8a399 Merge branch 'bp_random2' into 'next' 
xorshift* PRNG

This needs testing to ensure I didn't mess anything up switching function names around.

Our PRNG sucks. This is probably obvious. I wish I had known better at the time I implemented it, but oh well.

The replacement is an xorshift* PRNG variant with period 2^32 - 1 (meaning that the PRNG state will loop after four billion calls ... that's not likely to happen), versus the old PRNG's period of about 2^22 (?). The output is also much more random and less predictable; the old PRNG would fall into a predictable loop of output after about 4000 numbers were generated, which isn't much.

The PRNG here also outputs numbers as fixed point from [0,1) (that's 0 to FRACUNIT-1, in other words) instead of single bytes at a time. This makes it much easier to calculate things for, say, P_RandomRange and P_RandomKey. A new macro, P_RandomChance(p), is now in use that returns true _p_ percent of the time, where _p_ is a fixed_t probability from 0 (0%) to FRACUNIT (100%).

This doesn't affect netgames at all; the code for seed saving and restoring is identical (aside from a check to prevent seed being set to 0, which breaks xorshift PRNGs). Demos break, but A: _duh_ and B: they're already broken by all the changes to physics to accommodate slopes.

P_Random is deprecated in Lua, as the function was renamed to P_RandomByte. Aside from that, nothing special.

See merge request !64
 2016-04-24 18:03:13 -04:00
Monster Iestyn
d53801c85c Disable the corona-related consvars unless ALAM_LIGHTING macro is enabled 2016-04-21 18:50:30 +01:00
Monster Iestyn
c833f3845f Merge branch 'next' into bp_random2 2016-04-20 18:18:28 +01:00
Monster Iestyn
11c24f5ab6 Merge branch 'next' into gl-slopes 
# Conflicts:
#	src/hardware/hw_main.c
 2016-04-09 22:12:29 +01:00
Inuyasha
0dd92e9396 V_DrawFill in OGL now consistent with software 2016-04-06 18:33:38 -07:00
Inuyasha
50d3fe15b8 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 
# Conflicts:
#	src/d_main.c
#	src/doomdef.h
 2016-03-31 21:17:29 -07:00
Alam Ed Arias
a935ac21e8 Merge branch 'next' into bp_random2 2016-03-30 20:40:48 -04:00
Alam Ed Arias
51aa7692d8 Merge branch 'master' into next 2016-03-30 20:15:08 -04:00
Alam Ed Arias
d90536967d removed/remline ununsed code 2016-03-30 14:05:07 -04:00
Inuyasha
ac03ce39c8 *_Random is now *_RandomByte. 
P_RandomChance is now a macro for something that should happen a
certain percentage of time.

P_SignedRandom was moved to a macro. Nobody cared.

# Conflicts:
#	src/p_inter.c
 2016-03-29 16:27:55 -07:00
Inuyasha
1ee01063e3 All SRB1 objects, states, and sprites removed. 2016-03-09 02:54:09 -08:00
Inuyasha
317161221d Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-03-09 01:23:48 -08:00
Inuyasha
5a38088623 Well, we don't need "experimental" slopes anymore either 
Not when we have properly working ones!
 2016-03-09 01:09:21 -08:00
Inuyasha
e7ff405c52 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 
# Conflicts:
#	src/hardware/hw_md2.c
#	src/p_mobj.c
#	src/p_mobj.h
 2016-02-29 00:14:16 -08:00
Alam Ed Arias
77dc27d070 Merge branch 'next' into backport_state-animations 2016-02-26 02:06:57 -05:00
Alam Ed Arias
0369f39ef4 Merge branch 'master' into gl-slopes 2016-02-22 00:15:26 -05:00
RedEnchilada
bcd05b1c63 Also fixed it for MD2s 2016-02-21 23:04:14 -06:00
RedEnchilada
ce793dfe28 Fix vissprite-related crashing in OGL 2016-02-21 22:50:29 -06:00
Monster Iestyn
f87f1b7b1a Fixed compiler errors as well as a ton of tab spaces (apparently it's a common problem in this file anyway but whatever) 2016-02-21 11:37:59 -06:00
toasterbabe
f59c8d20e5 fix md2 blendcolors for reduced palette 2016-02-11 18:37:53 -05:00
Alam Ed Arias
e4ad95856f Merge branch 'public_next' into master 2016-02-09 14:49:17 -05:00
Monster Iestyn
5d1c8d2968 My cherry picking somehow lead to these functions being doubled ...whoops 2016-02-09 19:35:04 +00:00
Alam Ed Arias
d09016c808 Merge branch 'public_next' into master 2016-02-09 14:19:50 -05:00
Alam Ed Arias
6000b5c980 Merge branch 'master' into next 2016-02-09 14:13:50 -05:00
Sean Ryder
ddb5652ab6 Tabbing 2016-02-09 18:05:19 +00:00
Sryder13
6b8c438e58 Change a few colours. 2016-02-09 18:05:11 +00:00
Sryder13
31deecc51c Colour Changing MD2s 
I don't know how I can move my old branch over so I've just created a new one.
 2016-02-09 18:04:59 +00:00
Monster Iestyn
700c9c2e70 Merge branch 'md2_colourchange' into 'master' 
Colour Changing MD2s

What it says it is, I haven't touched it in quite a while, but I have checked and it seems to be working.

See merge request !30
 2016-02-09 13:03:52 -05:00
Sean Ryder
b7ebb8186d Fix MD2 interpolation for FF_ANIMATE states 2016-02-09 16:20:18 +00:00
Inuyasha
e87a86dd67 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-02-03 18:03:02 -08:00
Inuyasha
f17be6641e Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-02-03 18:00:28 -08:00
Monster Iestyn
0455b572dc Removed weird test for water planes in HWR_Subsector 
It crashes when you try to test it anyway, lol
 2016-02-03 17:58:44 -08:00
Inuyasha
93d1f9920e Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-01-29 16:03:52 -08:00
Inuyasha
e6f0a4be18 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-01-29 16:01:57 -08:00
Inuyasha
f500986692 use RGB for screen texture, not RGBA 
the screen texture does not need an alpha channel.
the fact that it had one made OGL copy the topmost pixel of the screen texture's alpha channel.
which, naturally results in the screen becoming partially transparent and letting you see the working texture in the background.
 2016-01-29 16:01:05 -08:00
yellowtd
b3fbc37c94 Midtextures, lights, and culling fixes for ogl slopes 
There's a weird issue with lights that's hard to diagnose but otherwise
this is ready to go I think
 2016-01-27 20:10:02 -06:00
yellowtd
e6235d4d6b Fix FOF slope rendering in ogl 
should work as well as software if not better now
 2016-01-27 20:09:52 -06:00
yellowtd
52ae3f2875 GL slope walls and fixed plane culling 2016-01-27 20:09:34 -06:00
yellowtd
24da82f026 Begin work on OGL slope support 
unfinished
 2016-01-27 20:09:04 -06:00
Alam Ed Arias
3bfc402241 whitespace cleanup 2016-01-21 13:53:21 -05:00
Sean Ryder
7d914913dd Tabbing 2016-01-20 15:55:32 +00:00
Inuyasha
9ba43e1d01 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors 2016-01-15 02:20:34 -08:00
Alam Ed Arias
1a56d48cd9 Merge branch 'public_next' into master 2016-01-14 12:37:04 -05:00
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