03ce0adef8
Remove references to old console ports that slipped in from the 2.1 source code a while back
2019-08-20 14:13:38 +01:00
f3484f7ded
Merge branch 'public_next'
...
# Conflicts:
# src/config.h.in
# src/d_clisrv.c
# src/d_netcmd.c
# src/doomdef.h
# src/p_map.c
# src/p_maputl.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
c50831f875
Merge branch '2.1.25-prep' into 'next'
...
Update version to 2.1.25
See merge request STJr/SRB2!507
2019-08-17 14:07:04 -04:00
9a4a90c9cb
Merge branch 'netcode-exploits' into 'next'
...
Fix an exploit where players could steal the final hash of a login
See merge request STJr/SRB2!508
2019-08-17 14:05:20 -04:00
9c1fa867fa
Include md5.h
2019-08-17 10:34:19 -07:00
c1ba72ead8
Remove a printf
2019-08-17 10:33:33 -07:00
19dd9a3c14
Kart discrepancies
2019-08-17 10:33:14 -07:00
0949406b9c
Update MD5 for patch.dta
2019-08-17 18:15:23 +01:00
450ea0cc43
Disable the level end music fade code for now, because we discovered it causes freezes sometimes.
2019-08-16 23:19:43 +01:00
e52a314ddb
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
99f04f1d89
Merge branch 'polyobj-crush-fix-mi' into 'next'
...
PolyObject crush hotfix
See merge request STJr/SRB2!506
2019-08-16 12:04:56 -04:00
ae9ecef592
Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges
2019-08-16 14:54:01 +01:00
392cb89ff4
Merge branch 'polyobj-fixes-backport' into 'next'
...
PolyObject fixes backport
See merge request STJr/SRB2!505
2019-08-15 13:51:46 -04:00
bbefc3b7f4
After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all.
...
(Naturally I did the same to the camera equivalent)
# Conflicts:
# src/p_maputl.c
2019-08-15 14:30:10 +01:00
cda81cc166
Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised.
...
* If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously.
* Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this.
* Finally, there is no more need for that back = front nonsense hack anymore with my changes made.
# Conflicts:
# src/p_maputl.c
2019-08-15 14:28:06 +01:00
c8d1dd3be8
P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all!
...
# Conflicts:
# src/p_maputl.c
2019-08-15 14:25:02 +01:00
27dd99ae72
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-15 14:21:19 +01:00
8fa54c1ab4
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code.
...
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-15 14:20:52 +01:00
37dd048f12
tweak the defaults for titlescrollxspeed and numDemos
2019-08-11 22:28:32 +01:00
92b47f8729
Fix uninitialised variable error toaster found in P_MinecartThink
2019-08-11 22:14:50 +01:00
0ba2b28381
Disable patch.dta at Rob's request, since we don't really use it anymore
2019-08-11 20:24:14 +01:00
24526d4758
Merge branch 'polyobj-collide-fix' into 'master'
...
Polyobject collide fix
See merge request STJr/SRB2Internal!288
2019-08-09 14:30:44 -04:00
fd77fe819b
curbgname need one more byte to hold the NULL
2019-08-08 23:46:08 -04:00
92a954609d
Merge branch 'public_next' into private
2019-08-08 23:41:19 -04:00
81b294eec1
Merge branch 'master' into next
2019-08-08 23:18:31 -04:00
0c2b300294
Appveyor: other way around, the Mingw32 is at 9.1
2019-08-08 23:05:24 -04:00
33c0b825a7
Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
2019-08-08 23:02:03 -04:00
268b5a09d9
Disable address-of-packed-member warning
2019-08-08 22:47:33 -04:00
eacf89e309
Makefile: GCC80 does not exist
2019-08-08 22:34:09 -04:00
b773b61b8c
Revert "Try to compile with AppVeyor's GCC 9.1.0"
...
This reverts commit 749c2753e4
2019-08-08 22:31:18 -04:00
749c2753e4
Try to compile with AppVeyor's GCC 9.1.0
2019-08-08 22:19:22 -04:00
5a79a446df
Tested to be compile with Mingw64 9.1.0
2019-08-08 21:25:46 -04:00
d5cc3ce48d
Makefile: support GCC 9.1
2019-08-08 20:27:57 -04:00
07f89fd6b5
Makefile: stop building with DWARF v2 debugging info
2019-08-08 18:43:42 -04:00
1b9eb3c3e4
After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all.
...
(Naturally I did the same to the camera equivalent)
2019-08-08 23:04:47 +01:00
17e53ee27b
Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised.
...
* If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously.
* Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this.
* Finally, there is no more need for that back = front nonsense hack anymore with my changes made.
2019-08-08 16:37:09 +01:00
a8b7ecab4d
P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all!
...
(This is an untested fix for VAda's apparent collision with thin air below a polyobject in ACZ2 in beta 5)
2019-08-07 23:27:26 +01:00
506093acbb
Merge branch 'fang-fixes' into 'master'
...
Fang fixes
Closes #154 and #140
See merge request STJr/SRB2Internal!285
2019-08-07 14:46:02 -04:00
3196fd225d
Merge branch 'fixme' into 'master'
...
Build fixes
See merge request STJr/SRB2Internal!287
2019-08-07 14:45:41 -04:00
088f39adbd
Merge branch 'musicplus-strtok' into 'master'
...
Use strtok instead of strtok_r
See merge request STJr/SRB2Internal!286
2019-08-07 14:34:25 -04:00
b5279c34fa
Fix compiling without MixerX support
2019-08-07 12:42:07 -04:00
a6fe6ebcd3
Fix signed vs unsigned comapre
2019-08-07 12:41:22 -04:00
cebc1d46f0
All C files should a newline at the end
2019-08-07 12:39:51 -04:00
4e78617c29
fix PARANOIA builds
2019-08-07 12:39:04 -04:00
688fdf35f9
Use strtok instead of strtok_r
2019-08-07 01:29:05 -04:00
aac9592e31
Set Fang's minimum bounce strength to 1.5 times jump strength
2019-08-06 23:35:20 +02:00
842b503d90
Don't zero out momz when landing on slopes.
...
This fixes Fang's bounce on slopes and doesn't seem to make a difference otherwise, but there's still a non-zero chance this broke something.
2019-08-06 23:18:53 +02:00
3add792986
Fix spindashing on a moving surface causing you to change state to rolling instead of spindashing.
...
(MI said I could commit to master since it was only a single line.)
2019-08-04 19:11:58 +01:00
b06af59907
Merge branch 'revert_revert_musicplus' into 'master'
...
Revert "Revert MusicPlus"
See merge request STJr/SRB2Internal!282
2019-08-04 13:58:01 -04:00
5585059f6b
Merge branch 'ringsparkle' into 'master'
...
New ring sparkles
See merge request STJr/SRB2Internal!271
2019-08-04 11:46:40 -04:00
Monster Iestyn