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
5e516eb98d
1 left shifted by zero is still 1
2020-02-08 18:50:05 -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
fickleheart
ee9aa86ecd
Use the proper numbers to adjust lump's offset position
2020-02-07 18:46:46 -06:00
fickleheart
f7cf8e50f8
Oops
2020-02-07 18:43:20 -06:00
James R
3d00596c6a
Don't override loop point if unset in MUSICDEF
2020-02-07 12:51:54 -08:00
James R
c4ee113c71
Let MUSICDEF set loop point
2020-02-07 12:47:41 -08:00
fickleheart
8cb9d6f670
Uhhh do VerifyPk3 too
2020-02-07 00:04:02 -06:00
fickleheart
57a4545fdf
PK3: Proper ignorance for file comments/extra data
2020-02-07 00:01:20 -06: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
Louis-Antoine
2eaf02d234
Let Lua access spectators mobjs
2020-02-03 19:42:37 +01: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
Jaime Passos
d1e8744583
What
2020-02-03 02:24:22 -03:00
Jaime Passos
af66a2e5fa
Restore some functionality that went missing
2020-02-03 02:12:55 -03:00
Jaime Passos
520e2148fe
Merge remote-tracking branch 'origin/master' into local-color-table
2020-02-03 01:52:43 -03: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
James R
35f1a4b76c
lua_pushvalue is unneeded
2020-02-02 17:22:28 -08:00
Steel Titanium
1794949696
Add empty entry
2020-02-02 18:52:41 -05:00
James R
deaf5cfa28
LUA_PushLightUserdata takes the fun out of lib_cvFindVar
2020-02-02 15:19:19 -08:00
James R
0218f58f48
userdataType can check light userdata too!
2020-02-02 15:08:22 -08:00
James R
57492347ed
Don't I_Error on startup files only if a file was added twice
2020-02-01 19:32:08 -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
