lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,203 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

11203 Commits

Author SHA1 Message Date
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 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
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
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
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
Zippy_Zolton e8419ea876 Credits Changes 2020-10-17 20:13:29 -05:00
Hannu Hanhi 7941a5fb63 R_FindPlane optimization 2020-10-18 01:27:01 +03:00
James R 4b0725f36f Use FIELDFROM in lua polyobject code 2020-10-15 16:17:51 -07:00
James R 374c19f915 Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro 2020-10-15 16:15:20 -07:00
James R d6b314951e Merge branch 'step-down-ceiling' into 'next' 
Apply step up/down to opposite plane too

See merge request STJr/SRB2!1192
 2020-10-15 19:11:13 -04:00
James R bd9fda8ceb Merge branch 'lua-polyobjects' into 'next' 
Lua polyobjects

Closes #19

See merge request STJr/SRB2!1140
 2020-10-15 19:08:54 -04:00
James R 31977878e1 Merge branch 'raretry-fix' into 'next' 
Make record attack's quick retry more consistent.

Closes #80

See merge request STJr/SRB2!1193
 2020-10-15 19:02:34 -04:00
James R e453a38442 Merge branch 'gif-colorlutfix' into 'next' 
Fix OpenGL GIF recording crashing with gif_localcolortable disabled

See merge request STJr/SRB2!1196
 2020-10-15 19:00:47 -04:00
Jaime Passos 4c59f8c615 Fix OpenGL GIF recording crashing with gif_localcolortable disabled 2020-10-15 01:14:16 -03:00
Steel Titanium b19764dc8e Merge branch 'master' into next 2020-10-14 14:58:07 -04:00
sphere a2ff89f007 Make record attack's quick retry more consistent. 2020-10-14 17:39:23 +02:00
James R b35633bb61 brug 2020-10-14 01:19:43 -07:00
James R 7952408c8e Merge branch 'fix-gzip-makefile-failure' into 'master' 
Fix gzip failing to compress SRB2's objdump on non-Windows.

See merge request STJr/SRB2!1191
 2020-10-14 03:11:26 -04:00
James R cce55ccf90 Merge branch 'ffloorclip-2' into 'next' 
Software 3D floor rendering optimization (second attempt)

See merge request STJr/SRB2!1184
 2020-10-14 03:10:44 -04:00
James R f7e9772e10 Merge branch 'i-pity-you' into 'next' 
Allow JumpSpin abilities to be used with non-ability shields

Closes #277

See merge request STJr/SRB2!1146
 2020-10-14 03:08:20 -04:00
James R bc23f582fe Don't need to set this actually 2020-10-13 19:11:18 -07:00
James R 5fca04c3dd Apply step up/down to opposite plane too 2020-10-13 19:04:52 -07:00
James R cb8f6097cf Merge branch 'save-netvars' into 'next' 
Save netvars

See merge request STJr/SRB2!1179
 2020-10-12 19:03:01 -04:00
James R 58464771a8 Merge branch 'addfile-vararg' into 'next' 
Give the addfile command variable argument support.

See merge request STJr/SRB2!1176
 2020-10-12 18:32:20 -04:00
lachwright 6a73e81227 Merge remote-tracking branch 'origin/next' into i-pity-you 2020-10-13 09:24:09 +11:00
James R d73fbd8616 Merge branch 'slight-shader-cleanup' into 'next' 
Shader code cleanup

See merge request STJr/SRB2!1103
 2020-10-12 18:22:08 -04:00
GoldenTails 87a5e1d30c Futureproof against strict buildbots. 2020-10-12 17:14:32 -05:00
James R d7b8d5d0f3 Merge branch 'penalty-of-death' into 'next' 
I am going to die :D (closes #337)

Closes #337

See merge request STJr/SRB2!1183
 2020-10-12 18:11:09 -04:00
James R 5a5024faf4 Merge branch 'skip-credits-gone-wrong' into 'next' 
Fix clients being able to skip credits AGAIN (closes #339)

Closes #339

See merge request STJr/SRB2!1182
 2020-10-12 18:09:48 -04:00