lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,414 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

9414 Commits

Author SHA1 Message Date
LJ Sonic b2168aba3b Merge branch 'fix-ded-servers' into 'next' 
Fix dedicated servers not running gamelogic

See merge request STJr/SRB2!788
 2020-02-15 18:01:04 -05:00
Louis-Antoine 7b13f0a2de Fix dedicated servers not running gamelogic 
Note to future testers:
Remember to test dedicated servers before merging.
And splitscreen also.
 2020-02-15 23:47:11 +01:00
MascaraSnake 31bce6c857 Merge branch 'master' into next 2020-02-15 12:32:09 +01:00
MascaraSnake 63ffe561ae Merge branch 'dropshadows-refactor' into 'next' 
Use exact object types when setting shadowscale

See merge request STJr/SRB2!755
 2020-02-15 06:31:25 -05:00
MascaraSnake b332aaa69f Merge branch 'fix-shift-in-ciptbx' into 'master' 
I broke SHIFT in the Connect IP Textbox.. whoops.

See merge request STJr/SRB2!777
 2020-02-15 06:31:23 -05:00
MascaraSnake 7bb7cb61ea Merge branch 'leftover-tokens' into 'next' 
Don't carry extra tokens into the next level if you got all 7 emeralds already

See merge request STJr/SRB2!778
 2020-02-15 06:31:17 -05:00
MascaraSnake 9bf0cfda5c Merge branch 'po-slide-fixes' into 'next' 
Improvements to polyobjects carrying things

See merge request STJr/SRB2!772
 2020-02-15 06:24:45 -05:00
MascaraSnake fff638f46a Merge branch 'S_SKIN-missing-flag' into 'next' 
Missing flag in S_SKIN

See merge request STJr/SRB2!781
 2020-02-15 02:07:56 -05:00
James R ba92db412a Merge branch 'patch-valid' into 'next' 
Don't error when checking patch.valid on invalid patches

See merge request STJr/SRB2!780
 2020-02-12 21:19:19 -05:00
James R 841094976b Add flag name variant of SF_NONIGHTSROTATION to S_SKIN 2020-02-12 18:02:36 -08:00
colette d3e5cbffba comment 2020-02-12 08:54:20 -05:00
fickleheart b7a6773ff5 Don't error when checking patch.valid on invalid patches 2020-02-11 23:25:01 -06:00
Jaime Passos d8793ce579 Merge branch 'gtr-shift' into 'next' 
1 left shifted by zero is still 1

See merge request STJr/SRB2!766
 2020-02-11 23:33:43 -05:00
James R ae2041d686 Remove extra tokens if we got all 7 emeroods 2020-02-11 19:36:09 -08:00
James R 0993b71355 Merge branch 'patch-1' into 'next' 
Fix title/card hud hooks grabbing the wrong functions

See merge request STJr/SRB2!758
 2020-02-11 20:17:50 -05:00
GoldenTails 9f7bfd901b I broke SHIFT in the Connect IP Textbox.. whoops. 
It's okay, I literally had to remove one line lmao.
 2020-02-11 19:07:48 -06:00
MascaraSnake 8c932e4a6d Merge branch '2.2.1-prep' into 'next' 
2.2.1 preparation

See merge request STJr/SRB2!759
 2020-02-11 17:37:23 -05:00
MascaraSnake 9498c5ba8e Merge branch 'signpostfixes' into 'next' 
Fix CLEAR! signpost showing up in unmodded games (& add proper support for SPR2 animated signpost)

See merge request STJr/SRB2!775
 2020-02-11 16:23:06 -05:00
MascaraSnake d9a78c502c Merge branch 'defuse-minecarts' into 'next' 
Defuse minecarts

See merge request STJr/SRB2!776
 2020-02-11 13:22:10 -05:00
lachwright aeab33ee03 Defuse minecarts 2020-02-12 01:41:11 +08:00
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
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 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