lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,408 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

8408 Commits

Author SHA1 Message Date
Sally Cochenour 7851bef929 Port of Jimita's shader stuff + my lighting shader 
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
 2019-12-25 14:22:01 -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
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
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
lachwright d401ba558d Fix pflags not being properly reset when entering dust devil from top 2019-12-19 12:03:36 +08:00
Steel Titanium 96cf03b716 Don't uncurl from spin if Elemental Stomp is used 2019-12-18 21:28:34 -05:00
James R 843d9b9f0a -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
James R 4e32101289 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 f584b61c93 Use a random port when connecting 2019-12-18 15:34:55 -08:00
James R 4029167a57 Merge branch 'fix-divby0-spindash-crash' into 'next' 
Fix a divide by zero crash when mindash and maxdash were the same.

See merge request STJr/SRB2!539
 2019-12-17 20:42:56 -05:00
James R e009d62dc3 Merge branch 'hud-toggling' into 'next' 
Let Lua toggle Team Match/CTF team scores HUD element

See merge request STJr/SRB2!544
 2019-12-17 16:17:01 -05:00
James R 184d04e6d5 Merge branch 'rvz1-crashfix' into 'next' 
Fix crash on mapload when removing Dragonbomber with Lua

See merge request STJr/SRB2!545
 2019-12-17 16:16:51 -05:00
Jaime Passos 141d0376a5 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
James R 4da57653eb Merge branch 'spawn_z_refactor' into 'next' 
(UDMF prereq.) Spawn Z refactor

See merge request STJr/SRB2!536
 2019-12-16 23:21:07 -05:00
James R 4f33476fc0 Merge branch 'fix-sector-lines' into 'next' 
Fix sector.lines in Lua

See merge request STJr/SRB2!542
 2019-12-16 23:05:52 -05:00
Steel Titanium 0e371774c8 Fix crash on mapload when removing Dragonbomber with Lua 2019-12-16 21:25:41 -05:00
James R c0b9671c5b Merge branch 'lua-maincfg-vars' into 'next' 
Lua MainCfg vars

See merge request STJr/SRB2!543
 2019-12-16 17:54:01 -05:00
Tatsuru 0ab31b3de0 Let Lua toggle Match/CTF team scores HUD element 2019-12-16 17:58:00 -03:00
Monster Iestyn 46f431616c Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean 2019-12-16 20:26:19 +00:00
Monster Iestyn f028bb0219 Fix `numoflines` calculations in sectorlines_* functions by first typecasting seclines (the sector.lines address) to size_t before doing any math on it, then (after the math) typecast the result to size_t * and dereference it. 
And yes, this time I tested it to make sure it works :)
 2019-12-16 17:46:27 +00:00
Monster Iestyn 130794cc4d Merge branch 'master' into next 2019-12-16 15:41:47 +00:00
MascaraSnake 79350992df Some more cleanup of map loading code 2019-12-16 00:17:20 +01:00
MascaraSnake bb3440d021 Minor cleanup of virtual resources code 2019-12-16 00:04:48 +01:00
James R 53c7df4818 Merge branch 'map-command-no-mapheaderinfo' into 'master' 
Let the map command warp to maps without a level header

See merge request STJr/SRB2!528
 2019-12-15 16:59:03 -05:00
James R adc87640d9 Merge branch 'cmake-fixes' into 'master' 
Various cmake adjustments

See merge request STJr/SRB2!538
 2019-12-15 16:58:45 -05:00
James R 00e2c420f6 Merge branch 'dont-be-mean-to-tails-plz' into 'master' 
Don't be mean to Tails plz (Pandora's Box Super cheat fix)

See merge request STJr/SRB2!540
 2019-12-15 16:58:24 -05:00
MascaraSnake 230006553d Set mapthing z in OP_CreateNewMapThing 2019-12-15 21:43:50 +01:00
Sryder a093c76cfb Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone 2019-12-15 15:47:45 +00:00
Monster Iestyn eb179e4d6a Remove anti-Tails restriction for the Allow super Pandora's Box cheat. 
Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!
 2019-12-15 15:40:56 +00:00
Sryder 76d59330f7 Port the deadzone cvar stuff from kart. 
Add menu items for deadzone.
 2019-12-15 15:36:13 +00:00
Sryder b17bf5d836 Use Scaled Radial Deadzones, instead of Axial deadzones. 
Additionally fixes some weird padscale 0 stuff that was flipped.
This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
 2019-12-15 14:37:30 +00:00
GoldenTails 23b3f5a649 Fix a divide by zero crash when mindash and maxdash were the same. 
Props to rumia1 for finding this and Lach for figuring out this was a divide by zero error.
 2019-12-15 04:09:56 -06:00
MascaraSnake 8a6e244e60 SpawnEmeraldHunt() -> P_SpawnEmeraldHunt() 2019-12-15 09:49:54 +01:00
Eidolon d63ad82dc5 [cmake] Remove srb2dd target 2019-12-15 00:47:58 -06:00
Eidolon 11f5911943 [cmake] Use same executable names as Makefile 2019-12-15 00:39:04 -06:00
James R 1123b5debd Merge remote-tracking branch 'origin/master' into next 2019-12-14 15:28:25 -08:00