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 |
|
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 |
|
James R
|
9d28351b5c
|
I'm an idiot
|
2019-12-24 11:14:21 -08:00 |
|
MascaraSnake
|
7ad5931f71
|
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
|
0aa3c9b0a3
|
Fixed missing break in offset handling for horizontal springs
|
2019-12-24 13:01:17 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
Steel Titanium
|
356b25def4
|
Spawn Amy's shields for other players
|
2019-12-23 00:28:06 -05: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
|
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 |
|
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 |
|
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 |
|