Commit graph

16762 commits

Author SHA1 Message Date
Sally Coolatta
efaf2c8c7d Remove print 2020-09-26 02:00:18 -04:00
SteelT
045aaa678c Merge branch 'ogl-model-uv-adjust' into 'next'
Re-adjust model UVs when sprite texture dimensions change

See merge request STJr/SRB2!1068
2020-09-25 21:19:59 -04:00
Steel Titanium
ca6689c8a0 Fix quotes appearing in product version string 2020-09-25 18:55:37 -04:00
Steel Titanium
583500cb92 Update patch.pk3 hash 2020-09-25 18:15:52 -04:00
Steel Titanium
6dbebc9178 Change prerelease version suffix to RC2 2020-09-25 17:58:02 -04:00
SteelT
73d753e670 Merge branch 'jeck' into 'next'
Add Jeck to the credits

See merge request STJr/SRB2!1159
2020-09-25 17:47:33 -04:00
James R
2ec6038793 Merge branch 'tinnitus' into 'master'
Reduce song and sound volume

See merge request KartKrew/Kart!316
2020-09-25 16:59:47 -04:00
James R
3cad7398f0 Fix slope spawning; let polyobjects spawn again
Move P_SpawnMapThings before P_SpawnSpecialsThatRequireObjects.

Do not remove special from lines with ML_NETONLY or ML_NONET until after
slopes are spawned.
2020-09-25 13:35:56 -07:00
Sally Coolatta
285ec3e08c Player death uses damage types
- Fixed last place elimination not working (again)
- Replaces squishing from level geometry with good old fashioned crush death
2020-09-25 16:31:10 -04:00
James R
0c71e6f431 Add Jeck to the credits 2020-09-25 11:47:24 -07:00
James R
96e30e42b7 Include d_main.h 2020-09-25 11:25:15 -07:00
Sally Coolatta
f31923d2d6 Fix MFE_JUSTBOUNCEDWALL not getting removed 2020-09-25 13:30:03 -04:00
Sally Coolatta
91d4d19bda Fix a few instances of rainbow things going through invalid skincolors 2020-09-25 12:54:35 -04:00
Sally Coolatta
2d4818a9fc Fix mid-game render switch 2020-09-25 12:20:08 -04:00
Sally Coolatta
d960ae5599 Merge branch 'the-scary-22-merge' of https://git.do.srb2.org/KartKrew/Kart into the-scary-22-merge 2020-09-25 12:00:56 -04:00
Sally Coolatta
b5fcd74ef9 Merge master
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
toaster
e36da645d9 Revert a bruh moment from 2.2's development where, in order to fix statues and spikes from being visible on the death pit in CEZ, I made any object that comes into contact with a death pit and isn't on a whitelist delete itself.
(Now the Chao at the start of Sonic Speedway don't die immediately.)
2020-09-25 15:15:30 +01:00
Lachlan Wright
27a33a8e29 Merge branch 'sound-origin' into 'next'
Apply volume to sounds with origin too

See merge request STJr/SRB2!1156
2020-09-25 10:04:46 -04:00
Lachlan Wright
b37d6ba94d Merge branch 'name-change-spam' into 'next'
Don't let players change their name more than five times per minute

See merge request STJr/SRB2!1155
2020-09-25 09:36:39 -04:00
Lachlan Wright
1ec61bb8f4 Merge branch 'clarity' into 'next'
Add-on clarity from Kart

See merge request STJr/SRB2!1153
2020-09-25 09:33:04 -04:00
Sal
e1c5acffb9 Merge branch 'dont-cheese-fault' into 'master'
Fault again if you spectate then respawn during a fault

See merge request KartKrew/Kart!315
2020-09-25 09:31:37 -04:00
Sal
89c5d35fce Merge branch 'spinout-type-cleanup' into 'master'
Don't run out wipeout in the air

See merge request KartKrew/Kart!314
2020-09-25 09:31:25 -04:00
Lachlan Wright
500e0dfba1 Merge branch 'fix-236' into 'next'
Only allow explicitly living players to trigger sector specials

Closes #236

See merge request STJr/SRB2!1152
2020-09-25 09:31:06 -04:00
Lachlan Wright
d20b02b6cd Merge branch 'turret-seeing-ghosts' into 'next'
Fix P_SupermanLook4Players assigning spectators as targets

Closes #209

See merge request STJr/SRB2!1151
2020-09-25 09:30:38 -04:00
Lachlan Wright
e3bd66a210 Merge branch 'no-skincolor-space-warning' into 'next'
Remove "skincolor name contains spaces" console warning

Closes #280

See merge request STJr/SRB2!1148
2020-09-25 09:30:24 -04:00
Lachlan Wright
21094f565c Merge branch 'botsavestuff' into 'next'
Save changes made to the bot's skin, and display it properly in save select

See merge request STJr/SRB2!1147
2020-09-25 09:30:03 -04:00
Lachlan Wright
2fc82d429e Merge branch 'more-helpful-lua-error' into 'next'
Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened

See merge request STJr/SRB2!1145
2020-09-25 09:28:49 -04:00
Sally Coolatta
953afddd03 Fix camera not updating when F12ing, fixed camera not taking aiming into account, and minor cleanup 2020-09-25 09:28:19 -04:00
Lachlan Wright
9f58d6f053 Merge branch 'snake-fixes' into 'next'
Fix bonus items sometimes overriding apples in Snake minigame

See merge request STJr/SRB2!1134
2020-09-25 09:23:33 -04:00
Lachlan Wright
ed58fab45f Merge branch 'dye-fix' into 'next'
Fix players not properly decolorizing via linedef action

See merge request STJr/SRB2!1127
2020-09-25 08:54:16 -04:00
Lachlan Wright
0060bac482 Merge branch 'more-stats' into 'next'
Add tic and UI times to render stats

See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04:00
Lachlan Wright
6faa84eaee Merge branch 'w-initfile-bruh' into 'next'
Fix a bug where adding the same mod multiple times counted towards the mod limit

See merge request STJr/SRB2!1124
2020-09-25 08:52:22 -04:00
Lachlan Wright
923e3d4888 Merge branch 'gl-shearing-fix-2' into 'next'
Fix cv_glshearing 2 in first person

See merge request STJr/SRB2!1114
2020-09-25 08:51:57 -04:00
Lachlan Wright
325f4757f0 Merge branch 'console-silly-characters' into 'next'
Get rid of some silly behavior with certain characters in console

See merge request STJr/SRB2!1110
2020-09-25 08:31:08 -04:00
Lachlan Wright
1b4fa12493 Merge branch 'more-nodes' into 'next'
Increase MAXNETNODES, show more servers in the server browser

See merge request STJr/SRB2!1106
2020-09-25 08:24:16 -04:00
James R
ce4dc9fbc9 Adjust volumes by 5% in menu 2020-09-25 02:29:40 -07:00
James R
922f6aa9f8 Scale volume cvars by half, 200% max and 50% default 2020-09-25 02:23:44 -07:00
James R
c9e3281b99 Merge remote-tracking branch 'origin/master' into tinnitus 2020-09-25 01:57:08 -07:00
Sally Coolatta
58d9ac899d Fixed friction being applied incorrectly
Kart's manual player friction adjustments were being called after movefactor was reset, meaning friction changed but movefactor was default, essentially creating old 2.1 friction again
2020-09-25 04:33:20 -04:00
Sally Coolatta
e19cffa819 Quitting players act like bots 2020-09-25 02:27:11 -04:00
Sally Coolatta
861cb8e144 Fix springs giving you way too many
(Also removed a bunch of instances of PF_SPINNING since we haven't used it)
2020-09-25 02:24:19 -04:00
Sally Coolatta
672c4fb763 Make aiming relative too 2020-09-25 02:06:37 -04:00
James R
908d38e656 Merge branch 'slope-anchors-take-2' into 'master'
Vertex snapping 'slope anchors'

See merge request KartKrew/Kart!317
2020-09-25 00:39:35 -04:00
Sal
e1cf8e052c Merge branch 'luafiles-srb2home' into 'master'
Open lua files in srb2home

See merge request KartKrew/Kart-Public!234
2020-09-24 23:23:02 -04:00
James R
e5009348f8 Fix fov on vertical perspective (fixes jittery view morph!!) 2020-09-24 16:48:56 -07:00
James R
0d573b514e Stupid polyobjects require things to be spawned >:( 2020-09-24 15:10:07 -07:00
James R
1c35df36ac Prepend srb2home to luafiles 2020-09-24 14:43:21 -07:00
SteelT
9a0ab0759b Fix music credits not being shown on level music start
By pretty much restoring the old musicdef system, I tried to work with it but couldn't, if needed that can easily be brought back later on.
2020-09-24 15:55:37 -04:00
James R
3d6ed19d55 oops 2020-09-24 12:20:32 -07:00
James R
efbec2c252 Line special 777/778: No Knuckles to mirror slope on opposite plane 2020-09-24 12:19:19 -07:00