James R
ed6dcf0b84
Merge remote-tracking branch 'srb2-pub/master' into srb2-merge
2019-08-19 15:29:34 -07:00
Monster Iestyn
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
Monster Iestyn
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
James R
9c1fa867fa
Include md5.h
2019-08-17 10:34:19 -07:00
James R
c1ba72ead8
Remove a printf
2019-08-17 10:33:33 -07:00
James R
19dd9a3c14
Kart discrepancies
2019-08-17 10:33:14 -07:00
Monster Iestyn
0949406b9c
Update MD5 for patch.dta
2019-08-17 18:15:23 +01:00
Monster Iestyn
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
Monster Iestyn
e52a314ddb
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
27dd99ae72
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-15 14:21:19 +01:00
Monster Iestyn
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
James R
d9e29f15cd
Merge remote-tracking branch 'srb2-pub/master' into srb2-merge
2019-08-11 18:07:18 -07:00
Alam Ed Arias
81b294eec1
Merge branch 'master' into next
2019-08-08 23:18:31 -04:00
Alam Ed Arias
0c2b300294
Appveyor: other way around, the Mingw32 is at 9.1
2019-08-08 23:05:24 -04:00
Alam Ed Arias
33c0b825a7
Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
2019-08-08 23:02:03 -04:00
Alam Ed Arias
268b5a09d9
Disable address-of-packed-member warning
2019-08-08 22:47:33 -04:00
Alam Ed Arias
eacf89e309
Makefile: GCC80 does not exist
2019-08-08 22:34:09 -04:00
Alam Ed Arias
b773b61b8c
Revert "Try to compile with AppVeyor's GCC 9.1.0"
...
This reverts commit 749c2753e4
2019-08-08 22:31:18 -04:00
Alam Ed Arias
749c2753e4
Try to compile with AppVeyor's GCC 9.1.0
2019-08-08 22:19:22 -04:00
Alam Ed Arias
5a79a446df
Tested to be compile with Mingw64 9.1.0
2019-08-08 21:25:46 -04:00
Alam Ed Arias
d5cc3ce48d
Makefile: support GCC 9.1
2019-08-08 20:27:57 -04:00
Alam Ed Arias
07f89fd6b5
Makefile: stop building with DWARF v2 debugging info
2019-08-08 18:43:42 -04:00
Alam Ed Arias
963d2f5da3
Merge branch 'master' into next
2019-07-29 18:05:33 -04:00
Alam Ed Arias
66f84efd02
SDL2: fixed compiling mixer interface with MSVC
2019-07-29 17:56:35 -04:00
Monster Iestyn
6eaf7625a9
Merge branch 'master' into next
2019-07-16 18:26:46 +01:00
Monster Iestyn
3e708e62e8
Merge branch 'fix-gme-free' into 'master'
...
Fix crash with GME sounds when being freed
See merge request STJr/SRB2!504
2019-07-16 13:25:51 -04:00
James R
91502f1499
Don't send login final hashes to everyone
...
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.
P.S. The netcode is LOL XD by VincyTM -Telos
2019-07-15 16:14:00 -07:00
Steel Titanium
4e839596a1
Fix crash with GME sounds when being freed
2019-07-14 14:55:04 -04:00
Sryder
3cd5b3a33e
Merge branch 'fix-port-connect' into 'master'
...
Don't use client port as default peer port
See merge request KartKrew/Kart-Public!152
2019-07-05 11:54:28 -04:00
Sryder
cab34bee6f
Merge branch 'add-floats-command' into 'master'
...
Fix the Add command when floats
See merge request KartKrew/Kart-Public!153
2019-07-05 11:49:46 -04:00
James R
14be24dfb6
Support adding to CV_FLOAT cvars with the Add command
2019-07-04 17:48:17 -07:00
James R
0a2eac682b
Don't use client port as default peer port
2019-07-04 16:38:00 -07:00
Sryder
e276faf819
Merge branch 'opengl_match_software_wallclip' into 'master'
...
OpenGL: Try and Match Software Wallclipping Better
See merge request KartKrew/Kart-Public!150
2019-07-02 14:08:10 -04:00
Sryder
815f237b22
Merge branch 'revert-mserv' into 'master'
...
Revert mserv
See merge request KartKrew/Kart-Public!144
2019-06-30 15:56:17 -04:00
Sryder
56ad1340a2
Merge branch 'replay-code-sucks' into 'master'
...
Fix SIGSEGV when saving replays and invalid extrainfo offset
See merge request KartKrew/Kart-Public!149
2019-06-30 05:51:21 -04:00
Monster Iestyn
3a9ce483f5
Merge branch 'master' into next
...
# Conflicts:
# src/r_data.c
2019-06-28 23:24:36 +01:00
Steel Titanium
2c906e9c29
Merge branch 'jimita-unfuck-awayview' into 'next'
...
unfuck awayview
See merge request STJr/SRB2!493
2019-06-28 18:21:52 -04:00
Steel Titanium
47eb711097
Merge branch 'public-musicplus-feature-endoflevel' into 'next'
...
Fade out music at end of level, before intermission
See merge request STJr/SRB2!472
2019-06-28 18:21:07 -04:00
Steel Titanium
f7357a02ae
Merge branch 'pk3-folders-are-not-textures-backport' into 'next'
...
Pk3 folders are not textures!
See merge request STJr/SRB2!502
2019-06-28 18:18:53 -04:00
Steel Titanium
016f1fe533
Merge branch 'morememoryshenanigans' into 'master'
...
More Memory Shenanigans
See merge request STJr/SRB2!501
2019-06-28 18:18:14 -04:00
Sryder
bcae3898dd
Merge branch 'lemme-outa-room-menu' into 'master'
...
Don't get stuck in room menu in a modified game
See merge request KartKrew/Kart-Public!145
2019-06-27 14:16:37 -04:00
Sryder
c3f6f263d4
Update Skywall handling
...
I've tried to make this so it almost never under-compensates, and over-compensates very little where possible.
I don't think it's 1:1 to software's current behaviour, and probably never will be due to software being very strange.
2019-06-26 23:17:45 +01:00
James R
59bbab1fff
Someone doesn't know how pointers or WRITE macros work...
...
Fixes SIGSEGV when saving a replay.
2019-06-25 00:44:12 -07:00
Sryder
414eee58ba
checkforemptylines can be static
2019-06-24 20:50:37 +01:00
