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
|
f574cd0ce2
|
Whoops I forgot player 2
|
2019-12-22 21:29:41 -08:00 |
|
Steel Titanium
|
356b25def4
|
Spawn Amy's shields for other players
|
2019-12-23 00:28:06 -05:00 |
|
James R
|
3e2b28e162
|
Merge remote-tracking branch 'origin/master' into turnmultiplier
|
2019-12-22 21:26:36 -08: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 |
|
Zachary McAlpin
|
0f895706f4
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
|
2019-12-22 18:55:58 -06: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 |
|
GoldenTails
|
ed847e831b
|
Fix pasting going out of bounds and dash the possibility of memory leaks while pasting.
|
2019-12-20 20:28:30 -06:00 |
|
James R
|
cbb9c7c13a
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-20 14:40:10 -08:00 |
|
GoldenTails
|
a2faa975cb
|
Allow Clipboard actions.
|
2019-12-20 16:39:19 -06: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 |
|
Zachary McAlpin
|
124a0754a6
|
Revert "Added CalculateCamera Hook"
This reverts commit 9f82cdb401.
|
2019-12-19 17:21:55 -06:00 |
|
Zachary McAlpin
|
f5c2341f59
|
Revert "Fix CalculateCamera compiling error"
This reverts commit c1465c5acc.
|
2019-12-19 17:21:46 -06:00 |
|
Zachary McAlpin
|
652e53c629
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features
|
2019-12-19 17:20:31 -06:00 |
|
Zachary McAlpin
|
c1465c5acc
|
Fix CalculateCamera compiling error
|
2019-12-19 17:17:17 -06:00 |
|
Zachary McAlpin
|
9f82cdb401
|
Added CalculateCamera Hook
|
2019-12-19 16:41:25 -06:00 |
|
Jaime Passos
|
6d7bdf8fdb
|
Lua gametyperules
|
2019-12-19 18:27:11 -03:00 |
|
Zachary McAlpin
|
e82b317451
|
Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition"
This reverts commit 3fc1069082.
|
2019-12-19 15:07:34 -06:00 |
|
Zachary McAlpin
|
c1815bfe11
|
Revert "Don't execute LUAh_PlayerThink(player) for respawning bots"
This reverts commit fc70164f93.
|
2019-12-19 15:07:28 -06:00 |
|
Jaime Passos
|
551828607c
|
Load SPR_ lumps as SpriteInfo
|
2019-12-19 17:25:19 -03:00 |
|
Jaime Passos
|
320b7777b0
|
Merge remote-tracking branch 'origin/master' into rotsprite2
|
2019-12-19 17:20:21 -03:00 |
|
Jaime Passos
|
4e349cbd0f
|
Remove W_UnlockCachedPatch calls to avoid crashing
|
2019-12-19 17:14:56 -03:00 |
|
James R
|
77747c66df
|
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
|
5c8604aeb7
|
Merge remote-tracking branch 'origin/master' into renderswitch
|
2019-12-19 17:09:47 -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 |
|