James R
04d58c56e5
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
54acb48e4a
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
60b0ea77e8
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 23:38:31 +01:00
MascaraSnake
2cfe5e3425
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
2687b65095
Merge remote-tracking branch 'Public/next' into public_next
2020-02-11 22:27:50 +01:00
MascaraSnake
905d9a5ee6
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
b001c6c9db
Merge branch 'defuse-minecarts' into 'next'
...
Defuse minecarts
See merge request STJr/SRB2!776
2020-02-11 13:22:10 -05:00
lachwright
e5b788ed65
Defuse minecarts
2020-02-12 01:41:11 +08:00
lachwright
390511a531
Cast to statenum_t for 32-bit compatibility
2020-02-11 20:36:48 +08:00
lachwright
2544681658
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
MascaraSnake
8ab1adc895
Merge remote-tracking branch 'Public/2.2.1-prep' into public_next
2020-02-10 22:47:22 +01:00
MascaraSnake
5961c7adc6
Merge remote-tracking branch 'Public/next' into public_next
2020-02-10 22:44:15 +01:00
fickleheart
862f21d1b2
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
6a076091f7
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
b87cea3272
Expose stoppedclock to Lua
2020-02-10 00:07:01 -06:00
Steel Titanium
e2c1f9cd4b
Update file hashes
2020-02-09 21:29:46 -05:00
Steel Titanium
89916b7a28
Merge branch 'next' into 2.2.1-prep
2020-02-09 20:30:48 -05:00
fickleheart
0de2068b88
More fixes for titlecard option stuff
2020-02-09 17:53:50 -06:00
Monster Iestyn
dc5fd6be11
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
f5a46bd70f
Don't add a TOL_ twice.
2020-02-09 16:11:52 -03:00
Alam Ed Arias
307f30b6e3
Merge branch 'master' into next
2020-02-09 10:37:10 -05:00
Alam Ed Arias
9983ea49cc
Z_Zone: fixup Valgrind support
2020-02-09 10:35:23 -05:00
Jaime Passos
1e17523c70
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
c05b613724
Fix broken GT_ constants with custom gametypes
2020-02-08 21:40:30 -03:00
SteelT
d5b4409dbe
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
6568a57c58
allow models for skin/sprites with same name
2020-02-08 20:44:43 -03:00
Jaime Passos
557e61644c
fix crash
2020-02-08 20:38:37 -03:00
Jaime Passos
7cade749a6
allow models for skin/sprites with same name
2020-02-08 20:29:28 -03:00
Jaime Passos
0fdd8c3283
1 left shifted by zero is still 1
2020-02-08 18:50:05 -03:00
Jaime Passos
ab70e63c96
move hw texture used to be always below.
2020-02-08 18:27:44 -03:00
Jaime Passos
7e97f8f53c
don't free pu_cache.
2020-02-08 18:23:37 -03:00
Jaime Passos
830583d973
why does this still exist?
2020-02-08 18:19:27 -03:00
Jaime Passos
622bf09908
i'm not paying too much attention, am i.
2020-02-08 18:08:56 -03:00
Jaime Passos
fd60b171f6
split r_isviewpointfirstperson
2020-02-08 17:49:27 -03:00
Jaime Passos
fa5957f785
add "third person only" option to gr_shearing.
2020-02-08 17:42:26 -03:00
fickleheart
33c103c319
Allow more options for when the titlecard shows up
2020-02-08 11:13:40 -06:00
James R
e1b67967ce
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
856ff430c0
zentries is unnecessary
2020-02-07 18:47:56 -06:00
fickleheart
995c885927
Use the proper numbers to adjust lump's offset position
2020-02-07 18:46:46 -06:00
fickleheart
1131266579
Oops
2020-02-07 18:43:20 -06:00
James R
a25dd93500
Don't override loop point if unset in MUSICDEF
2020-02-07 12:51:54 -08:00
James R
e620758aa0
Let MUSICDEF set loop point
2020-02-07 12:47:41 -08:00
fickleheart
f872124d0e
Uhhh do VerifyPk3 too
2020-02-07 00:04:02 -06:00
fickleheart
a3bff2ae08
PK3: Proper ignorance for file comments/extra data
2020-02-07 00:01:20 -06:00
lachwright
1fdf63cd6e
Add Rob as the game's producer
2020-02-06 23:06:15 +08:00
Steel Titanium
9715a91a59
Update credits again
2020-02-05 15:20:35 -05:00
Monster Iestyn
0a4a879b96
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
4415fb4c75
Merge remote-tracking branch 'origin/master' into next
2020-02-04 14:31:21 -08:00
colette
20aa089c25
Fix title/card hud hooks grabbing the wrong functions
2020-02-03 23:09:18 -05:00
Louis-Antoine
c0e0721421
Let Lua access spectators mobjs
2020-02-03 19:42:37 +01:00