stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-17 16:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
4987 commits 175 branches 41 tags 272 MiB
Commit graph

4987 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
c38af2c6a2 Remove unused maxtop variable 2016-01-02 23:26:22 -06:00
Wolfy
82b4320c61 Merge branch 'reduced_palette' into 'dashmode' 
Merge reduced palette into dashmode branch

This is necessary for Metal Sonic to work.

See merge request !14
 2016-01-03 00:08:29 -05:00
RedEnchilada
ba8c0dfc6e Clean up dash mode and make multiplayer-compatible 
Actionspd is now the running speed in dashmode.
 2016-01-02 22:58:35 -06:00
RedEnchilada
a15a4ace7e Do dashmode thok speed adjustments at thok instead of modifying actionspd 2016-01-02 22:34:55 -06:00
RedEnchilada
b9b1e2b298 Fix MD2s 2016-01-02 21:53:43 -06:00
wolfy852
ebd2bdd1c8 Add CA_DASHMODE to the game 
This works fine in single player on vanilla builds, multiplayer is untested. This might not be the best way to handle the ability, so modifications for efficiency/sanity might be necessary.
 2016-01-01 14:53:29 -06:00
Inuyasha
98f652aca6 Big monitors are "Gold Monitors" now. 
The useless ones have been removed, too, and they should always spawn as what they should regardless of settings.
By the way, graphics are at https://dl.dropboxusercontent.com/u/3518218/22/monitorgfx.wad
 2015-12-31 15:29:08 -08: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
Nipples the Enchilada
0a0f16a001 Merge branch 'actions-tweaks' into 'next' 
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
 2015-12-30 14:45:37 -05:00
Monster Iestyn
e0e9c7c172 Added missing SHORT macros around these variables, they're needed for big-endian builds to use these properly 
...I'm to blame for this particular slipup as it happens, surprise surprise
 2015-12-01 22:38:57 +00:00
Monster Iestyn
bb9488f2a2 Removed a few old OpenGL-specific hacks that compensated for lack of dispoffset 
(I won't touch overlays for now)
 2015-11-23 21:04:33 +00:00
Monster Iestyn
30ef257050 dispoffset now works in OpenGL 2015-11-23 17:01:10 +00:00
Monster Iestyn
f6eac1a6ac large dispoffset values no longer cause sprites to be distorted 
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
 2015-11-23 16:39:32 +00:00
Yukita Mayako
4e2cc2c200 Fixed more logic bugs. 
SPR_FIRSTFREESLOT is not the same as SPR2_FIRSTFREESLOT.
What was I, drunk?
 2015-11-10 20:46:10 -05:00
Yukita Mayako
24ab56691e Fixed spr2 freslot logic bug. 2015-11-10 20:33:29 -05:00
Yukita Mayako
2b6e65f122 Added missing comma to COLOR_ENUMS string array after "ROSY". 
It's not SKINCOLOR_ROSYSUPER1, after all.
 2015-11-09 16:45:35 -05: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
Monster Iestyn
fed463f1d2 NextLevel for level headers can now take the special strings "Title" "Evaluation" or "Credits" in place of their usual numbers (optionally, that is) 2015-11-08 17:50:05 +00:00
wolfy852
5409367a5f Define TRANSPARENTPIXEL as 255 in asm files 2015-11-07 15:32:11 -06:00
wolfy852
1ed5407821 update stuff 2015-11-07 13:56:21 -06:00
Monster Iestyn
77f118dd2f Removed dummied-out Pope XVI code 2015-11-06 14:23:06 +00:00
Yukita Mayako
14e8ac702f Added freeslots for SPR2. 
Make sure your MAINCFG / LUA lump comes _before_ the S_SKIN section.
 2015-10-31 14:45:42 -04:00
Monster Iestyn
b94fc008ab doomtype.h tweaks 
some of the mess in here really bothers me
 2015-10-21 16:01:16 +01:00
Monster Iestyn
ac24ce234f If this isn't an accidental copy+paste then I'd be very surprised 2015-10-21 15:40:59 +01:00
Monster Iestyn
e0deaaf3ff From what I can tell, correcting this one value in finetangent[] shouldn't cause any harm at all, so... 2015-10-21 15:32:50 +01:00
Monster Iestyn
98ad63eb06 Partial undo of what I did last commit to make Inu happy again. 
Note: polyobj_t's "translucency" is apparently a SIGNED integer, so in theory it's possible to get polyobj flats to use the "spanfunc = splatfunc" line using negative values. If this is not meant to happen, this should probably be fixed asap
 2015-10-12 15:10:43 +01:00
Monster Iestyn
165aec3d34 FF_TRANSSHIFT is meant for transmaps linked to states, not anything else! 
I'm surprised how the source code flew in the face of this fact for so long and just used it everywhere, that's just silly.
 2015-10-11 22:23:40 +01:00
Monster Iestyn
08c0c7676c Since cv_pointlimit is handled in P_CheckPointLimit, I've just created P_CheckTimeLimit for cv_timelimit. 
It helps make P_UpdateSpecials less messy-looking anyway.
 2015-10-11 21:01:04 +01:00
Monster Iestyn
a9b96a1668 Replaced the old finetangent[] with a new more accurate one I made using a Python script. 
Actually uses 0 and 65536 now! (and also INT32_MIN)
 2015-10-11 14:05:05 +01:00
Monster Iestyn
fdc2c3adcd Fix up lib_finetangent so tan() returns values starting from "0" in Lua (finetangent itself hasn't been touched) 
Also fixed how the function went out of the array's bounds for ANGLE_180 and above (or negative angles)
 2015-10-10 21:21:16 +01:00
Monster Iestyn
d4976d677f Move finecosine[] declaration to where it really belongs in the source code 2015-10-10 20:30:29 +01:00
Alam Ed Arias
79aaa00d14 Merge remote-tracking branch 'private/slopes-compile-fix' into private 2015-10-10 14:20:43 -04:00
Monster Iestyn
368b458eee We can compile the slopes code now, yay! My brain hurts. 
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!
 2015-10-10 17:57:35 +01:00
Monster Iestyn
d7b402e3c4 More cleanup, most notably dumping ring spilling code in P_RingDamage 
...one wonders why P_RingDamage didn't already do that in the first place
 2015-10-06 22:05:32 +01:00
Monster Iestyn
a84c2c6081 Some cleanup and reordering 2015-10-06 21:14:11 +01:00
Monster Iestyn
31b2919847 Added a "damagetype" argument to P_ShieldDamage. We don't use MT_NULL to hack in damage for sector specials anymore, after all. 
Must have forgotten to do this back when I originally implemented damage types, oh well.
 2015-10-05 20:18:45 +01:00
Monster Iestyn
175561cc7f Check if God mode is one before even going to NiGHTS or player vs player damaging code or whatever. 2015-10-05 17:13:34 +01:00
Monster Iestyn
210757f27b Removed the removal of SF_SUPER from skins other than Sonic 2015-10-02 13:45:51 +01:00
Monster Iestyn
7dcf0d3d09 Fix an error from match-balancing being merged in. Apparently match-balancing also doesn't have a prototype for P_StealPlayerScore for whatever reason. 2015-10-01 20:02:44 +01:00
Yukita Mayako
ba77b235d1 Merge branch 'match-rebalancing' into damage-control 
Conflicts:
	src/p_inter.c
	src/p_user.c
	src/st_stuff.c
 2015-09-30 20:40:27 -04:00
Alam Ed Arias
6cde169c58 Merge branch 'public_next' into private 2015-09-26 22:10:59 -04:00
Nipples the Enchilada
93c31b5b72 Merge branch 'angles' into 'next' 
FOF slope/ground slope weirdness fix

Solves STJr/SRB2Internal#26 .

See merge request !26
 2015-09-26 18:51:34 -04:00
RedEnchilada
773e5fbda6 Fix sloped FOF/ground weirdness ( STJr/SRB2Internal#26 ) 2015-09-24 15:35:55 -05:00
Alam Ed Arias
6ad1086128 Merge branch 'public_next' into master 2015-09-03 15:58:16 -04:00
Alam Ed Arias
3917b02132 Merge branch 'angles' into 'next' 
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
 2015-09-03 15:57:01 -04:00
Alam Ed Arias
eb4de823e9 Merge branch 'public_next' into master 2015-09-03 13:55:29 -04:00
Alam Ed Arias
04c1a507ba Merge remote-tracking branch 'public/hotfix-hook_NetVars' into next 2015-09-03 13:54:12 -04:00
Yukita Mayako
52e2087ee7 Fixed NetVars hook mistakenly assuming index starts from 0. 2015-09-03 13:13:55 -04:00
Alam Ed Arias
f43a7e09eb Merge branch 'F-key-menu-hotfix' into 'next' 
F key menu hotfix

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

See merge request !23
 2015-09-01 22:58:13 -04:00