Steel Titanium
ffa78e1531
Change this condition a bit
2019-12-24 17:44:06 -05:00
Steel Titanium
90ca018318
Merge branch 'next' into char-damage-fix
2019-12-24 17:08:23 -05:00
Jaime Passos
31eeb90056
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
MascaraSnake
caa0800213
P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions
2019-12-24 21:07:55 +01:00
James R
ddae69f672
Merge remote-tracking branch 'origin/master' into next
2019-12-24 11:53:49 -08:00
James R
248e452d7d
Merge branch 'titlecard2' into 'next'
...
More customisable title card
See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
James R
27e251e7fc
Merge branch 'wipes2' into 'master'
...
Wipe styles cleanup
See merge request STJr/SRB2!525
2019-12-24 14:47:14 -05:00
James R
d5fdbfda6b
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
cb9db74044
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
d2239f5ea1
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
975f1e5f83
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
469e5a7c9b
Fix NOPNG compiling
2019-12-24 11:37:37 -08:00
Jaime Passos
debacf34bb
Turn the babysitting deterrent into its own rule.
2019-12-24 16:30:18 -03:00
Jaime Passos
c6dd9f016e
Title card fixes.
2019-12-24 16:22:25 -03:00
James R
699407dbb0
I'm an idiot
2019-12-24 11:14:21 -08:00
Jaime Passos
c76154d3a1
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
4f54da125d
GTR_HURTMESSAGES
2019-12-24 16:09:00 -03:00
James R
984281e85e
Merge remote-tracking branch 'origin/master' into time
2019-12-24 11:02:31 -08:00
MascaraSnake
604a1c654d
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
418cc50bbc
Fixed missing break in offset handling for horizontal springs
2019-12-24 13:01:17 +01:00
MascaraSnake
a4adb0d873
Fixed missing break in offset handling for horizontal springs
2019-12-24 12:58:12 +01:00
MascaraSnake
464a476a54
Move bonus time handling into new function P_SetBonusTime()
2019-12-24 12:52:43 +01:00
MascaraSnake
dac9014786
Allow P_SpawnItemRow to spawn different item types in the same row
2019-12-24 12:47:44 +01:00
MascaraSnake
68238107f8
Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:38:16 +01:00
MascaraSnake
1d6e6b7072
Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:19:13 +01:00
Nev3r
196e76cece
Delete the original configuration file.
2019-12-24 12:02:49 +01:00
Nev3r
e6608f4519
Refactor existing configuration into ZDoom-styled format.
2019-12-24 11:58:25 +01:00
James R
df02a22697
Correct usage of logdir
2019-12-24 01:59:05 -08:00
James R
5d0c19af37
Overwrite an already existing symlink
2019-12-24 01:55:47 -08:00
MascaraSnake
cb4fbaa596
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
23d7b726d4
Treat strings inside ""s as a single token.
2019-12-24 10:27:23 +01:00
Nev3r
463f2619ec
Ignore '=' and ';' when tokenizing, for textmap reading's sake.
2019-12-24 10:25:38 +01:00
James R
7db16e230b
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
21e23c4307
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
d146594895
Fix Lua HUD library crashes.
2019-12-24 00:14:25 -03:00
James R
908266f583
symlink latest-log.txt on nix, copy to the real log file everywhere else
2019-12-23 18:20:04 -08:00
Jaime Passos
b1add48063
Add IDENTIFIER to gametype DeHackEd.
2019-12-23 23:19:48 -03:00
Jaime Passos
8405dc4c07
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
James R
ac0d7cbc96
Create directories from -logfile too
2019-12-23 17:43:42 -08:00
James R
1da751bdd3
Let an asbolute path work with -logfile
2019-12-23 17:40:43 -08:00
James R
aaf2ef21b3
-logdir lets the user change the log directory
2019-12-23 17:21:58 -08:00
James R
c0b01f5a07
Change default log filename to not use a space
...
bleh
2019-12-23 15:34:27 -08:00
James R
746b1dab68
-logfile to let the user change the log file name
2019-12-23 15:31:50 -08:00
Jaime Passos
c832d26ee9
ViewpointSwitch improvements.
2019-12-23 20:22:57 -03:00
MascaraSnake
7dc370d786
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
73bb0567cc
Turn GTR_CHASECAM into GTR_FIRSTPERSON.
2019-12-23 19:24:06 -03:00
Jaime Passos
ba5516b99f
Add gametyperules to LUA_CheckGlobals.
2019-12-23 19:16:10 -03:00
Jaime Passos
62f2fcc57e
Add sstimer to LUA_PushGlobals.
2019-12-23 19:08:57 -03:00
Jaime Passos
60cf1e1837
Bail out earlier.
2019-12-23 19:00:46 -03:00
MascaraSnake
1809cb8e82
Turn size and number of items for item circle into function parameters (in preparation for UDMF)
2019-12-23 22:58:58 +01:00