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

Yeah, whatever, this is changing stuff that was already all my own
anyway, and I already extensively tested it in the *first* place
when I was measuring the amount of time it took.

Honestly this could be merged into public master, but pfft...

See merge request !19

The less branches, the better.

Optimization is a bitch, you know.

(Detons need deathstates, otherwise they are removed partway through exploding. Not fun.)

I hate merges. Why do things keep getting undone?

Dispoffset changes

Dispoffset now works in OpenGL, and the feature has been optimized so high dispoffset values don't cause sprites to be distorted anymore.

See merge request !12

Monster Iestyn authored 9 years ago and colette committed 9 years ago

Compiling errors fixed in this commit:
* Various cases of mixed declaration and statement code
* Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places)
* an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT
* a few minor cases of bad unsigned-signed comparisons
* no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!

Monster Iestyn authored 9 years ago and colette committed 9 years ago

NextLevel for level headers can now take the special strings "Title" "Evaluation" or "Credits" in place of their usual numbers (optionally, that is)

Dehacked changes

TITLE, EVALUATION and CREDITS are now valid options for a level header's "NextLevel" parameter. All works fine last I tested this feature.

See merge request !11

Actions tweaks

This just rewrites the action A_SetTargetsTarget currently, dunno if I'll bother to tweak any more actions in the near future \*shrugs\*

That said, PLEASE check whether the action works properly before accepting the merge. It's been a while since I last did anything with this branch, so I forget entirely whether I tested it or not.

See merge request !27

(I won't touch overlays for now)

more detailed description: vissprites now store dispoffset in a separate variable from (y)scale, and uses it to influence order between sprites without it affecting the actual drawing of the sprites themselves

It's not SKINCOLOR_ROSYSUPER1, after all.

Conflicts:
	src/dehacked.c

NextLevel for level headers can now take the special strings "Title" "Evaluation" or "Credits" in place of their usual numbers (optionally, that is)

Compiling errors fixed in this commit:
* Various cases of mixed declaration and statement code
* Implicit declaration of slope functions (read: you forgot to put "include "p_slopes.h" in MORE than a few places)
* an odd case of a bad fixed_t to float typecase, cause by using P_GetZAt directly inside FIXED_TO_FLOAT
* a few minor cases of bad unsigned-signed comparisons
* no prototypes for some of the new slope functions. For goodness sake Red, this is basic stuff!

FOF slope/ground slope weirdness fix

Solves STJr/SRB2Internal#26 .

See merge request !26

Slopes and stuff

Adds support for slopes, slopes on FOFs, slopes on translucent FOFs, slopes on FOFs with holes in the flat, slope physics, dynamic slopes, vertex slopes, dynamic vertex slopes, and a ham sandwich to the game. Only for software mode right now, though. (OGL still gets the physics and the sandwich.) Some things still need to be done, but for now this can be merged in to be finished later.

Please make sure nothing in the vanilla game breaks before giving the thumbs up for this merge.

Since this doesn't merge automatically, if the code review turns out positive and nobody else has done it, I'll handle the merging.

See merge request !22

F key menu hotfix

Fixes the issues shown here: https://mb.srb2.org/showthread.php?t=40754

See merge request !23

Monster Iestyn authored 9 years ago and Alam Ed Arias committed 9 years ago

Add M_Options(0); to F4/F5/F7 code to prevent them going to Main Menu instead of SP/MP pause menus when the latter should be shown

Add M_Options(0); to F4/F5/F7 code to prevent them going to Main Menu instead of SP/MP pause menus when the latter should be shown

To be specific: when a sector had a sloped ceiling and a colormap was
placed above it, the colormap wouldn't fill anything above where the
ceiling height is at the sector's midpoint. This is fixed.

Oops. (Minor animation bugfix I forgot.)

Apparently I pushed this one commit to GitHub instead of SRB2Internal before the branch was merged...

Oops.

See merge request !8

Conflicts:
	src/p_map.c - Automatically resolved by mergetool

(she helped port important drawing code!)