sphere
d915da6509
Merge branch 'dashaction' into 'next'
...
Scale minimum dashmode thok speed on actionspd, not normalspeed
See merge request STJr/SRB2!1311
2021-05-10 08:45:26 -04:00
Lach
5cab285b2c
Merge branch 'make-ghosts-target-origin' into 'next'
...
Set the target of a spawned ghost to where it came from.
Closes #517
See merge request STJr/SRB2!1358
2021-05-10 08:40:41 -04:00
Lach
5fb4b34f8c
Merge branch 'steamed' into 'next'
...
Make steam apply sprung flag
See merge request STJr/SRB2!1365
2021-05-10 08:39:06 -04:00
Lach
e1843841bc
Merge branch 'lunch' into 'next'
...
Don't apply pw_justlaunched if the player didn't actually launch off a slope
See merge request STJr/SRB2!1447
2021-05-10 08:37:55 -04:00
Lach
58a070ca03
Merge branch 'no-fire-shield-palflash' into 'next'
...
No fire shield palflash (resolves #512 )
Closes #512
See merge request STJr/SRB2!1473
2021-05-10 08:37:20 -04:00
Lach
ecd59feafb
Merge branch 'rosycolormap-raspberry' into 'next'
...
Change Raspberry's chat colormap to V_ROSYMAP
See merge request STJr/SRB2!1441
2021-05-10 08:36:26 -04:00
sphere
c25ecfc35f
Merge branch 'more-slope-copying' into 'next'
...
Add more actions for slope copying
See merge request STJr/SRB2!1406
2021-05-10 07:43:03 -04:00
sphere
44f3edb218
Merge branch 'binary-multitagging' into 'next'
...
Add linedef specials for multitagging in binary maps
See merge request STJr/SRB2!1485
2021-05-10 07:42:55 -04:00
RJPFonseca
69647eb78d
Used spaces instead of tabs in Makefile.cfg
2021-05-09 19:10:53 +01:00
LJ Sonic
d0adee76b2
Merge branch 'the-year-is-2021' into 'master'
...
The year is 2021
See merge request STJr/SRB2!1500
2021-05-09 09:28:31 -04:00
James R
35244fa736
Clang: fix -Wimplicit-const-int-float-conversion
...
Some of these integers exceed the precision of float. In
that case the number is rounded. The rounding shouldn't
matter too much anyway, so just shut the compiler up.
2021-05-08 16:49:23 -07:00
James R
210c9419e4
Ignore -Wtrigraphs
2021-05-08 16:49:18 -07:00
Sally Coolatta
ec8e884a31
Removed this function
2021-05-08 12:56:33 -04:00
Sally Coolatta
5d93f86499
Merge branch 'next' into skin-unlocks-sanity
2021-05-08 12:55:46 -04:00
lachablock
d2db204058
Fix rollout rock controls in 2D mode
2021-05-08 18:34:32 +10:00
lachablock
755cf6e952
Merge remote-tracking branch 'origin/next' into rollout-stuff
2021-05-08 13:03:18 +10:00
lachablock
3880263f1f
Add machine dashmode as a condition for gap passage.
...
(Also remove the sprite2 check, we don't need to be that stingy since PlayerHeight hooks allow greater control over that now!)
2021-05-08 12:27:29 +10:00
lachablock
47f465ccea
Merge remote-tracking branch 'origin/next' into dashmode-lowroad
2021-05-08 12:16:46 +10:00
James R
87afa7655a
CMake: fix ASM compile
...
- target_sources from correct directory
- enable_language must be used in add_executable directory
2021-05-07 18:59:51 -07:00
Sally Coolatta
d136c60a3f
Add some comments, write an empty string instead of a boolean determining if the bot skin exists or not.
...
I was a little scared of doing this at first, but after a bit of thought & some testing that it'll be fine.
2021-05-07 20:13:16 -04:00
Sally Coolatta
a583027006
Remove prints
2021-05-07 19:52:29 -04:00
Sally Coolatta
dc6851dabc
Save skin name instead of skin number into save files
...
Allows you to save a game as any character, and you don't have to load the files in a specific order to access the save file.
2021-05-07 19:41:44 -04:00
James R
9e7d80c2c4
Makefile: suppress DEL error
2021-05-07 16:08:24 -07:00
Monster Iestyn
a98b0834a6
Merge branch 'deh-buffer-unclog' into 'next'
...
Fix a series of buffer overflows in SOC (primarily Character section) loading
See merge request STJr/SRB2!1457
2021-05-07 18:47:51 -04:00
Monster Iestyn
70052a099c
Merge branch 'acos' into 'next'
...
arccosine Lua exposure
See merge request STJr/SRB2!1455
2021-05-07 18:33:55 -04:00
James R
c06817d008
Makefile: fix mingw/64 swapped with 32-bit
2021-05-07 15:30:46 -07:00
Monster Iestyn
529d297895
Merge branch 'soc-caption' into 'next'
...
[SUGOI] Allow setting sound captions in SOC
See merge request STJr/SRB2!1469
2021-05-07 18:21:48 -04:00
Monster Iestyn
d00726cbe9
Merge branch 'monster-cleaning-up-again' into 'next'
...
Monster cleaning up again
See merge request STJr/SRB2!1433
2021-05-07 17:33:00 -04:00
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
