James R
aab0922c9e
Merge remote-tracking branch 'origin/master' into next
2019-10-07 18:19:48 -07:00
James R
7f4c3f7647
Merge branch 'fix-fixedrem' into 'next'
...
Make FixedRem less laggy by just using the modulo operator.
See merge request STJr/SRB2!503
2019-10-07 21:16:33 -04:00
James R
eba60b732c
Merge branch 'fix-MF_NOCLIPTHING' into 'next'
...
Fix MF_NOCLIPTHING
See merge request STJr/SRB2!467
2019-10-07 21:14:49 -04:00
James R
7f113a72ce
Merge branch 'lua-error-print-fix' into 'master'
...
Lua: Fix some errors not working properly.
See merge request STJr/SRB2!510
2019-10-07 21:09:00 -04:00
Alam Ed Arias
93da2cf8fe
Merge branch 'master' into next
2019-09-20 12:32:32 -04:00
Alam Ed Arias
6d78290131
avoid the source code from getting the wrong EOL
2019-09-20 12:32:18 -04:00
Alam Ed Arias
b1c3da4de3
Merge branch 'master' into next
2019-09-17 14:20:48 -04:00
Alam Ed Arias
6ec747638a
Fix FALLTHRU for Win32 console interface code
2019-09-17 14:18:27 -04:00
GoldenTails
21ca3febbb
Merge branch 'master' into fix-fixedrem
2019-09-07 12:19:13 -05:00
Alam Ed Arias
475e2fa981
Merge branch 'master' into next
2019-08-29 19:28:02 -04:00
Alam Ed Arias
d6a3f3f4d8
Warn on implicit fallthrough
2019-08-29 19:27:52 -04:00
Steel Titanium
a278743708
Remove extra whitespace
2019-08-24 18:29:56 -04:00
Monster Iestyn
7a5263e1a0
Merge branch 'master' into next
2019-08-24 23:28:38 +01:00
Steel Titanium
4aa06071c3
I don't even know how this happened
2019-08-24 18:27:07 -04:00
Steel Titanium
8e5dd1af19
Typecast p to INT16
...
Since the enum type is implementation-defined, and could be either signed or unsigned.
2019-08-24 18:22:18 -04:00
Monster Iestyn
68c94ab194
Merge branch 'based-files' into 'master'
...
Compare the file name only for real
See merge request STJr/SRB2!511
2019-08-24 15:51:11 -04:00
Monster Iestyn
59931b6bfd
Merge branch 'calling-all-lua-consvars' into 'next'
...
Calling all Lua consvars
See merge request STJr/SRB2!509
2019-08-24 15:50:43 -04:00
James R
30d7cf0fb5
Compare the file name only for real
...
CL_SendRequestFile prepends the path for each file.
2019-08-23 11:00:05 -07:00
GoldenTails
0ca719f708
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
2019-08-22 06:27:00 -05:00
Steel Titanium
3e9edab7b0
Use correct integer format
2019-08-21 21:25:45 -04:00
Steel Titanium
c18ec4774e
true not TRUE
2019-08-20 15:43:59 -04:00
Monster Iestyn
fa76579a1b
Fixes for lib_cvRegisterVar (the Lua version of CV_RegisterVar):
...
* Make sure the consvar's properties are all initialised to zeros as defaults
* Error if the consvar is not given a name
* Error if the consvar has CV_CALL but no call function
* Error if the consvar has CV_NOINIT but not CV_CALL
2019-08-20 18:18:29 +01:00
GoldenTails
572b063672
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
2019-08-17 21:17:38 -05:00
Monster Iestyn
4f12b4dfed
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
42eaa1ed39
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
abf06098da
Include md5.h
2019-08-17 10:34:19 -07:00
James R
f335519007
Remove a printf
2019-08-17 10:33:33 -07:00
James R
f69983c010
Kart discrepancies
2019-08-17 10:33:14 -07:00
Monster Iestyn
361332b888
Update MD5 for patch.dta
2019-08-17 18:15:23 +01:00
Monster Iestyn
fcc2a8014c
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
a20079e410
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
Monster Iestyn
8106370fe7
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
f993d74e63
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
41dec6e220
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
9d19883646
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
c1ff9f8c64
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
4d3057ff7a
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
845b657ac1
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-15 14:21:19 +01:00
Monster Iestyn
925c9dc5d8
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
GoldenTails
778ba36e63
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
2019-08-10 19:48:19 -05:00
Alam Ed Arias
1ae3ad733b
Merge branch 'master' into next
2019-08-08 23:18:31 -04:00
Alam Ed Arias
cb5b7a5555
Appveyor: other way around, the Mingw32 is at 9.1
2019-08-08 23:05:24 -04:00
Alam Ed Arias
4d1c2b4de0
Appveyor: the Mingw64 is 9.1, the Mingw32 is still 7.3
2019-08-08 23:02:03 -04:00
Alam Ed Arias
abe1d9809f
Disable address-of-packed-member warning
2019-08-08 22:47:33 -04:00
Alam Ed Arias
5b692acc6c
Makefile: GCC80 does not exist
2019-08-08 22:34:09 -04:00
Alam Ed Arias
64159d55cf
Revert "Try to compile with AppVeyor's GCC 9.1.0"
...
This reverts commit 9fc6c3b136 .
2019-08-08 22:31:18 -04:00
Alam Ed Arias
9fc6c3b136
Try to compile with AppVeyor's GCC 9.1.0
2019-08-08 22:19:22 -04:00
Alam Ed Arias
5c0912bab1
Tested to be compile with Mingw64 9.1.0
2019-08-08 21:25:46 -04:00
Alam Ed Arias
e2927ffe2c
Makefile: support GCC 9.1
2019-08-08 20:27:57 -04:00
Alam Ed Arias
2c7fbe2087
Makefile: stop building with DWARF v2 debugging info
2019-08-08 18:43:42 -04:00