Commit graph

10038 commits

Author SHA1 Message Date
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
0fdd8c3283 1 left shifted by zero is still 1 2020-02-08 18:50:05 -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
James R
76c38e97dc 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
3a6b710b2d What 2020-02-03 02:24:22 -03:00
Jaime Passos
d552e4a1c2 Restore some functionality that went missing 2020-02-03 02:12:55 -03:00
Jaime Passos
3f834d2de0 Merge remote-tracking branch 'origin/master' into local-color-table 2020-02-03 01:52:43 -03:00
James R
2615806bf8 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
7e86ba7463 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
21794e7a94 lua_pushvalue is unneeded 2020-02-02 17:22:28 -08:00
Steel Titanium
aa06787141 Add empty entry 2020-02-02 18:52:41 -05:00
James R
0f3a44887c LUA_PushLightUserdata takes the fun out of lib_cvFindVar 2020-02-02 15:19:19 -08:00
James R
b77d597965 userdataType can check light userdata too! 2020-02-02 15:08:22 -08:00
James R
956ae6b823 Don't I_Error on startup files only if a file was added twice 2020-02-01 19:32:08 -08:00
James R
4f41da1d16 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
9409e505b0 Merge branch 'bruh2' into 'master'
Fix fuckup 2

See merge request STJr/SRB2!744
2020-02-01 21:42:21 -05:00
James R
d2038c820d 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
652c580f60 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
8c713b3467 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
c99b9001ba 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
3a3718797f 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
937f18dee7 Remove Player 0 2020-02-01 18:22:03 -08:00
James R
9192e1eade Clean player name before joining!!! 2020-02-01 18:20:35 -08:00
James R
a65e8ab500 Add missing conditions to CleanupPlayerName 2020-02-01 18:11:41 -08:00