Commit graph

17740 commits

Author SHA1 Message Date
Sally Coolatta
875493d778 Remove the need for setting rotation axis in spriteinfo for models
Now it just does it like Software
2020-10-30 02:15:49 -04:00
Zippy_Zolton
16cc066e2e thunder shield :D 2020-10-29 12:32:42 -05:00
Hannu Hanhi
0516d21ff1 Fix some copyright statements in new files 2020-10-29 16:04:25 +02:00
James R
cb941050e2 Paper item hitbox extends just as far below 2020-10-28 23:48:16 -07:00
James R
4d8447dc1c Revert "Eliminate karma players at overtime"
This reverts commit 714f04c930.
2020-10-28 23:30:37 -07:00
James R
918b4a2039 Revert "this is stupid"
This reverts commit 3200842519.
2020-10-28 23:30:34 -07:00
James R
8ae579d672 Merge branch 'master' into paper-items-i-hate-my-life 2020-10-28 22:36:08 -07:00
James R
c609dffdab Stupid P_MapStart crash because of flicky teleport before map load 2020-10-28 22:35:31 -07:00
James R
81b8abed53 Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life 2020-10-28 21:51:28 -07:00
Sally Coolatta
64c321fbed Fix incorrect tilts 2020-10-28 21:05:58 -04:00
Sally Coolatta
9dd43d4e4e Remove modeltilt, use roll & pitch instead
Broken currently, about half of the slopes you can go into have the wrong tilt
2020-10-28 18:36:26 -04:00
Sal
1aef75bff3 Merge branch 'model-texture-fix' into 'master'
Model texture fix

Closes #97 and #100

See merge request KartKrew/Kart!325
2020-10-28 16:31:19 -04:00
Sally Coolatta
01d5c9a95b Put back in the improvements to HWR_CreateBlendedTexture
Fixes colors being darker, and creates blend textures faster
2020-10-28 16:20:11 -04:00
Sally Coolatta
bac7de9b0f Merge branch 'master' into model-texture-fix 2020-10-28 15:58:00 -04:00
Sal
a0621b92f9 Merge branch 'anchors-on-slopes' into 'master'
Offset slope anchors from regular slopes

See merge request KartKrew/Kart!319
2020-10-28 15:50:30 -04:00
Sal
8b20a94202 Merge branch 'additive-transmap' into 'master'
Additive and Subtractive Translation Maps

See merge request KartKrew/Kart!323
2020-10-28 15:50:22 -04:00
Sally Coolatta
a253a6cedd Remove rogue line making this function do nothing 2020-10-28 15:41:32 -04:00
Monster Iestyn
41d8bc8020 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00
Sally Coolatta
646fd15b02 Remove these 2 calls to HWR_UnlockCachedPatch
From what I can tell, this is not in SRB2 master or next. I'm uncertain about this, but Jeck has had zero crashes with this.
2020-10-28 15:16:05 -04:00
Zippy_Zolton
39d003d6f7 Flame Shield Changes 2020-10-28 01:23:05 -05:00
James R
faefe23d88 Merge branch 'music-changes' into 'master'
Load multiple musicdef, use music.pk3

See merge request KartKrew/Kart!324
2020-10-28 01:16:49 -04:00
James R
f5329f25bf Use music.pk3 2020-10-27 17:20:57 -07:00
Jaime Passos
d2c000b252 Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
James R
7199bba3b2 Update musicdef conversion utility 2020-10-27 15:51:36 -07:00
James R
d896fee2e5 Load multiple musicdef lumps from a single wad 2020-10-27 15:45:10 -07:00
James R
e7051737d7 Use 2.2's musicdef parser 2020-10-27 15:00:31 -07:00
Jaime Passos
ab3f4960cb Bug fixes 2020-10-27 17:02:35 -03:00
Nev3r
df6a903592 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
# Conflicts:
#	src/lua_baselib.c
#	src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Louis-Antoine
bc86d89206 Remove useless condition 2020-10-27 20:28:54 +01:00
Louis-Antoine
f3bc526fc2 Do not pause the client while redownloading the gamestate 2020-10-27 20:23:32 +01:00
Louis-Antoine
fd3189a5f6 Fix music resetting after reloading the gamestate 2020-10-27 20:22:15 +01:00
Louis-Antoine
546a3ff015 Fix camera going wild after reloading the gamestate 2020-10-27 20:21:56 +01:00
Sally Coolatta
3200842519 this is stupid 2020-10-27 01:27:51 -04:00
Sally Coolatta
714f04c930 Eliminate karma players at overtime 2020-10-27 01:09:51 -04:00
Sally Coolatta
63c84567c5 Spawn an item right at 0:00.00, instead of at 0:04.00 2020-10-27 00:23:46 -04:00
Sally Coolatta
f8e52ae6a0 Increase radius of floating items 2020-10-27 00:22:33 -04:00
Sally Coolatta
a2a947db62 bruh
thanks jart
2020-10-27 00:19:11 -04:00
James R
de936f4c7f Don't reset drift off springs
Hopefully nothing requires drift reset from here.
2020-10-26 20:49:39 -07:00
Sally Coolatta
ddee6257e7 Move to P_RunThinkers 2020-10-26 23:46:56 -04:00
James R
d19c96ee17 Revert step down changes 2020-10-26 20:20:04 -07:00
Jaime Passos
cdc4a6d86e Implement blend modes 2020-10-27 00:03:41 -03:00
James R
2ae394b8e3 Fix opengl splitscreen 2020-10-26 19:51:42 -07:00
Sally Coolatta
16e08d4388 Don't run P_RespawnBattleBoxes 2020-10-26 22:33:14 -04:00
Sally Coolatta
b83f9afecb Merge branch 'master' into battle-rethink 2020-10-26 22:22:40 -04:00
Sal
96a5eadc84 Merge branch 'the-scary-22-merge' into 'master'
The scary 22 merge

Closes #19, #80, #69, #94, #61, #64, #6, #27, #46, #47, #45, #43, #37, and #72

See merge request KartKrew/Kart!321
2020-10-26 22:21:01 -04:00
Sally Coolatta
201f8365db Merge branch 'battle-rethink' of https://git.do.srb2.org/KartKrew/Kart into battle-rethink 2020-10-26 22:20:25 -04:00
Sally Coolatta
62139f144a Paper item spawners
Code is a little horrendous in a few places but I will hopefully fix later :V
2020-10-26 22:20:02 -04:00
James R
9bff8c2ecb Remove the other -splitscreen parameter 2020-10-26 19:03:24 -07:00
James R
eec54356c3 Fix splitscreen fov being fucked on first R_ExecuteSetViewSize 2020-10-26 18:57:32 -07:00
Louis-Antoine
1e287d38f1 Only resend the gamestate to one client at a time 2020-10-27 01:22:31 +01:00