MascaraSnake
|
2e8bb50808
|
Fix accidental swap of first and last waypoint
|
2020-05-13 09:32:00 +02:00 |
|
MascaraSnake
|
7004d8ca75
|
Merge branch 'next' into waypoints
|
2020-05-12 23:51:32 +02:00 |
|
MascaraSnake
|
4c526f6e50
|
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
|
2020-05-12 23:50:30 +02:00 |
|
Monster Iestyn
|
b167f12013
|
Merge branch 'gcc10-fixes' into 'master'
GCC 10 compiling fixes
See merge request STJr/SRB2!937
|
2020-05-12 14:47:49 -04:00 |
|
Monster Iestyn
|
86e2053dcd
|
added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c)
|
2020-05-12 18:43:49 +01:00 |
|
Monster Iestyn
|
be0e7e63bf
|
added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)
|
2020-05-12 18:42:16 +01:00 |
|
Monster Iestyn
|
6878220a1b
|
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
|
2020-05-12 18:40:51 +01:00 |
|
Monster Iestyn
|
62a640e282
|
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
|
2020-05-12 18:37:15 +01:00 |
|
MascaraSnake
|
999ebe2fd1
|
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
|
2020-05-12 14:53:10 +02:00 |
|
Steel Titanium
|
a491f20bee
|
Merge branch 'master' into next
|
2020-05-11 18:20:09 -04:00 |
|
SteelT
|
a43072a853
|
Merge branch 'splitscreen-titlecards-fix' into 'master'
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
|
2020-05-11 18:18:22 -04:00 |
|
SteelT
|
9e93ab4cf5
|
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
|
2020-05-11 18:17:59 -04:00 |
|
SteelT
|
1c7f684f3e
|
Merge branch '2.2.4-prep' into 'next'
2.2.4 preparation
See merge request STJr/SRB2!935
|
2020-05-11 18:06:11 -04:00 |
|
James R
|
4753c9042d
|
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
|
2020-05-11 15:01:32 -07:00 |
|
LJ Sonic
|
b0c1bf50e3
|
Merge branch 'fix-rollout-rock-crash' into 'next'
Fix crash with rollout rock
See merge request STJr/SRB2!936
|
2020-05-11 17:57:31 -04:00 |
|
Louis-Antoine
|
be67ca3203
|
Fix crash with rollout rock
|
2020-05-11 23:48:35 +02:00 |
|
James R
|
e95d2beed7
|
Update patch.pk3 asset hash
|
2020-05-11 14:41:36 -07:00 |
|
James R
|
ffd88746da
|
Update version names, SUBVERSION, MODVERSION
|
2020-05-11 14:41:36 -07:00 |
|
Monster Iestyn
|
ce3639f569
|
Merge branch 'master' into next
|
2020-05-11 20:08:02 +01:00 |
|
Zwip-Zwap Zapony
|
cb9d0a2fbe
|
Fix splitscreen Title Card act name regression
This fixes act names not being shown on player 2's view
|
2020-05-11 19:57:20 +02:00 |
|
MascaraSnake
|
ca324f7edc
|
Merge branch 'showfps-fix' into 'master'
Don't show the FPS counter during startup.
See merge request STJr/SRB2!930
|
2020-05-11 13:31:26 -04:00 |
|
MascaraSnake
|
35b4f88efe
|
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
|
2020-05-11 13:31:09 -04:00 |
|
MascaraSnake
|
2ec7a14b9d
|
Merge branch 'delete-lua-again' into 'next'
Fix the BotRespawn hook and hooking A_Dye being disabled for no reason
See merge request STJr/SRB2!932
|
2020-05-11 13:30:18 -04:00 |
|
toaster
|
67e01ad66e
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
# Conflicts:
# src/m_menu.c
|
2020-05-11 15:00:31 +01:00 |
|
James R
|
1065ded275
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
James R
|
5ad69621f2
|
Use camera angle, not mobj angle, when comparing Angle Anchor
|
2020-05-10 19:40:28 -07:00 |
|
sphere
|
0490dc3e8e
|
Don't show the FPS counter during startup.
|
2020-05-11 01:33:34 +02:00 |
|
SteelT
|
1b4d36245f
|
Merge branch '2.2.3-prep' into 'next'
2.2.3 preparation
See merge request STJr/SRB2!929
|
2020-05-10 17:13:04 -04:00 |
|
Steel Titanium
|
f9195d6593
|
Merge branch 'next' into 2.2.3-prep
|
2020-05-10 17:05:56 -04:00 |
|
Monster Iestyn
|
d591b56ef4
|
Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep
|
2020-05-10 20:10:11 +01:00 |
|
Monster Iestyn
|
1ea3a031da
|
Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
|
2020-05-10 20:09:08 +01:00 |
|
lachwright
|
a4cba6a5f9
|
Merge branch 'master' into next
|
2020-05-11 01:29:10 +08:00 |
|
Lachlan Wright
|
72c16b0761
|
Merge branch '1upsound' into 'master'
Play the 1-up sound when 1upsound is set to sound
See merge request STJr/SRB2!926
|
2020-05-10 13:28:09 -04:00 |
|
Lachlan Wright
|
7df8c24a9b
|
Merge branch 'patch_music' into 'next'
patch_music.pk3
See merge request STJr/SRB2!812
|
2020-05-10 12:51:49 -04:00 |
|
lachwright
|
10187a1e9b
|
Update MD5 hashes for player.dta and patch.pk3
|
2020-05-11 00:23:32 +08:00 |
|
Monster Iestyn
|
398770b952
|
Fix logging on Mac
These fixes were suggested by Sveciaost on #mac-users on Discord
|
2020-05-10 16:47:01 +01:00 |
|
Monster Iestyn
|
f218920395
|
Update version number to 2.2.3 in all the usual files, also updated MODVERSION
|
2020-05-10 16:02:23 +01:00 |
|
LJ Sonic
|
1952c30344
|
Merge branch 'gfz3laser-mkii' into 'next'
New Greenflower Zone 3 laser
See merge request STJr/SRB2!924
|
2020-05-09 16:40:40 -04:00 |
|
LJ Sonic
|
8b5becfcba
|
Merge branch 'optimise-archiving' into 'next'
Optimise net-archiving of Lua strings, numbers and booleans
See merge request STJr/SRB2!904
|
2020-05-09 16:40:28 -04:00 |
|
LJ Sonic
|
9cfa75b9b5
|
Merge branch 'showfps-tweaks' into 'next'
FPS counter tweaks
See merge request STJr/SRB2!927
|
2020-05-09 15:46:08 -04:00 |
|
sphere
|
6b761c1486
|
Make showfps save to config, and add a compact option.
|
2020-05-08 15:40:50 +02:00 |
|
Lachlan
|
05c83bbd68
|
Play the 1-up sound when 1upsound is set to sound
|
2020-05-08 04:07:00 +08:00 |
|
MascaraSnake
|
59a49d9f3c
|
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
|
2020-05-07 22:00:02 +02:00 |
|
MascaraSnake
|
9ebbb5b7c2
|
Fixed a typo
|
2020-05-07 21:59:39 +02:00 |
|
lachwright
|
fa8e58bec9
|
Prevent laser sprites clipping into walls/off ledges
|
2020-05-08 02:58:56 +08:00 |
|
lachwright
|
bfd1d3d49f
|
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
|
2020-05-07 23:24:33 +08:00 |
|
lachwright
|
cd9774b649
|
Fix knockback scaling
|
2020-05-07 22:47:34 +08:00 |
|
lachwright
|
d3208568ee
|
Merge remote-tracking branch 'origin/next' into gfz3laser-mkii
|
2020-05-07 22:34:44 +08:00 |
|
Alam Ed Arias
|
ec948af34f
|
Merge branch 'master' into next
|
2020-05-06 18:36:20 -04:00 |
|
Alam Ed Arias
|
b46398b06a
|
fix build errors in public master
|
2020-05-06 18:35:54 -04:00 |
|