Commit graph

10550 commits

Author SHA1 Message Date
James R
64b7a5e4d6 SF_NONIGHTSSUPER for disabling super colors in NiGHTS 2020-02-12 18:03:39 -08:00
James R
841094976b Add flag name variant of SF_NONIGHTSROTATION to S_SKIN 2020-02-12 18:02:36 -08:00
Sally Cochenour
934808ef62 BotRespawn hook
Lets you force when and when not to respawn the bot
2020-02-12 14:16:23 -05:00
Jaime Passos
2fc7e56951 Cast Moment 2020-02-12 13:59:08 -03:00
Jaime Passos
7bc58c4c0e Add MAXTOL 2020-02-12 13:41:30 -03:00
Jaime Passos
c827a72aab Merge remote-tracking branch 'origin/next' into tolfix 2020-02-12 13:03:16 -03: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
Jaime Passos
6b8195dbc1 player model prefix 2020-02-11 23:54:39 -03:00
Steel Titanium
c44442ef7c
Merge remote-tracking branch 'public/next' into public_next 2020-02-11 20:43:26 -05: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
cb7a77fe2a Merge remote-tracking branch 'Public/next' into public_next 2020-02-11 23:38:31 +01: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
4d5e14a847 Merge remote-tracking branch 'Public/next' into public_next 2020-02-11 22:27:50 +01: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
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
76b397bece Get rotated sprites with v.getSprite(2)Patch
NOTE: since rotated sprites are offset upward by 4px from non-rotated
sprites, these functions will now return a third boolean (true) if a
rotated sprite was returned, so that scripters can offset accordingly.
2020-02-10 01:02:06 -06: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
fickleheart
021ca92019 Expose stoppedclock to Lua 2020-02-10 00:07:01 -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
fickleheart
19cdb002ab More fixes for titlecard option stuff 2020-02-09 17:53:50 -06: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
Jaime Passos
d0d7fd1589 Don't add a TOL_ twice. 2020-02-09 16:11:52 -03: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
598daac093 allow models for skin/sprites with same name 2020-02-08 20:44:43 -03:00
Jaime Passos
81a2a9e912 fix crash 2020-02-08 20:38:37 -03:00
Jaime Passos
7cfc8d022e allow models for skin/sprites with same name 2020-02-08 20:29:28 -03:00
Jaime Passos
5e516eb98d 1 left shifted by zero is still 1 2020-02-08 18:50:05 -03:00
Jaime Passos
384f5af1f8 move hw texture used to be always below. 2020-02-08 18:27:44 -03:00
Jaime Passos
9bc0592e56 don't free pu_cache. 2020-02-08 18:23:37 -03:00
Jaime Passos
b38f336dc5 why does this still exist? 2020-02-08 18:19:27 -03:00
Jaime Passos
d633435cd6 i'm not paying too much attention, am i. 2020-02-08 18:08:56 -03:00
Jaime Passos
e157391387 split r_isviewpointfirstperson 2020-02-08 17:49:27 -03:00
Jaime Passos
11e6cf0ade add "third person only" option to gr_shearing. 2020-02-08 17:42:26 -03:00
fickleheart
fed8167a81 Allow more options for when the titlecard shows up 2020-02-08 11:13:40 -06:00
James R
0a53f91820 Don't skip the first directory entry of PK3 if it's a file
Also puts the marker skipping in the WAD API.
2020-02-07 19:41:45 -08:00
fickleheart
fb7c4ab812 zentries is unnecessary 2020-02-07 18:47:56 -06:00