MascaraSnake
|
af85de53d7
|
Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them.
|
2019-12-28 14:13:26 +01:00 |
|
MascaraSnake
|
d085296cbe
|
Remove some old #if 0'd code
|
2019-12-28 14:03:48 +01:00 |
|
MascaraSnake
|
9e72dcddb6
|
Merge branch 'next' into mapload-refactor
|
2019-12-28 13:59:24 +01:00 |
|
MascaraSnake
|
e3955ed4f3
|
Fix accidental removal of sector_t's spawn_lightlevel initialization
|
2019-12-28 13:58:23 +01:00 |
|
MascaraSnake
|
d00a9a42a1
|
Cleaned up some more stuff in P_LoadLevel()
|
2019-12-28 12:48:32 +01:00 |
|
MascaraSnake
|
9b81821d44
|
Move more P_LoadLevel parts into subfunctions
|
2019-12-28 11:37:56 +01:00 |
|
MascaraSnake
|
f67ff6d97e
|
Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions
|
2019-12-28 11:30:39 +01:00 |
|
MascaraSnake
|
12fbaf85f8
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:43:27 +01:00 |
|
MascaraSnake
|
d182000223
|
Fixed/clarified some flag descriptions in the ZB config
|
2019-12-28 08:42:16 +01:00 |
|
GoldenTails
|
655de1aca8
|
Fixed messed up comparison.
|
2019-12-27 23:51:13 -06:00 |
|
James R
|
821e1cf618
|
Only return if we damaged the monitor
|
2019-12-27 14:48:55 -08:00 |
|
Alam Ed Arias
|
2c03fcaac5
|
Merge branch 'master' into next
|
2019-12-27 17:08:16 -05:00 |
|
James R
|
720ab51340
|
Merge branch 'rotsprite3' into 'next'
More rollangle changes
See merge request STJr/SRB2!582
|
2019-12-27 16:49:21 -05:00 |
|
James R
|
8d70a18fc7
|
Merge branch 'skinusable-fix' into 'next'
Fix edge case with R_SkinUsable
See merge request STJr/SRB2!573
|
2019-12-27 16:49:06 -05:00 |
|
Jaime Passos
|
7d4c00affb
|
GTR_HIDETIME, not GTR_TAG
|
2019-12-27 18:24:08 -03:00 |
|
Jaime Passos
|
9ede8f7c2e
|
In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings.
|
2019-12-27 17:22:55 -03:00 |
|
Jaime Passos
|
142875cf3d
|
Fix CoopLives_OnChange.
|
2019-12-27 17:15:23 -03:00 |
|
Jaime Passos
|
62d79eef2a
|
Same deal, but for starposts.
|
2019-12-27 17:14:56 -03:00 |
|
Jaime Passos
|
ff80c4ef4d
|
Preparing for the inevitable gametype rule that will handle cooplives...
|
2019-12-27 17:08:20 -03:00 |
|
Jaime Passos
|
58c1adf3ef
|
ST_drawLivesArea stuff.
|
2019-12-27 16:58:55 -03:00 |
|
Monster Iestyn
|
6092c5774e
|
use P_SetTarget to assign a value to th->target
|
2019-12-27 19:24:00 +00:00 |
|
Monster Iestyn
|
ad56f5e362
|
added a "target" pointer to polywaypoint_t, so the polyobj waypoint thinker doesn't have to re-find the next waypoint every tic
|
2019-12-27 19:10:14 +00:00 |
|
Alam Ed Arias
|
1f143ca9d6
|
use size_t to count the sprites
|
2019-12-27 13:20:58 -05:00 |
|
Alam Ed Arias
|
848a144956
|
fread and fwrite use size_t, not int
|
2019-12-27 13:08:26 -05:00 |
|
Alam Ed Arias
|
7201e165a4
|
we only need link on unix systems
|
2019-12-27 13:05:15 -05:00 |
|
Jaime Passos
|
3ce02b8135
|
burst emeralds with GTR_MATCHEMERALDS
|
2019-12-27 12:34:35 -03:00 |
|
Jaime Passos
|
8a3b47e1a9
|
look for GTR_LIVES rule instead of coop/competition gametype
|
2019-12-27 12:29:21 -03:00 |
|
Jaime Passos
|
203f4c50a0
|
add G_CompetitionGametype(void)
|
2019-12-27 12:28:00 -03:00 |
|
Jaime Passos
|
964125c8cf
|
change this > to >=
|
2019-12-27 12:23:50 -03:00 |
|
Jaime Passos
|
5e328d6d33
|
check if the gametype allows spectators to allow jump key respawn
|
2019-12-27 12:17:38 -03:00 |
|
Jaime Passos
|
ca3941f5b8
|
use GTR_DEATHMATCHSTARTS
|
2019-12-27 12:14:33 -03:00 |
|
MascaraSnake
|
e673833780
|
Merge branch 'why-inline' into 'master'
I got a compiler warning from P_PlayerHitsPlayer being too big
See merge request STJr/SRB2!581
|
2019-12-27 02:12:01 -05:00 |
|
MascaraSnake
|
82d21224cf
|
Merge branch 'next' into kill-zshift
# Conflicts:
# src/p_mobj.c
|
2019-12-27 08:11:04 +01:00 |
|
MascaraSnake
|
472749de84
|
Merge branch 'zb-config-refactor' into 'next'
Zone Builder configuration refactor
See merge request STJr/SRB2!570
|
2019-12-27 02:04:22 -05:00 |
|
Jaime Passos
|
adb34258f1
|
P_SetupCamera funny
|
2019-12-27 02:07:13 -03:00 |
|
Jaime Passos
|
be32397562
|
Respawn delay gametype rule
|
2019-12-27 01:44:27 -03:00 |
|
Jaime Passos
|
518714a51a
|
Fix sprite rotation crashes.
|
2019-12-27 00:37:40 -03:00 |
|
James R
|
5b715fa11a
|
Pop monitors properly so Metal doesn't destroy enemy team's monitors
|
2019-12-26 19:27:25 -08:00 |
|
Jaime Passos
|
b8e91a50a5
|
OpenGL funny
|
2019-12-27 00:02:30 -03:00 |
|
Jaime Passos
|
252ac7516a
|
Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch
|
2019-12-26 23:53:03 -03:00 |
|
Jaime Passos
|
543f80510b
|
And the sound test
|
2019-12-26 23:52:42 -03:00 |
|
Jaime Passos
|
ed11e89fdc
|
Same deal, but for the level platter and save select screen
|
2019-12-26 23:49:31 -03:00 |
|
James R
|
02104402ed
|
Save the renderer
|
2019-12-26 18:44:02 -08:00 |
|
James R
|
8311380146
|
Merge branch 'time' into 'master'
haha log files
See merge request STJr/SRB2!567
|
2019-12-26 21:43:46 -05:00 |
|
Jaime Passos
|
6de7b7eb99
|
Handle character select screen correctly after a renderer switch
|
2019-12-26 23:39:40 -03:00 |
|
James R
|
c92378fab7
|
Lua CV_FindVar function
(cherry picked from commit b5746c231d17cd7b58c6b633e242d5ad26ad7017)
|
2019-12-26 18:30:34 -08:00 |
|
James R
|
c8e08ec617
|
Expose CV_FindVar
(cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)
|
2019-12-26 18:30:34 -08:00 |
|
Jaime Passos
|
a5ef201e3f
|
PU_PATCH funny
|
2019-12-26 23:26:43 -03:00 |
|
James R
|
d57083264e
|
One more optimization
|
2019-12-26 18:23:01 -08:00 |
|
James R
|
bbed1a16ba
|
e
|
2019-12-26 18:20:48 -08:00 |
|