MascaraSnake
6032aa3cd1
P_MobjThinker: Separate MF2_FIRING handling into its own function
2019-12-25 00:18:12 +01:00
MascaraSnake
5d89e915c6
Continue cutting up P_MobjThinker into multiple functions
2019-12-25 00:14:53 +01:00
Steel Titanium
8d8e0ca22c
Clean up comment
2019-12-24 17:45:57 -05:00
Steel Titanium
b49672e3f9
Change this condition a bit
2019-12-24 17:44:06 -05:00
Steel Titanium
2f83c2977e
Merge branch 'next' into char-damage-fix
2019-12-24 17:08:23 -05:00
Jaime Passos
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
MascaraSnake
ddccfbd73d
P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions
2019-12-24 21:07:55 +01:00
James R
02779cb6ef
Merge remote-tracking branch 'origin/master' into next
2019-12-24 11:53:49 -08:00
James R
0780e48f86
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
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
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
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
MascaraSnake
6939da0164
Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter
2019-12-23 21:35:03 +01:00
MascaraSnake
24f8d4ef51
Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code.
2019-12-23 21:17:12 +01:00
MascaraSnake
2b3922a8f3
Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore
2019-12-23 20:12:45 +01:00
MascaraSnake
6fc325f3d2
Merge branch 'netarchive_compare_changes' into 'next'
...
Netarchive compare changes
See merge request STJr/SRB2!563
2019-12-23 13:57:49 -05:00
MascaraSnake
eab5f8c851
P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions
2019-12-23 19:08:40 +01:00
MascaraSnake
e382c2e094
P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well
2019-12-23 18:59:11 +01:00
MascaraSnake
8ddd078b20
P_MapThingSpawn(): Move early returning/substitution code into their own functions
2019-12-23 17:28:21 +01:00
MascaraSnake
e90eb9a5e7
Move P_GetMobjtype above first use
2019-12-23 16:54:26 +01:00
MascaraSnake
6a69aa4ffa
Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function
2019-12-23 16:53:45 +01:00
Nev3r
9a9f72f598
Don't reload mapthings in P_LoadThingsOnly() as they should no longer be modified past the mapload procedure.
2019-12-23 16:37:44 +01:00
Nev3r
d6a86c37b2
P_PrepareRawThings() is now where it was supposed to be at; moved save and flat & texture caching related functions to the end of P_LoadMapData().
2019-12-23 16:36:26 +01:00
Jaime Passos
6779c508e7
Satisfy rollangle table with a 3deg angle
2019-12-23 12:19:05 -03:00
MascaraSnake
112b15cca2
Add P_GetMobjtype for finding the mobjtype for a given mapthingnum
2019-12-23 14:45:43 +01:00
Nev3r
1221c108c6
Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there.
2019-12-23 12:47:40 +01:00
Nev3r
bb54597552
Remove redundant netarchive-related sector vars as they're not used anymore.
...
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 12:42:38 +01:00
MascaraSnake
21dcbc856c
Split up P_SpawnHoopsAndRings() into subfunctions
2019-12-23 12:42:09 +01:00
Nev3r
eadf953957
Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps.
...
Fix print type issue.
2019-12-23 12:30:32 +01:00
MascaraSnake
efb47b3786
Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()
2019-12-23 12:07:03 +01:00
James R
f574cd0ce2
Whoops I forgot player 2
2019-12-22 21:29:41 -08:00
Steel Titanium
356b25def4
Spawn Amy's shields for other players
2019-12-23 00:28:06 -05:00
James R
3e2b28e162
Merge remote-tracking branch 'origin/master' into turnmultiplier
2019-12-22 21:26:36 -08:00
James R
7e0152f37b
Merge branch 'hoop_refactor' into 'next'
...
Make both NiGHTS hoop types use the same spawning code.
See merge request STJr/SRB2!560
2019-12-23 00:16:46 -05:00
Steel Titanium
a0ce243051
Merge branch 'next' into char-damage-fix
2019-12-22 23:56:16 -05:00
James R
64af7badfb
Merge remote-tracking branch 'origin/master' into next
2019-12-22 20:47:15 -08:00
MascaraSnake
1e13604007
Merge branch 'flats-in-walls' into 'master'
...
Flats in walls
See merge request STJr/SRB2!548
2019-12-22 17:44:50 -05:00
MascaraSnake
63cf9d61fc
Merge branch 'supermusic-state-fix' into 'next'
...
Fix super theme ending early if invincibility expired
See merge request STJr/SRB2!559
2019-12-22 17:37:32 -05:00
MascaraSnake
154d2033b6
Merge branch 'dustdevilfix' into 'next'
...
Fix pflags not being properly reset when entering dust devil from top
See merge request STJr/SRB2!556
2019-12-22 17:35:51 -05:00
MascaraSnake
579362fd3b
P_LoadMapData(): Throw an error if resources are not found.
2019-12-22 23:22:15 +01:00
MascaraSnake
a4fde93fbb
Merge branch 'next' into virtres
...
# Conflicts:
# src/p_setup.c
2019-12-22 23:02:47 +01:00
MascaraSnake
97adf3e246
Merge branch 'next' into hoop_refactor
...
# Conflicts:
# src/p_mobj.c
2019-12-22 18:12:58 +01:00
MascaraSnake
dacd5614f9
Make both NiGHTS hoop types use the same spawning code.
...
As a result, the old generic hoops now use 24 sprites instead of 32.
2019-12-22 17:37:54 +01:00
Steel Titanium
de1d25cf08
Fix super theme ending early if invincibility expired
2019-12-20 23:45:32 -05:00
Steel Titanium
c2e2ae6021
Merge branch 'next' into char-damage-fix
2019-12-20 23:24:29 -05:00
Steel Titanium
ace202daf0
Fix Amy and Fang being able to attack other players in MP Special Stages
2019-12-20 23:22:45 -05:00
James R
cbb9c7c13a
Merge remote-tracking branch 'origin/master' into next
2019-12-20 14:40:10 -08:00
James R
2ed5617c5f
Merge branch 'better-deadzone' into 'master'
...
Better Deadzones
See merge request STJr/SRB2!541
2019-12-20 17:33:29 -05:00
James R
c50fe1874d
Merge branch 'random-port' into 'master'
...
Choose a random port as a client
See merge request STJr/SRB2!554
2019-12-20 17:33:12 -05:00
James R
70336933bd
Merge branch 'elemental-tweak' into 'next'
...
Don't uncurl from spin if Elemental Stomp is used
See merge request STJr/SRB2!555
2019-12-20 17:32:59 -05:00
Jaime Passos
6d7bdf8fdb
Lua gametyperules
2019-12-19 18:27:11 -03:00
Jaime Passos
551828607c
Load SPR_ lumps as SpriteInfo
2019-12-19 17:25:19 -03:00
Jaime Passos
320b7777b0
Merge remote-tracking branch 'origin/master' into rotsprite2
2019-12-19 17:20:21 -03:00
Jaime Passos
4ad1727b66
Don't spawn End Level Signs without the GTR_ALLOWEXIT rule
2019-12-19 17:06:07 -03:00
Jaime Passos
74a4ec6f54
Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects
2019-12-19 16:31:38 -03:00
Jaime Passos
9b2b526eb4
Removing commented out code
2019-12-19 16:22:55 -03:00
Steel Titanium
a39b6a1286
Allow access to bluescore and redscore
2019-12-19 16:17:08 -03:00
Jaime Passos
7efd9662d1
Remove GTR_NOGAMEEND
2019-12-19 16:13:27 -03:00
Jaime Passos
f4bb618f93
Organise rules
2019-12-19 16:12:10 -03:00
Jaime Passos
6d7262e985
Remove GTR_PLATFORM
2019-12-19 16:05:03 -03:00
Jaime Passos
768080977f
Remove GTR_ROUNDENDMESSAGE
2019-12-19 15:47:37 -03:00
Alam Ed Arias
1771c7c8ce
Revert "Travis yflip error"
...
This reverts commit 2a9a2c0f02
.
2019-12-19 10:25:54 -05:00
Alam Ed Arias
a66fd274a1
Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer
2019-12-19 10:24:04 -05:00
Jaime Passos
ce0e4201b8
GTR_DEATHMATCHSTARTS
2019-12-19 02:26:17 -03:00
Jaime Passos
ebdd9c6257
fix warnings
2019-12-19 02:20:49 -03:00
Jaime Passos
019e52a4f4
allow CTF spawns in GTR_TEAMS gametype rule
2019-12-19 02:17:03 -03:00
Jaime Passos
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
Jaime Passos
fb6f2fc9b0
Lua! Lua! Lua!
...
Expecting the buildbot to complain
2019-12-19 02:13:09 -03:00
lachwright
d401ba558d
Fix pflags not being properly reset when entering dust devil from top
2019-12-19 12:03:36 +08:00
Jaime Passos
00440224d2
De-fuck team change
2019-12-19 00:31:13 -03:00
Jaime Passos
e4b4b60cb6
Remove this debugging command, as I don't need it anymore.
2019-12-19 00:15:19 -03:00
Jaime Passos
5da55e8b76
Shadowed variable declarations whoopsie!!! uwu
2019-12-18 23:53:26 -03:00
Jaime Passos
6f857df5e5
ViewpointSwitch hack so nobody does anything evil
...
Prints the generic "can't do this in a HUD hook" message. Whatever. I'm tired.
2019-12-18 23:47:17 -03:00
Jaime Passos
be5fd1a0db
TeamSwitch hook for Lua
2019-12-18 23:40:58 -03:00
Steel Titanium
96cf03b716
Don't uncurl from spin if Elemental Stomp is used
2019-12-18 21:28:34 -05:00
Jaime Passos
b496cc0d62
Whoops
2019-12-18 23:02:07 -03:00
Jaime Passos
ef7e53488d
GTR_CAMPAIGN and GTR_NOGAMEEND
2019-12-18 22:50:49 -03:00
Jaime Passos
5daedc70e7
Special Stages/token stuff
2019-12-18 22:46:17 -03:00
Jaime Passos
9228f99260
Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit
2019-12-18 22:23:30 -03:00
Jaime Passos
5e818e1dab
Custom gametype rankings
2019-12-18 22:02:37 -03:00
James R
843d9b9f0a
-clientport (it's back!) and -serverport, which is an alias to -port
...
If you ever need to, you can change the client port number.
2019-12-18 15:47:47 -08:00
Jaime Passos
0421c81e04
ViewpointSwitch hook for Lua
2019-12-18 20:43:54 -03:00
James R
4e32101289
Use a pointer for port_name
...
Using strcpy is stupid because we don't know how long the argument would be.
There's no need for a buffer anyway.
2019-12-18 15:43:29 -08:00
James R
f584b61c93
Use a random port when connecting
2019-12-18 15:34:55 -08:00
Jaime Passos
d0e18444fb
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 20:12:52 -03:00
Jaime Passos
04ee98a1a1
point limit/time limit
2019-12-18 19:43:12 -03:00
Jaime Passos
396106829a
Ringslinger tweaks
2019-12-18 19:26:45 -03:00
Jaime Passos
eadb3dec9e
Limits checking
2019-12-18 18:59:47 -03:00
Jaime Passos
74d69f3731
Fix comment
2019-12-18 18:52:10 -03:00
Jaime Passos
b8d47dbc60
Accept gametype rules in SOC by just their names as parameters.
2019-12-18 18:50:04 -03:00
Jaime Passos
ec8682b2af
GTR_NOTITLECARD
2019-12-18 18:39:59 -03:00
Jaime Passos
61cad09505
Fix lib_getenum. Also, adding gametypes also creates constant names for them.
2019-12-18 18:30:24 -03:00
Jaime Passos
cb0e14035b
Intermission HUD hook for Lua
2019-12-18 18:09:56 -03:00
Jaime Passos
5f73d48614
Some sort of intermission tally support.
2019-12-18 17:13:05 -03:00
Jaime Passos
e3584e8230
GTR_ALLOWEXIT
2019-12-18 16:52:05 -03:00
Jaime Passos
5b0a094f67
TOL stuff
2019-12-18 16:00:02 -03:00
Jaime Passos
94f2b8f970
Fix warnings
2019-12-18 15:41:03 -03:00
Jaime Passos
7c3cde4564
How did I mess this up?
2019-12-18 15:23:41 -03:00
Jaime Passos
7768e2c7f9
More spectator tweaks
2019-12-18 15:14:24 -03:00
Jaime Passos
d3d91726f5
GTR_EMERALDHUNT and GTR_SPAWNENEMIES
2019-12-18 14:57:42 -03:00
Jaime Passos
0577cec01b
GTR_NOSPECTATORSPAWN
2019-12-18 14:47:39 -03:00
Jaime Passos
1e2331d672
SOC stuff
2019-12-18 14:37:48 -03:00
Jaime Passos
79d5192b7c
TOL/Level platter stuff
2019-12-18 13:24:10 -03:00
Jaime Passos
b759ebf622
Death of TOL_CUSTOM
2019-12-18 12:40:46 -03:00
Jaime Passos
45580ce557
Make NUMGAMETYPEFREESLOTS lower because netcode
2019-12-18 12:36:54 -03:00
Jaime Passos
aa619e1b34
Rankings tweaks
2019-12-18 12:36:02 -03:00