MascaraSnake
|
f91e9bdee5
|
Merge branch 'next' into virtres
# Conflicts:
# src/p_setup.c
|
2019-12-22 23:02:47 +01:00 |
|
MascaraSnake
|
9d33c02367
|
Merge branch 'next' into hoop_refactor
# Conflicts:
# src/p_mobj.c
|
2019-12-22 18:12:58 +01:00 |
|
MascaraSnake
|
0fd9596e3c
|
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
|
5281c44042
|
Fix super theme ending early if invincibility expired
|
2019-12-20 23:45:32 -05:00 |
|
Steel Titanium
|
7b0cffe9f9
|
Merge branch 'next' into char-damage-fix
|
2019-12-20 23:24:29 -05:00 |
|
Steel Titanium
|
14673656c3
|
Fix Amy and Fang being able to attack other players in MP Special Stages
|
2019-12-20 23:22:45 -05:00 |
|
James R
|
1d0b7aca9d
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-20 14:40:10 -08:00 |
|
James R
|
74bd973616
|
Merge branch 'better-deadzone' into 'master'
Better Deadzones
See merge request STJr/SRB2!541
|
2019-12-20 17:33:29 -05:00 |
|
James R
|
30322b338a
|
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
|
982c6362db
|
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
|
644d0d86ad
|
Lua gametyperules
|
2019-12-19 18:27:11 -03:00 |
|
Jaime Passos
|
d80a6e11e7
|
Load SPR_ lumps as SpriteInfo
|
2019-12-19 17:25:19 -03:00 |
|
Jaime Passos
|
ac616a3157
|
Merge remote-tracking branch 'origin/master' into rotsprite2
|
2019-12-19 17:20:21 -03:00 |
|
Jaime Passos
|
c40cf626bf
|
Remove W_UnlockCachedPatch calls to avoid crashing
|
2019-12-19 17:14:56 -03:00 |
|
James R
|
0b87dd3554
|
Fix switching to software
Would show a black screen for me on Linux. My suspsicion is that
some things are not initialized with just VID_CheckRenderer.
|
2019-12-19 17:13:23 -03:00 |
|
Jaime Passos
|
98f903b311
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-19 17:09:47 -03:00 |
|
Jaime Passos
|
2eec0b6a9b
|
Don't spawn End Level Signs without the GTR_ALLOWEXIT rule
|
2019-12-19 17:06:07 -03:00 |
|
Jaime Passos
|
f3a91afe90
|
Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects
|
2019-12-19 16:31:38 -03:00 |
|
Jaime Passos
|
b8671edef4
|
Removing commented out code
|
2019-12-19 16:22:55 -03:00 |
|
Steel Titanium
|
f94cfb5929
|
Allow access to bluescore and redscore
|
2019-12-19 16:17:08 -03:00 |
|
Jaime Passos
|
a4ce7e908d
|
Remove GTR_NOGAMEEND
|
2019-12-19 16:13:27 -03:00 |
|
Jaime Passos
|
063d4d0d86
|
Organise rules
|
2019-12-19 16:12:10 -03:00 |
|
Jaime Passos
|
18235cd672
|
Remove GTR_PLATFORM
|
2019-12-19 16:05:03 -03:00 |
|
Jaime Passos
|
9b1d5db5f8
|
Remove GTR_ROUNDENDMESSAGE
|
2019-12-19 15:47:37 -03:00 |
|
Alam Ed Arias
|
cdc0b9c846
|
Revert "Travis yflip error"
This reverts commit 3bf83ff717.
|
2019-12-19 10:25:54 -05:00 |
|
Alam Ed Arias
|
37a264c30e
|
Merge remote-tracking branch 'origin/master' into srb2-release-220-deployer
|
2019-12-19 10:24:04 -05:00 |
|
Jaime Passos
|
108129b222
|
GTR_DEATHMATCHSTARTS
|
2019-12-19 02:26:17 -03:00 |
|
Jaime Passos
|
6c2b62a795
|
fix warnings
|
2019-12-19 02:20:49 -03:00 |
|
Jaime Passos
|
8bd0fc842f
|
allow CTF spawns in GTR_TEAMS gametype rule
|
2019-12-19 02:17:03 -03:00 |
|
Jaime Passos
|
ad317cd8a2
|
Merge remote-tracking branch 'origin/next' into gametype-clownery
|
2019-12-19 02:15:45 -03:00 |
|
Jaime Passos
|
920d99976c
|
Lua! Lua! Lua!
Expecting the buildbot to complain
|
2019-12-19 02:13:09 -03:00 |
|
lachwright
|
4be3a0706c
|
Fix pflags not being properly reset when entering dust devil from top
|
2019-12-19 12:03:36 +08:00 |
|
Jaime Passos
|
29b819015a
|
De-fuck team change
|
2019-12-19 00:31:13 -03:00 |
|
Jaime Passos
|
861fa5bb23
|
Remove this debugging command, as I don't need it anymore.
|
2019-12-19 00:15:19 -03:00 |
|
Jaime Passos
|
b65c6e3745
|
Shadowed variable declarations whoopsie!!! uwu
|
2019-12-18 23:53:26 -03:00 |
|
Jaime Passos
|
ac74a2a020
|
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
|
e47f171533
|
TeamSwitch hook for Lua
|
2019-12-18 23:40:58 -03:00 |
|
Steel Titanium
|
a0993baa0b
|
Don't uncurl from spin if Elemental Stomp is used
|
2019-12-18 21:28:34 -05:00 |
|
Jaime Passos
|
782643564f
|
Whoops
|
2019-12-18 23:02:07 -03:00 |
|
Jaime Passos
|
f9bbcfc0f3
|
GTR_CAMPAIGN and GTR_NOGAMEEND
|
2019-12-18 22:50:49 -03:00 |
|
Jaime Passos
|
25481512e7
|
Special Stages/token stuff
|
2019-12-18 22:46:17 -03:00 |
|
Jaime Passos
|
24f546d992
|
Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit
|
2019-12-18 22:23:30 -03:00 |
|
Jaime Passos
|
156d5fd37f
|
Custom gametype rankings
|
2019-12-18 22:02:37 -03:00 |
|
James R
|
17749b9e3e
|
-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
|
0e3bf527a2
|
ViewpointSwitch hook for Lua
|
2019-12-18 20:43:54 -03:00 |
|
James R
|
5921e1a567
|
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
|
8368449e6c
|
Use a random port when connecting
|
2019-12-18 15:34:55 -08:00 |
|
Jaime Passos
|
35f783ab24
|
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
|
2019-12-18 20:12:52 -03:00 |
|
Jaime Passos
|
97db6162e8
|
point limit/time limit
|
2019-12-18 19:43:12 -03:00 |
|
Jaime Passos
|
dcc8cdc143
|
Ringslinger tweaks
|
2019-12-18 19:26:45 -03:00 |
|