stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
12889 commits 172 branches 41 tags 280 MiB
Commit graph

12889 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
f2e15fc4f1 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
James R
4fc0e44c23 Merge branch 'copyright-fixes' into 'next' 
Fix some copyright statements in new files

See merge request STJr/SRB2!1223
 2020-11-01 22:56:58 -05:00
James R
18365f3820 Merge branch 'udmf-seg-length-crash-fix' into 'next' 
UDMF Seg length crash fix

See merge request STJr/SRB2!1221
 2020-11-01 22:55:13 -05:00
James R
f4b82f27db Merge branch 'fix-objectplace-silent' into 'next' 
Fix objectplace -silent

See merge request STJr/SRB2!1214
 2020-11-01 22:52:46 -05:00
James R
33cfd2c72a Merge branch 'mobjghost-rollangle' into 'next' 
Ghost mobj matches rollangle (Closes #362)

Closes #362

See merge request STJr/SRB2!1211
 2020-11-01 22:49:50 -05:00
James R
fdbeafca42 Merge branch 'tailsoverlay-dash' into 'next' 
Dash state for Tails overlay (Closes #325)

Closes #325

See merge request STJr/SRB2!1210
 2020-11-01 22:49:12 -05:00
James R
d7335469eb Merge branch 'master-use-sse3' into 'master' 
Use SSE3 in 32-bit x86 binaries

See merge request STJr/SRB2!1213
 2020-11-01 22:47:36 -05:00
James R
37931fc253 The lump is not needed for P_WriteThings 2020-11-01 19:31:10 -08:00
Steel Titanium
ac7781a3b3 Expose more music functions to Lua 2020-10-31 21:15:41 -04:00
James R
0bbdde2fb2 Merge branch 'staggersaves' into 'next' 
Draw save files from outwards in

See merge request STJr/SRB2!1228
 2020-10-31 18:39:14 -04:00
Steel Titanium
41d8210fd5 Expose gamestate to Lua 2020-10-31 16:36:15 -04:00
Hannu Hanhi
54cc9db7a5 Fix CMake SSE3 flag 2020-10-31 18:04:44 +02:00
Hannu Hanhi
724d126015 Clarify licensing-related text in libdivide.h 2020-10-31 16:39:05 +02:00
lachwright
bfbcc69108 Draw save files from outwards in 2020-10-31 18:21:14 +11:00
Steel Titanium
62b5b86ed4 CMake: Fix fullscreen toggle not working 
All because of a typo
 2020-10-31 00:59:51 -04:00
Steel Titanium
d406340b5d Fix compiling using cmake if internal libs is used 2020-10-30 23:37:34 -04:00
Louis-Antoine
1155d875d5 Use the same names as userdataType() for userdataMetatable() 2020-10-30 15:00:13 +01:00
Louis-Antoine
f943f247af Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into register-metatables 2020-10-30 14:46:04 +01:00
Zippy_Zolton
6c00a96755 thunder shield :D 2020-10-29 12:32:42 -05:00
Hannu Hanhi
c44120eb87 Fix some copyright statements in new files 2020-10-29 16:04:25 +02:00
Monster Iestyn
5241b83f97 Fix seg->length and flength not being set at all for UDMF maps 2020-10-28 19:36:03 +00:00
Zippy_Zolton
4e56caa196 Flame Shield Changes 2020-10-28 01:23:05 -05:00
Jaime Passos
0f9d85694d Implement an "ignore colormaps" sprite rendering flag 2020-10-27 19:54:50 -03:00
Nev3r
3d2d44bfff Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii 
# Conflicts:
#	src/p_user.c
 2020-10-27 22:23:30 +01:00
Nev3r
ad9e3411a1 Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next. 2020-10-27 22:13:10 +01:00
Jaime Passos
b03d95c5c6 Bug fixes 2020-10-27 17:02:35 -03:00
Nev3r
c62ef355ef 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
Louis-Antoine
e178966367 Remove useless condition 2020-10-27 20:28:54 +01:00
Louis-Antoine
395d1f1b8f Do not pause the client while redownloading the gamestate 2020-10-27 20:23:32 +01:00
Louis-Antoine
804ad44e89 Fix music resetting after reloading the gamestate 2020-10-27 20:22:15 +01:00
Louis-Antoine
5c48b92b2c Fix camera going wild after reloading the gamestate 2020-10-27 20:21:56 +01:00
Jaime Passos
b872222b50 Implement blend modes 2020-10-27 00:03:41 -03:00
Louis-Antoine
499bb56436 Only resend the gamestate to one client at a time 2020-10-27 01:22:31 +01:00
Louis-Antoine
7ae53364f2 Add a 15 seconds cooldown between successive gamestate resends 2020-10-27 01:20:05 +01:00
Louis-Antoine
9f5686ef48 Fix underflow in consistancy checking code 2020-10-26 23:15:22 +01:00
James R
18a2e87093 Check maxstep is not disabled before stepping up 
Fixes infinite step up when it should be no step up.
 2020-10-26 14:00:54 -07:00
Hannu Hanhi
86ad187f05 NPO2 slope span optimization 2020-10-26 00:26:15 +02:00
James R
afb8e6e181 Whoops 2020-10-24 20:44:42 -07:00
James R
713b965a85 Merge branch 'playah' into 'next' 
Credits Changes

See merge request STJr/SRB2!1200
 2020-10-24 21:54:40 -04:00
Zolton Auburn
9a0d65a0f1 Update f_finale.c 2020-10-24 20:17:20 -04:00
Zolton Auburn
24596bd8d5 Update f_finale.c 2020-10-24 20:16:21 -04:00
James R
9278f04fbf Delete ban.txt if no bans to save 2020-10-24 15:59:11 -07:00
James R
288ffebea7 Do not save cleared ban list when reloading bans 2020-10-24 15:52:02 -07:00
James R
305f58077d Fix objectplace -silent 2020-10-24 15:29:31 -07:00
Hannu Hanhi
244c76250f Use SSE3 in 32-bit x86 binaries 2020-10-25 00:08:24 +03:00
Zippy_Zolton
5d4032fd00 Ghost mobj matches rollangle 2020-10-24 12:38:30 -05:00
Louis-Antoine
50d2c95470 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate 2020-10-24 16:21:44 +02:00
James R
e9fce20071 Merge remote-tracking branch 'origin/master' into next 2020-10-23 14:57:13 -07:00
James R
86c38e6d9a Merge branch 'reverse-offsetof-macro' into 'next' 
Turn the lua sector lines hack into a macro

See merge request STJr/SRB2!1187
 2020-10-23 16:44:29 -04:00
James R
687e2d89cc Merge branch 'set-cvars' into 'next' 
Set cvars directly from Lua

See merge request STJr/SRB2!1205
 2020-10-23 16:42:42 -04:00