Commit graph

22279 commits

Author SHA1 Message Date
James R
99a0a9a9eb Merge remote-tracking branch 'origin/master' into next 2020-11-01 20:01:22 -08:00
James R
cbafb906db Merge branch 'lua_expose-gamestate' into 'next'
Expose gamestate to Lua

See merge request STJr/SRB2!1229
2020-11-01 22:57:52 -05:00
James R
079ed81c89 Merge branch 'cmake-fullscreen-fix' into 'master'
Cmake: fullscreen fix

See merge request STJr/SRB2!1226
2020-11-01 22:57:27 -05:00
James R
f7b907de14 Merge branch 'cmake-curl-internal-fix' into 'master'
Fix compiling using cmake if internal libs is used

See merge request STJr/SRB2!1225
2020-11-01 22:57:12 -05:00
James R
f0d9484dae Merge branch 'copyright-fixes' into 'next'
Fix some copyright statements in new files

See merge request STJr/SRB2!1223
2020-11-01 22:56:58 -05:00
James R
1ba019bdc2 Merge branch 'udmf-seg-length-crash-fix' into 'next'
UDMF Seg length crash fix

See merge request STJr/SRB2!1221
2020-11-01 22:55:13 -05:00
James R
0494ed8bfd Merge branch 'fix-objectplace-silent' into 'next'
Fix objectplace -silent

See merge request STJr/SRB2!1214
2020-11-01 22:52:46 -05:00
James R
a9a08046f0 Merge branch 'mobjghost-rollangle' into 'next'
Ghost mobj matches rollangle (Closes #362)

Closes #362

See merge request STJr/SRB2!1211
2020-11-01 22:49:50 -05:00
James R
b83311a654 Merge branch 'tailsoverlay-dash' into 'next'
Dash state for Tails overlay (Closes #325)

Closes #325

See merge request STJr/SRB2!1210
2020-11-01 22:49:12 -05:00
James R
f843bedfb1 Merge branch 'master-use-sse3' into 'master'
Use SSE3 in 32-bit x86 binaries

See merge request STJr/SRB2!1213
2020-11-01 22:47:36 -05:00
James R
1db88decce Put a run time warning that 415 doesn't work 2020-11-01 19:43:26 -08:00
James R
8a616fb265 P_WriteThings: use map name in file name 2020-11-01 19:40:59 -08:00
James R
481c178a15 The lump is not needed for P_WriteThings
(cherry picked from commit 972b0c084e)
2020-11-01 19:37:54 -08:00
James R
972b0c084e The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
James R
66f67267c7 Remove duplicated code 2020-10-31 20:32:44 -07:00
James R
3eb278684a Fix mistake 2020-10-31 20:28:46 -07:00
James R
fbca1b435a Replaced level header does not mark game modified if from a main wad 2020-10-31 20:26:25 -07:00
James R
8f68a21f2f Fix many instances of G_BuildMapName
Some things are gonna be busted. Fix it later, BYE.
2020-10-31 20:17:12 -07:00
James R
d5b52d8ff3 Use 2.2's version of the -warp parameter 2020-10-31 19:41:38 -07:00
James R
a669724217 Kill alreadyExists, check for map replacement by going through the level headers and using W_CheckNumForMapPwad 2020-10-31 18:49:50 -07:00
James R
64b418cb27 Added W_CheckNumForMapPwad, both functions check long lump name, ignore case 2020-10-31 18:48:14 -07:00
Steel Titanium
ef1ca357de Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
James R
6cda446f91 Replace more instances of M_MapNumber in SOC 2020-10-31 17:44:24 -07:00
James R
63453fc5b3 Merge branch 'staggersaves' into 'next'
Draw save files from outwards in

See merge request STJr/SRB2!1228
2020-10-31 18:39:14 -04:00
Steel Titanium
00f9e777af Expose gamestate to Lua 2020-10-31 16:36:15 -04:00
Hannu Hanhi
b18fe88265 Fix CMake SSE3 flag 2020-10-31 18:04:44 +02:00
lachwright
7be608c6aa Draw save files from outwards in 2020-10-31 18:21:14 +11:00
Sally Coolatta
601451bead This RNG thing was removed, so it doesn't need to be in demo code anymore either 2020-10-31 02:39:30 -04:00
Steel Titanium
f9b1f873a4 CMake: Fix fullscreen toggle not working
All because of a typo
2020-10-31 00:59:51 -04:00
James R
76e0102b3f Fix paper items not being removed after shrunk 2020-10-30 21:13:36 -07:00
James R
46b1b6db1c Double paper item height 2020-10-30 21:13:31 -07:00
James R
4bdd3c809f Major brother moment 2020-10-30 20:54:21 -07:00
Steel Titanium
3b7f0001cf Fix compiling using cmake if internal libs is used 2020-10-30 23:37:34 -04:00
James R
2520b87f76 Fix map warp 2020-10-30 20:10:32 -07:00
James R
37c345c7eb Map lump names can be anything, map number is dynamically allocated 2020-10-30 20:10:31 -07:00
Sally Coolatta
84f027d244 Item table changes
- Mine: 4 -> 6
- Thunder Shield: 0 -> 4
- Bubble Shield: 0 -> 1
- Sneaker x3: 0 -> 1
- Banana x10: 0 -> 1

2 of the 3 shields added, included some items that normally only appeared for Karma items, and makes Mines much more common
2020-10-30 23:09:29 -04:00
Sally Coolatta
619402666a Better Jawz
- More friction in Battle
- Throwables take your momz (has been bothering me for an eternity)
2020-10-30 22:57:42 -04:00
James R
6864705b67 Fix fuckup 2020-10-30 19:00:37 -07:00
Sally Coolatta
fed0ed98de Add R_SpriteRotationAngle function
Gets the rotation angle for the mobj's sprite. Meant for pitch & roll later, but that part is if'd out currently and just returns mobj->rollangle
2020-10-30 15:54:58 -04:00
Louis-Antoine
a8c44ebb6a Use the same names as userdataType() for userdataMetatable() 2020-10-30 15:00:13 +01:00
Louis-Antoine
bbd09eace1 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into register-metatables 2020-10-30 14:46:04 +01:00
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