stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
9450 commits 172 branches 41 tags 280 MiB
Commit graph

9450 commits

This branch
This branch
All branches
Author SHA1 Message Date
lachwright
248a80cac4 Cast to statenum_t for 32-bit compatibility 2020-02-11 20:36:48 +08:00
lachwright
c417ffae4c Add proper support for animated signpost 2020-02-11 15:53:25 +08:00
MascaraSnake
be67719a2a Merge remote-tracking branch 'Public/2.2.1-prep' into public_next 2020-02-10 22:47:22 +01:00
MascaraSnake
8618589acc Merge remote-tracking branch 'Public/next' into public_next 2020-02-10 22:44:15 +01:00
fickleheart
a63e9fe002 Improvements to polyobjects carrying things: 
- Fixed loss of precision in rotate carry causing objects to slide off
- Adjusted player carrying logic to make platforms less slippery
- Finally obsoleted the player-specific rotate hack now that I found the
  actual problem :]
 2020-02-10 00:07:25 -06:00
Steel Titanium
4281de3b89 Update file hashes 2020-02-09 21:29:46 -05:00
Steel Titanium
13e5911de7 Merge branch 'next' into 2.2.1-prep 2020-02-09 20:30:48 -05:00
Monster Iestyn
e5a325994e Use the provided Regex strings to properly turn the entire info.h states/mobjtypes lists into strings for dehacked.c 
...it's surprising what we actually missed in the states list, apart from just the missing state (yes this makes the states fix branch redundant)
 2020-02-09 19:15:04 +00:00
Alam Ed Arias
1d2f6c9581 Merge branch 'master' into next 2020-02-09 10:37:10 -05:00
Alam Ed Arias
15c263e9c7 Z_Zone: fixup Valgrind support 2020-02-09 10:35:23 -05:00
Jaime Passos
2162cbd794 Merge branch 'customgametypeswtf' into 'next' 
Fix broken GT_ constants with custom gametypes

See merge request STJr/SRB2!769
 2020-02-08 23:17:35 -05:00
Jaime Passos
2d0e72d756 Fix broken GT_ constants with custom gametypes 2020-02-08 21:40:30 -03:00
SteelT
69c2dc743b Merge branch 'credits-stuff' into 'next' 
Update credits again

See merge request STJr/SRB2!760
 2020-02-08 19:25:46 -05:00
Jaime Passos
5e516eb98d 1 left shifted by zero is still 1 2020-02-08 18:50:05 -03:00
lachwright
7a5d7afb30 Add Rob as the game's producer 2020-02-06 23:06:15 +08:00
Steel Titanium
d03d09f397 Update credits again 2020-02-05 15:20:35 -05:00
Monster Iestyn
f1bdaa2fda Updated version number to 2.2.1, increment MODVERSION. 
Also updated CMakeLists.txt, appveyor.yml and this one Xcode project file as usual
 2020-02-05 19:55:40 +00:00
James R
7805828c4a Merge remote-tracking branch 'origin/master' into next 2020-02-04 14:31:21 -08:00
colette
01433c3648 Fix title/card hud hooks grabbing the wrong functions 2020-02-03 23:09:18 -05:00
James R
700d9426d4 Merge branch 'name-stuck' into 'master' 
Fix game hanging on server creation/splitscreen if your name is whack

See merge request STJr/SRB2!752
 2020-02-03 03:49:13 -05:00
James R
bd90c20366 Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦 2020-02-02 18:00:02 -08:00
James R
f8310236e0 Merge branch 'folder-blacklist' into 'public_next' 
Implement folder blacklisting

See merge request STJr/SRB2Internal!626
 2020-02-02 20:35:51 -05:00
Steel Titanium
1794949696
Add empty entry 2020-02-02 18:52:41 -05:00
James R
5a524f21da Merge branch 'starpost-config-additions' into 'next' 
Starpost config additions

See merge request STJr/SRB2!680
 2020-02-01 21:42:43 -05:00
James R
ce3a79e51a Merge branch 'bruh2' into 'master' 
Fix fuckup 2

See merge request STJr/SRB2!744
 2020-02-01 21:42:21 -05:00
James R
ec995d620f Merge branch 'rotsprite-memory-leak' into 'next' 
Fix memory leak when caching rotsprite

See merge request STJr/SRB2!745
 2020-02-01 21:42:12 -05:00
James R
c069cf94bc Merge branch 'tnt-is-laggy' into 'next' 
Make flying TNTs' explosions not so laggy the first time

See merge request STJr/SRB2!746
 2020-02-01 21:41:59 -05:00
James R
52c1e73035 Merge branch 'platform-fixes' into 'next' 
Reset pmomz after applying it to momz

See merge request STJr/SRB2!747
 2020-02-01 21:41:49 -05:00
James R
5c8406f6d7 Merge branch 'protect-wrists' into 'next' 
Remove flight cutoff property

See merge request STJr/SRB2!748
 2020-02-01 21:41:33 -05:00
James R
c46d9a1b87 Merge branch 'file-param-error' into 'master' 
Don't I_Error if non base files fail to load with -file

See merge request STJr/SRB2!678
 2020-02-01 21:41:22 -05:00
James R
d5ced42f06 Remove Player 0 2020-02-01 18:22:03 -08:00
James R
bf3b7fc5b0 Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R
ab8eed6efb Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08:00
LJ Sonic
bd6438dda1 Merge branch 'fix-splitscreen' into 'next' 
Fix splitscreen player being unable to move

See merge request STJr/SRB2!749
 2020-02-01 16:18:40 -05:00
Louis-Antoine
7dd0f2b808 Fix splitscreen player being unable to move 2020-02-01 20:19:39 +01:00
Jaime Passos
77f373c903 Merge branch 'am-line' into 'master' 
Automap fixes

See merge request STJr/SRB2!735
 2020-02-01 03:22:53 -05:00
Jaime Passos
decc381698 Merge branch 'colorlutfix' into 'master' 
Fix color LUT using the wrong palette

See merge request STJr/SRB2!739
 2020-02-01 03:22:26 -05:00
lachwright
f5e49ace00 Have spin set fly1 to 2 instead of 0, akin to the previous cutoff behavior 2020-02-01 14:49:48 +08:00
lachwright
ec02a90ebc Make flight controls less bullshit 2020-02-01 14:29:49 +08:00
lachwright
d67388ece0 Merge branch 'next' into platform-fixes 2020-02-01 13:34:04 +08:00
Steel Titanium
a2c15c5cb2
Only check if the directory is not empty, use strncasecmp for case insensitive comparing, and remove debug print 2020-01-31 20:21:09 -05:00
James R
a46b397659 Remove code that does effectively nothing 2020-01-31 14:35:19 -08:00
James R
71707e6dca Reset rollangle on TNT explosion 
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
 2020-01-31 14:32:47 -08:00
Steel Titanium
7c83e5e420
Implement folder blacklisting 2020-01-31 16:37:55 -05:00
James R
3afc766f5e Oops 2020-01-30 23:58:35 -08:00
James R
4238003887 Merge remote-tracking branch 'origin/master' into next 2020-01-30 23:54:56 -08:00
James R
aad4b6f8a1 Merge branch 'i-can-see-myself' into 'master' 
Don't draw yourself in first person!

See merge request STJr/SRB2!697
 2020-01-31 02:34:11 -05:00
James R
6528b4a0f8 Merge branch 'opengl-skipintro-sigabrt' into 'master' 
Fix crash when using -skipintro and the renderer is set to OpenGL from config

See merge request STJr/SRB2!714
 2020-01-31 02:34:08 -05:00
James R
d7fcd3384a Merge branch 'cybrak_flamedmg' into 'next' 
Fix damagetype for Cybrak flamethrower.

See merge request STJr/SRB2!731
 2020-01-31 02:34:05 -05:00
James R
d1e954ec9c Merge branch 'angle-clamp' into 'master' 
Fix the minecart angle thing in netgames

Closes #69

See merge request STJr/SRB2!732
 2020-01-31 02:33:59 -05:00