Commit graph

12204 commits

Author SHA1 Message Date
Monster Iestyn
fa140c1eb3 Merge branch 'load-netgame-error-fixes' into 'next'
Load netgame error fixes

See merge request STJr/SRB2!1482
2021-05-07 17:27:19 -04:00
James R
ee72312dea Merge remote-tracking branch 'origin/master' into makefile-revision-final 2021-05-07 13:32:19 -07:00
Monster Iestyn
b7ff0164e9 Merge branch 'polyobject-ffloor-fix' into 'next'
Polyobject over 3D floor fix for software renderer

See merge request STJr/SRB2!1488
2021-05-07 16:11:03 -04:00
Sally Coolatta
4478265400 Fix title card patches not actually having enough room for an entire lump name 2021-05-07 14:15:37 -04:00
Sally Coolatta
8e8881b534 Fix custom title card text not looping properly 2021-05-07 14:14:31 -04:00
LJ Sonic
07e69c5eb3 Add copyright date ranges for files created in 2020 2021-05-07 18:04:30 +02:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
lachablock
8b021ec16b but if you close your eyes EH OH, EH OH 2021-05-07 12:38:24 +10:00
Tatsuru
8b9b25829a Merge branch '229-prep' into 'next'
2.2.9 prep

See merge request STJr/SRB2!1499
2021-05-06 21:42:53 -04:00
Tatsuru
3159d5a6e4 2.2.9 prep 2021-05-06 21:58:21 -03:00
sphere
6053740ef7 Merge branch 'light-userdata-is-wrong' into 'next'
Stop using metatables with light userdata

See merge request STJr/SRB2!1495
2021-05-06 12:14:36 -04:00
sphere
413c8563c9 Merge branch 'things-to-tide-you-over' into 'next'
Update URL on the addon screen

See merge request STJr/SRB2!1489
2021-05-06 08:18:12 -04:00
James R
ec8b63d675 Makefile: remove last of unused flags 2021-05-05 21:21:55 -07:00
James R
c8a4a7a0b1 Merge branch 'musicchange-hook-fix' into 'next'
Fix MusicChange hook not returning some values correctly

See merge request STJr/SRB2!1496
2021-05-05 20:02:15 -04:00
James R
f9813844e7 Update CMakeLists.txt to use Sourcefiles
This establishes (near) parity of source code file lists
between the Makefile and CMakeLists.txt

To make that change I messed around CMakeLists.txt a bit.
It now uses target_sources and target_compile_definitions.
I also removed some MSVC stuff since we don't actually
care about MSVC--it made things easier.

CMake minimum version 3.0 -> 3.13 for target_sources.
2021-05-05 04:00:44 -07:00
James R
3d7205d494 Fix minor errors with Windows ECHO, DEL, MD
- Quotes were not removed by ECHO.
- DEL would print an error on nonexistent file.
- MD would do this plus return a nonzero exit code.
2021-05-04 22:34:20 -07:00
James R
8840bef2cb Appveyor: update to correct executable directory this time 2021-05-04 17:05:54 -07:00
James R
888073d64d Fix make clean printing header 2021-05-04 16:54:47 -07:00
James R
53d1cbe826 Appveyor: update executable directory 2021-05-04 16:50:50 -07:00
James R
b31056c7d9 Rewrite Makefile to be modular as well as more automated
Some key points for programmers:
- Source code files are mostly listed in a 'Sourcefile'.
  So you no longer directly edit the object list. There
  can be multiple Sourcefiles and they can even live in
  subdirectories--the directory name will be prepended to
  every filename in the list. Of course, the Makefile
  still needs to be edited to read from each Sourcefile.
- Different rules are no longer required for source code
  files that live in subdirectories (such as sdl/ or
  hardware/). Subdirectories Just Work so go ham!

In addition to those points, another important change is
that the bin directory is no longer divided into platform
subdirectories (Linux64, Mingw, etc). Executables now go
directly into bin. If you use DEBUGMODE or target 64-bit,
then subdirectories for 'debug' and '64' will be made
though.

Oh by the way, I don't think make clean actually removed
files before on Windows. It should now. I also fixed as
many little inconsistencies like that as I noticed.

And now just an overview of the technical aspects that
shouldn't affect anyone who doesn't REALLY care about the
Makefile...

objs and dep directories have been moved to a make
directory. Makefile.cfg and its variants have been moved
out of their various subdirectories to src/Makefile.d
make distclean removes the bin and make directories
entirely, but make clean and cleandep still only affect
the current build target.

When I say automation, I mean that a lot of copy pasting
in the Makefile has been reduced.
2021-05-04 04:22:37 -07:00
James R
f637e28d0c Remove bin, objs and dep directories 2021-05-04 04:14:00 -07:00
James R
44d217807f Collect makefiles 2021-05-03 23:07:44 -07:00
Steel Titanium
80fe39bbd1 Fix MusicChange hook not returning some values correctly 2021-05-03 01:40:02 -04:00
James R
aee963f4e9 Replace LUA_PushLightUserdata with LUA_PushUserdata
See 7df6a309 and 83a87042. I didn't realize that light
userdata's metatable is shared--like numbers or strings.
So it cannot be paired with a metatable.

I also made a few minor tweaks to Lua cvars, other than
accounting for the double pointer in the userdata.
2021-05-02 21:59:23 -07:00
James R
ed5a7f51e8 Revert "Merge branch 'lightmemedata' into 'next'"
This reverts commit d4c08a8410, reversing
changes made to e100f21dda.
2021-05-02 21:32:07 -07:00
GoldenTails
ab84bd5370 Fix the console splitting up halfway through startup. 2021-05-02 00:03:35 -05:00
Tatsuru
aac3ca320b Update LOCATIONSTRING2 as well 2021-05-01 10:24:28 -03:00
Sally Coolatta
381ead4d7e Level select no longer assumes that games will always be linear
- If a level is in-between two with the same header, it would previously create two headers with the same name. Now it groups all levels with the same header together.
- Previously, a header would only be visible if its first map was visible. Now it will show the header if you've visited any level under the header.

For SUGOI.
2021-04-30 21:46:09 -04:00
LJ Sonic
f97dc1093a Merge branch 'kitchensync' into 'next'
Attempt to resolve teleportation resync issue

See merge request STJr/SRB2!1490
2021-04-30 20:39:11 -04:00
katsy
815db01438 adjust cooldown to 5 seconds (bandage fix for 2.2.9) 2021-04-30 20:30:35 -04:00
katsy
858cb98e57 attempt to resolve teleportation resync issue 2021-04-30 17:26:09 -05:00
Tatsuru
ea7b332525 Visit srb2.org/addons to get & make addons! 2021-04-30 15:49:09 -03:00
Jaime Ita Passos
b4a09405a7 Use 64-bit math for calculating the texture origin X/Z 2021-04-29 19:24:37 -03:00
Jaime Ita Passos
9d41325843 Only adjust slope offsets if the plane isn't rotated 2021-04-28 22:15:05 -03:00
Jaime Ita Passos
090f304f33 Use 64-bit x/y in R_GetSlopeZAt 2021-04-28 22:00:20 -03:00
Jaime Ita Passos
1cf13a22e4 Merge branch 'next' into polyobject-ffloor-fix 2021-04-28 20:29:41 -03:00
Monster Iestyn
b8ba2c5b70 Merge branch 'next' into load-netgame-error-fixes
# Conflicts:
#	src/d_clisrv.c
2021-04-28 18:08:48 +01:00
Jaime Ita Passos
8f47a7e9cc Prevent texture wobbling on planes with no flat alignment 2021-04-27 22:59:06 -03:00
Jaime Ita Passos
0fba870a35 Revert "Use floating point trig in R_SetSlopePlane"
This reverts commit 63761a2d07.
2021-04-27 22:54:56 -03:00
Jaime Ita Passos
63761a2d07 Use floating point trig in R_SetSlopePlane 2021-04-27 20:42:59 -03:00
Jaime Ita Passos
1c6296653a Use floating point GetSlopeZAt for the texture origin vector 2021-04-27 20:32:41 -03:00
Jaime Ita Passos
e4b8dc6584 Fix sloped plane offsets in Software, and fix rotated flat alignment in OpenGL.
+ unrelated slope plane optimizations in Software
2021-04-27 19:01:09 -03:00
Jaime Ita Passos
548554431b Handle invalid blend modes properly 2021-04-27 00:20:41 -03:00
Jaime Ita Passos
85c53b35cd Use old routine for PO2 spans 2021-04-26 22:17:03 -03:00
Vincent Robinson
f437d6afec Add linedef specials for multitagging in binary maps 2021-04-26 16:27:39 -07:00
LJ Sonic
1355a82aa5 Merge branch 'final-hours' into 'next'
Last-minute fixes

See merge request STJr/SRB2!1483
2021-04-26 18:33:42 -04:00
LJ Sonic
3491112818 Update copyright date 2021-04-27 00:33:24 +02:00
LJ Sonic
0d4d3a5207 Revert "Lua: ensure order of MIN, MAX possible values"
This reverts commit c51c478740.
2021-04-26 21:11:24 +02:00
LJ Sonic
cd4cfba500 Delete faulty return 2021-04-26 21:10:32 +02:00
Monster Iestyn
34fa977192 move the old "can't load the level" error to its proper place, added specific error messages for all the times that unarchiving Lua banks can fail 2021-04-26 19:07:11 +01:00