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
|
070d008f54
|
Merge branch 'virtres' into 'next'
(UDMF prereq.) Map data lump interface
See merge request STJr/SRB2!535
|
2019-12-22 17:22:49 -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 |
|
|
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
|
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 |
|