stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-12 13:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity
8648 commits 172 branches 41 tags 242 MiB
Commit graph

8648 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Cochenour
74d7f256a7 More blend image updates 
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software
 2019-12-29 16:36:53 -05:00
Sally Cochenour
dcc7426d1d Merge branch 'next' into oglshaderport 2019-12-29 00:00:30 -05:00
Alam Ed Arias
d588e3ca9c Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Alam Ed Arias
2acb4f9840 Revert "Delete the original configuration file." 
This reverts commit 2cf94ea6ae.
 2019-12-28 21:43:10 -05:00
Alam Ed Arias
c27d062cc8 Merge branch 'fixmain' into 'master' 
Fix logfiles crashing Windoze (resolves #102)

Closes #102

See merge request STJr/SRB2!591
 2019-12-28 21:15:23 -05:00
Jaime Passos
244f0b228f Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Jaime Passos
3bb7fd4cbf Fix logfiles crashing Windoze 2019-12-28 22:14:23 -03:00
James R
90e56bcdf9 Merge branch 'levelload-refactor' into 'next' 
Hack P_SetupLevel into little pie- actually just clean it up a bit

See merge request STJr/SRB2!587
 2019-12-28 19:37:06 -05:00
James R
97f1da9c12 Merge branch 'give-brains-back' into 'next' 
Remove MF_NOTHINK from join-breaking referenced objects

See merge request STJr/SRB2!589
 2019-12-28 19:33:35 -05:00
lachwright
5ed1dc5410 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
Sally Cochenour
a66fb15ff2 Merge branch 'next' into oglshaderport 2019-12-28 13:58:41 -05:00
MascaraSnake
ceca99e3c5 Fix accidental removal of sector_t's spawn_lightlevel initialization 2019-12-28 13:58:23 +01:00
MascaraSnake
e9376a8353 Cleaned up some more stuff in P_LoadLevel() 2019-12-28 12:48:32 +01:00
MascaraSnake
c059146937 Move more P_LoadLevel parts into subfunctions 2019-12-28 11:37:56 +01:00
MascaraSnake
319ed09c00 Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions 2019-12-28 11:30:39 +01:00
MascaraSnake
08895ef751 Fixed/clarified some flag descriptions in the ZB config 2019-12-28 08:43:27 +01:00
MascaraSnake
f83d0fe3a1 Fixed/clarified some flag descriptions in the ZB config 2019-12-28 08:42:16 +01:00
Alam Ed Arias
94bb6655a5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
James R
152a63b682 Merge branch 'rotsprite3' into 'next' 
More rollangle changes

See merge request STJr/SRB2!582
 2019-12-27 16:49:21 -05:00
James R
69ad41e58e Merge branch 'skinusable-fix' into 'next' 
Fix edge case with R_SkinUsable

See merge request STJr/SRB2!573
 2019-12-27 16:49:06 -05:00
Alam Ed Arias
0caa08defd fread and fwrite use size_t, not int 2019-12-27 13:08:26 -05:00
Alam Ed Arias
ff004c4cf6 we only need link on unix systems 2019-12-27 13:05:15 -05:00
MascaraSnake
45c432462e Merge branch 'why-inline' into 'master' 
I got a compiler warning from P_PlayerHitsPlayer being too big

See merge request STJr/SRB2!581
 2019-12-27 02:12:01 -05:00
MascaraSnake
6a85e40232 Merge branch 'zb-config-refactor' into 'next' 
Zone Builder configuration refactor

See merge request STJr/SRB2!570
 2019-12-27 02:04:22 -05:00
James R
e19d0877e8 Merge branch 'time' into 'master' 
haha log files

See merge request STJr/SRB2!567
 2019-12-26 21:43:46 -05:00
Jaime Passos
da1718f93c Avoid possible overflows in the rotsprite arrays. 2019-12-26 21:49:36 -03:00
Jaime Passos
4b653a0b12 Remove the min() and max() calls. 2019-12-26 21:36:35 -03:00
Jaime Passos
56fd29a42a stuff 2019-12-26 21:27:30 -03:00
James R
1dac3d174e Merge remote-tracking branch 'origin/master' into next 2019-12-26 15:35:53 -08:00
James R
5872e8d453 Merge branch 'rotsprite2' into 'next' 
rollangle and SpriteInfo changes

See merge request STJr/SRB2!547
 2019-12-26 18:32:37 -05:00
Jaime Passos
c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R
414a066ec8 Merge branch 'turnmultiplier' into 'master' 
Option to increase the turning speed

See merge request STJr/SRB2!553
 2019-12-26 18:18:23 -05:00
James R
aa9cc6e6f2 Merge branch 'char-damage-fix' into 'next' 
Fix Amy and Fang being able to attack other players in MP Special Stages

See merge request STJr/SRB2!558
 2019-12-26 18:18:10 -05:00
James R
e6532b9bad Merge branch 'gametype-clownery' into 'next' 
Custom gametypes

See merge request STJr/SRB2!566
 2019-12-26 18:08:41 -05:00
James R
dd1ca69f54 P_PlayerHitsPlayer is too big for inline, and these other functions are getting there 2019-12-26 14:59:31 -08:00
Monster Iestyn
ca5a4d90e0 Fix mixed declaration-and-code compiling error 2019-12-26 21:59:09 +00:00
MascaraSnake
b24bcbab65 Merge branch 'mobjthinker-refactoring' into 'next' 
Hack P_MobjThinker into little pieces

See merge request STJr/SRB2!574
 2019-12-26 14:59:37 -05:00
Alam Ed Arias
e823441e31 Merge branch 'next' into mobjthinker-refactoring 2019-12-26 14:50:35 -05:00
Alam Ed Arias
61a0197339 Merge branch 'next' into gametype-clownery 2019-12-26 14:48:04 -05:00
Monster Iestyn
6314f5b00a Merge branch 'lua-damage-hooks-hotfix' into 'next' 
Lua: ShouldDamage/MobjDamage/MobjDeath hotfix

See merge request STJr/SRB2!575
 2019-12-26 13:05:06 -05:00
Alam Ed Arias
0a873d857d Merge branch 'next' into lua-damage-hooks-hotfix 2019-12-26 12:41:02 -05:00
Alam Ed Arias
50379dac85 cleanup buildbot error 2019-12-26 12:27:15 -05:00
Nev3r
4411a0f039 Merge branch 'ring-circle-fix' into 'next' 
Circle of Blue Spheres were spawning in place of Rings

See merge request STJr/SRB2!576
 2019-12-26 04:21:26 -05:00
Sally Cochenour
4c6664292e Increase precision of smooth contrast 2019-12-25 22:50:41 -05:00
Sally Cochenour
3eb6570123 Fake contrast 2019-12-25 20:09:31 -05:00
Sally Cochenour
439474882a Update blend textures to smooth out colors that have duplicate indices 2019-12-25 18:46:30 -05:00
James R
70f08007eb Correct the check for rings on thing 604 - 607 
The original code used a switch case, not AND 1. :V
 2019-12-25 15:23:19 -08:00
Monster Iestyn
5241030012 Fix ShouldDamage, MobjDamage and MobjDeath hooks all messing up the pushing of variables to Lua as function args, by adding damagetype support where it was missing! 
The above issue occured only if you had both a generic hook and a type specific hook for a particular hook type. This way, the stack is never updated to include damagetype at the start, and all pushes of the variables get offsetted by 1 compared to what they should be, once the code *expects* damagetype to be included in it.
 2019-12-25 21:48:59 +00:00
Sally Cochenour
da3d5a0184 Merge next 2019-12-25 14:41:31 -05:00
Sally Cochenour
7851bef929 Port of Jimita's shader stuff + my lighting shader 
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
 2019-12-25 14:22:01 -05:00