Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
1f082f15e6
Merge SRB2 master
2021-02-27 02:25:14 -05:00
Sally Coolatta
90ca38acb0
Store where the finish line beam should be displayed
...
Instead of figuring out where it should be every tick while it's visible, store where it'll be at the start of the map.
Also moved finish line beam into a new file, k_race.c/h, for any Race-specific code.
A few unused variables for sprint map support later too
2021-02-05 01:24:23 -05:00
James R
775cb46f75
Lua taglib for accessing taggroups
...
The global "tags" can be iterated upon for every unique tag which is set in the
level. If a tag is set on a sector/line/thing, it will be included. Taking the
length of "tags" will give you the number of these unique tags. (If a tag is
set on multiple sectors/lines/things, it will only be counted once though.)
For sectors, lines and mapthings, call the field "tagged". This function takes
one argument, which is the tag. The return value can be iterated over for all
the sectors/lines/things with that tag. The length can also be taken for the
number of such objects. If no argument is given, the global tag is default.
2020-12-04 00:30:08 -08:00
GoldenTails
d673604b48
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
Jaime Ita Passos
be274a4fa9
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
Sally Coolatta
fc934b38e1
Merge public next
2020-11-10 15:32:48 -05:00
Nev3r
f94d9825b4
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
James R
99a0a9a9eb
Merge remote-tracking branch 'origin/master' into next
2020-11-01 20:01:22 -08:00
James R
f7b907de14
Merge branch 'cmake-curl-internal-fix' into 'master'
...
Fix compiling using cmake if internal libs is used
See merge request STJr/SRB2!1225
2020-11-01 22:57:12 -05:00
Hannu Hanhi
b18fe88265
Fix CMake SSE3 flag
2020-10-31 18:04:44 +02:00
Steel Titanium
3b7f0001cf
Fix compiling using cmake if internal libs is used
2020-10-30 23:37:34 -04:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
Hannu Hanhi
e0a09ceeae
Use SSE3 in 32-bit x86 binaries
2020-10-25 00:08:24 +03:00
James R
f21b2c66b5
Merge remote-tracking branch 'origin/master' into next
2020-10-23 14:57:13 -07:00
GoldenTails
e7b3e2598d
Add i_threads.h too
2020-10-20 15:58:34 -05:00
GoldenTails
0fb69e75e1
Add multithreading option for CMake
2020-10-20 15:44:01 -05:00
James R
f34a761d48
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
James R
66a6374dbe
Merge branch 'lua-polyobjects' into 'next'
...
Lua polyobjects
Closes #19
See merge request STJr/SRB2!1140
2020-10-15 19:08:54 -04:00
Jaime Passos
c40f2b3f2b
Add r_patchrotation.h
2020-10-10 18:53:05 -03:00
Jaime Passos
e23929a899
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b44837324f
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
24ff748c58
Performance stats
2020-10-10 22:12:34 +03:00
James R
8a7044a4ef
Add STUN to CMakeLists.txt
2020-09-30 21:15:49 -07:00
Sally Coolatta
b5fcd74ef9
Merge master
...
Slopes in a few maps are really broken ... think it's anchors, I'm gonna leave that to jart :V
2020-09-25 12:00:50 -04:00
James R
ef108cbb36
Merge remote-tracking branch 'pub/next'
2020-09-20 14:07:54 -07:00
SteelT
6a168ac5e9
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Monster Iestyn
d5030f8a02
Begin work on adding access to polyobjects in Lua:
...
* create new file lua_polyobjlib.c
* made a stub LUA_PolyObjLib function
* added META_POLYOBJ to lua_libs.h
* updated makefile, CMake and MSVC project files for lua_polyobjlib.c
2020-09-08 18:08:08 +01:00
Sally Coolatta
54c487feff
Merge branch 'next' into discord-rpc-support
2020-08-26 12:56:58 -04:00
Steel Titanium
7005d8303c
Turns out compiling with the internal version of curl was broken on CMake the entire time 🙃
2020-08-24 01:00:28 -04:00
Steel Titanium
f20f0b2f19
Better CMake support
...
No idea if it compiles on Mac, it does on Linux though, at least for me.
2020-08-23 16:15:33 -04:00
Sally Coolatta
74bad0e34c
Attempt to improve discord-rpc checking in CMake
...
Haven't ever gotten CMake to compile SRB2, so I'm unable to really check if this works
2020-08-23 06:45:35 -04:00
Sally Coolatta
8c79d62b22
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-22 07:28:21 -04:00
James R
8f2bfb63bc
Merge remote-tracking branch 'pub/next'
2020-08-19 16:45:31 -07:00
Latapostrophe
e0dc13e70b
Merge remote-tracking branch 'stjr/io' into kart-io
2020-08-17 20:22:02 +02:00
Sally Coolatta
b5a378f850
Merge remote-tracking branch 'public/master' into discord-rpc-support
2020-08-16 22:12:36 -04:00
Sally Coolatta
632df264a3
Merge remote-tracking branch 'public/next' into discord-rpc-support
2020-08-16 20:57:31 -04:00
Jaime Passos
7bc4af41ab
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Nev3r
e80e0b6007
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
James R
b426ed81dd
dumbass doesn't test changes before pushing directly to next
...
(cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367)
2020-08-14 08:27:25 -07:00
James R
39da55bce3
dumbass doesn't test changes before pushing directly to next
2020-08-14 08:25:12 -07:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
7b4d84c3f3
Merge remote-tracking branch 'public/master'
2020-08-12 18:55:43 -04:00
James R
b771ff2426
Add http-mserv to fuck
...
(cherry picked from commit 8e493bddc3
2020-08-09 23:34:16 -07:00
James R
8e493bddc3
Add http-mserv to fuck
2020-08-09 23:32:43 -07:00
Steel Titanium
79469d401c
Fix cmake using wrong libs if internal libs is turned on
...
Use '\0' instead, just in case
(cherry picked from commit 47d70e1ae6
2020-08-09 20:28:33 -07:00
lachwright
dad03e0994
src/CMakeLists.txt (don't forget to fix vanilla :P)
2020-08-10 11:21:24 +08:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
