Jaime Passos
|
89b4a558a8
|
Merge remote-tracking branch 'origin/next' into gametype-clownery
|
2019-12-23 23:08:16 -03:00 |
|
Jaime Passos
|
a657392d39
|
ViewpointSwitch improvements.
|
2019-12-23 20:22:57 -03: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 |
|
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
|
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
|
d7d9113208
|
Merge branch 'hoops_and_rings_refactor' into 'next'
Refactor P_SpawnHoopsAndRings
See merge request STJr/SRB2!562
|
2019-12-23 13:57:01 -05: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
|
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 |
|
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
|
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 |
|