stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-26 12:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
11508 commits 173 branches 41 tags 295 MiB
Commit graph

11508 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
James R
333d3a2576 Merge branch 'cmake-multithreading' into 'master' 
Add multithreading option for CMake

See merge request STJr/SRB2!1204
 2020-10-23 16:42:32 -04:00
James R
503e83653e Merge branch 'skip-unused-mobj-hooks' into 'next' 
Only invoke the Lua API for mobj hooks that need it

See merge request STJr/SRB2!1209
 2020-10-23 16:40:07 -04:00
James R
fd63b50f44 Merge branch 'insert-wait' into 'next' 
Do not let previous wait commands affect COM_BufInsertText

See merge request STJr/SRB2!1207
 2020-10-23 16:38:46 -04:00
James R
5f772c1850 Merge branch 'fix-ghost-netvar-crash' into 'next' 
Fix G_GhostTicker crashing trying to read netvars as ghost data

See merge request STJr/SRB2!1203
 2020-10-23 16:37:49 -04:00
James R
135d0f91b0 Merge branch 'sw-npo2-span-opt' into 'next' 
NPO2 span function optimization

See merge request STJr/SRB2!1201
 2020-10-23 16:36:18 -04:00
LJ Sonic
787ec250b3 Merge branch 'catchup-timeout' into 'next' 
Kick clients that fail to catch up with server gamelogic

See merge request STJr/SRB2!1208
 2020-10-23 16:19:10 -04:00
Zolton Auburn
85692ac409 Update info.c 2020-10-23 14:04:02 -04:00
Zippy_Zolton
c0571b5fbf g 2020-10-23 01:09:12 -05:00
Zippy_Zolton
a4459b6693 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00
Louis-Antoine
37c11e0f2e Fix unfortunate typos 2020-10-22 00:08:06 +02:00
Louis-Antoine
d349e9bf83 Only invoke the Lua API for mobj hooks that need it 2020-10-21 22:48:00 +02:00
James R
ba4b6ec400 Reset wait period for COM_BufInsertText 2020-10-21 12:34:26 -07:00
Louis-Antoine
5091c19abf Kick clients that fail to catch up with server gamelogic 2020-10-21 20:25:29 +02:00
James R
39ccd12f04 Add CV_Set, CV_SetValue, CV_StealthSet, CV_StealthSetValue and CV_AddValue to Lua 
CV_SetValue merged with CV_Set (same with CV_StealthSetValue and CV_StealthSet).
 2020-10-20 16:08:34 -07:00
GoldenTails
1e0beab254 Add i_threads.h too 2020-10-20 15:58:34 -05:00
GoldenTails
31c410656c Add multithreading option for CMake 2020-10-20 15:44:01 -05:00
Zolton Auburn
d1f16e0f77 Continue 2020-10-20 15:56:41 -04:00
Steel Titanium
d6c0e0cf30 Fix G_GhostTicker crashing trying to read netvars as ghost data 
Also fixed possible issue with incorrectly reading the demo pointer due to the wrong type being passed to sizeof in G_ConsGhostTic
 2020-10-19 20:20:08 -04:00
Jaime Passos
dfc85ec21a Include p_local.h 2020-10-19 17:38:02 -03:00
Jaime Passos
a21685812f Rename R_DrawVisSplat to R_DrawSplatSprite, move into r_splats.c 2020-10-19 17:36:29 -03:00
Jaime Passos
dbc149f85a Remove FLOORSPLATS define 2020-10-19 17:33:16 -03:00
James R
1cd73315f1 Merge branch 'model-fallback' into 'next' 
Model fallback

See merge request STJr/SRB2!1167
 2020-10-18 16:52:42 -04:00
James R
7f65023891 Merge branch 'bustflags' into 'next' 
Bustable Wall and Floor flags.

See merge request STJr/SRB2!1163
 2020-10-18 16:42:15 -04:00
Hannu Hanhi
382ed1c31e Remove leftover commented code from previous commit 2020-10-18 23:04:01 +03:00
James R
d279489753 Merge branch 'perfstats' into 'next' 
Performance stats

See merge request STJr/SRB2!1186
 2020-10-18 15:33:20 -04:00
James R
0583eca009 Merge branch 'sw-findplane-opt' into 'next' 
R_FindPlane optimization

See merge request STJr/SRB2!1199
 2020-10-18 15:16:51 -04:00
Hannu Hanhi
23e02d17c0 NPO2 span function optimization 2020-10-18 21:27:22 +03:00
Jaime Passos
3ac175660c Don't render sprites with negative xscale or yscale in OpenGL 2020-10-17 22:40:49 -03:00
Zippy_Zolton
e8419ea876 Credits Changes 2020-10-17 20:13:29 -05:00