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

8632 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
75a5142aad Merge branch 'wipes2' into 'master' 
Wipe styles cleanup

See merge request STJr/SRB2!525
 2019-12-24 14:47:14 -05:00
James R
f077413f31 Merge branch 'soc-srb2-fix' into 'master' 
The "SRB2" directive, for warning if a SOC isn't compatible

See merge request STJr/SRB2!551
 2019-12-24 14:44:55 -05:00
James R
e0a20a733c Merge branch 'gl_gifs' into 'master' 
OpenGL GIF movie recording

See merge request STJr/SRB2!549
 2019-12-24 14:44:44 -05:00
James R
3f339384c8 Merge branch 'hwrtexfix' into 'master' 
Fix model texture blending

See merge request STJr/SRB2!546
 2019-12-24 14:44:19 -05:00
James R
1df31f2e98 Merge branch 'soundtest-fix' into 'master' 
Init MUSICDEFs regardless of music state

See merge request STJr/SRB2!532
 2019-12-24 14:44:08 -05:00
James R
be063c454a Fix NOPNG compiling 2019-12-24 11:37:37 -08:00
Jaime Passos
c61c1e2514 Turn the babysitting deterrent into its own rule. 2019-12-24 16:30:18 -03:00
Jaime Passos
9319014d8d Title card fixes. 2019-12-24 16:22:25 -03:00
James R
9d28351b5c I'm an idiot 2019-12-24 11:14:21 -08:00
Jaime Passos
5b4d587b1a Don't warn about missing CTF starts if the gametype doesn't have team flags. 2019-12-24 16:12:05 -03:00
Jaime Passos
b740daf5bf GTR_HURTMESSAGES 2019-12-24 16:09:00 -03:00
James R
d1f12347cc Merge remote-tracking branch 'origin/master' into time 2019-12-24 11:02:31 -08:00
MascaraSnake
7ad5931f71 Merge branch 'horizontalspring-oops' into 'next' 
Fixed missing break in offset handling for horizontal springs

See merge request STJr/SRB2!571
 2019-12-24 07:02:34 -05:00
MascaraSnake
0aa3c9b0a3 Fixed missing break in offset handling for horizontal springs 2019-12-24 13:01:17 +01:00
MascaraSnake
13eb71e1ee Fixed missing break in offset handling for horizontal springs 2019-12-24 12:58:12 +01:00
MascaraSnake
a57f903933 Move bonus time handling into new function P_SetBonusTime() 2019-12-24 12:52:43 +01:00
MascaraSnake
ac3a57aaf5 Allow P_SpawnItemRow to spawn different item types in the same row 2019-12-24 12:47:44 +01:00
MascaraSnake
72a1571937 Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF) 2019-12-24 12:38:16 +01:00
MascaraSnake
2dac47a54c Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF) 2019-12-24 12:19:13 +01:00
Nev3r
2cf94ea6ae Delete the original configuration file. 2019-12-24 12:02:49 +01:00
Nev3r
75e18610bc Refactor existing configuration into ZDoom-styled format. 2019-12-24 11:58:25 +01:00
James R
b7b4945c36 Correct usage of logdir 2019-12-24 01:59:05 -08:00
James R
f2c2836301 Overwrite an already existing symlink 2019-12-24 01:55:47 -08:00
MascaraSnake
dd01fce1a8 Separate P_SpawnHoopsAndRings into different functions: 
-Hoops are spawned in P_SpawnHoop
-Item patterns are spawned in P_SpawnItemPattern
-Ring-like items are spawned normally via P_SpawnMapThing
-Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
 2019-12-24 10:50:49 +01:00
Nev3r
36996c8c91 Treat strings inside ""s as a single token. 2019-12-24 10:27:23 +01:00
Nev3r
ce3f526a5e Ignore '=' and ';' when tokenizing, for textmap reading's sake. 2019-12-24 10:25:38 +01:00
James R
9defd997c3 Merge branch 'fixsignalhandler' into 'master' 
Handle signals correctly on linux

See merge request STJr/SRB2!530
 2019-12-24 02:54:44 -05:00
MascaraSnake
04a56120d4 Merge branch 'spawnmapthing-refactor' into 'next' 
Hack P_SpawnMapThing into tiny little pieces

See merge request STJr/SRB2!564
 2019-12-24 01:59:36 -05:00
Jaime Passos
d76c4eaba8 Fix Lua HUD library crashes. 2019-12-24 00:14:25 -03:00
James R
25525a6aae symlink latest-log.txt on nix, copy to the real log file everywhere else 2019-12-23 18:20:04 -08:00
Jaime Passos
40b0c853b7 Add IDENTIFIER to gametype DeHackEd. 2019-12-23 23:19:48 -03:00
Jaime Passos
89b4a558a8 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-23 23:08:16 -03:00
James R
98cb238d36 Create directories from -logfile too 2019-12-23 17:43:42 -08:00
James R
5fbe77cdda Let an asbolute path work with -logfile 2019-12-23 17:40:43 -08:00
James R
457e986b75 -logdir lets the user change the log directory 2019-12-23 17:21:58 -08:00
James R
c285000c56 Change default log filename to not use a space 
bleh
 2019-12-23 15:34:27 -08:00
James R
d9d13764e6 -logfile to let the user change the log file name 2019-12-23 15:31:50 -08:00
Jaime Passos
a657392d39 ViewpointSwitch improvements. 2019-12-23 20:22:57 -03:00
MascaraSnake
ffd6cf4aca Replaced functions for spawning premade rows of rings with a function for spawning a generic row of rings (groundwork for UDMF) 2019-12-24 00:10:29 +01:00
Jaime Passos
630c06b7b0 Turn GTR_CHASECAM into GTR_FIRSTPERSON. 2019-12-23 19:24:06 -03:00
Jaime Passos
bb1f43d374 Add gametyperules to LUA_CheckGlobals. 2019-12-23 19:16:10 -03:00
Jaime Passos
e9f69b9c6a Add sstimer to LUA_PushGlobals. 2019-12-23 19:08:57 -03:00
Jaime Passos
bbe946ac1e Bail out earlier. 2019-12-23 19:00:46 -03:00
MascaraSnake
50dd0a71db Turn size and number of items for item circle into function parameters (in preparation for UDMF) 2019-12-23 22:58:58 +01:00
Jaime Passos
d050e04dae Bail out if there are no more free gametype slots. 2019-12-23 18:58:33 -03:00
Jaime Passos
edddc3e64e Custom gametype constant support for Lua. 2019-12-23 18:54:25 -03:00
Jaime Passos
5ebd84c3e7 Move ALL the Lua global variable stuff into lua_script.c. 2019-12-23 18:49:23 -03:00
Jaime Passos
7425591815 Add pointlimit and timelimit to Lua. 2019-12-23 18:37:38 -03:00
Jaime Passos
d0f7877fd0 Turn noglobals into setglobals, move the extra global variable handling to gamestateglobals. 2019-12-23 18:33:39 -03:00
Jaime Passos
61b72203a8 Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00