lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8635 commits 1 branch 29 tags 122 MiB
Commit graph

7497 commits

Author SHA1 Message Date
MascaraSnake 6a69aa4ffa Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function 2019-12-23 16:53:45 +01:00
Nev3r 9a9f72f598 Don't reload mapthings in P_LoadThingsOnly() as they should no longer be modified past the mapload procedure. 2019-12-23 16:37:44 +01:00
Nev3r d6a86c37b2 P_PrepareRawThings() is now where it was supposed to be at; moved save and flat & texture caching related functions to the end of P_LoadMapData(). 2019-12-23 16:36:26 +01:00
Jaime Passos 6779c508e7 Satisfy rollangle table with a 3deg angle 2019-12-23 12:19:05 -03: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
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
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 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
Jaime Passos 6d7bdf8fdb Lua gametyperules 2019-12-19 18:27:11 -03: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 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
lachwright d401ba558d Fix pflags not being properly reset when entering dust devil from top 2019-12-19 12:03:36 +08:00
Jaime Passos 00440224d2 De-fuck team change 2019-12-19 00:31:13 -03:00
Jaime Passos e4b4b60cb6 Remove this debugging command, as I don't need it anymore. 2019-12-19 00:15:19 -03:00
Jaime Passos 5da55e8b76 Shadowed variable declarations whoopsie!!! uwu 2019-12-18 23:53:26 -03:00
Jaime Passos 6f857df5e5 ViewpointSwitch hack so nobody does anything evil 
Prints the generic "can't do this in a HUD hook" message. Whatever. I'm tired.
 2019-12-18 23:47:17 -03:00
Jaime Passos be5fd1a0db TeamSwitch hook for Lua 2019-12-18 23:40:58 -03:00
Steel Titanium 96cf03b716 Don't uncurl from spin if Elemental Stomp is used 2019-12-18 21:28:34 -05:00
Jaime Passos b496cc0d62 Whoops 2019-12-18 23:02:07 -03:00
Jaime Passos ef7e53488d GTR_CAMPAIGN and GTR_NOGAMEEND 2019-12-18 22:50:49 -03:00
Jaime Passos 5daedc70e7 Special Stages/token stuff 2019-12-18 22:46:17 -03:00
Jaime Passos 9228f99260 Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit 2019-12-18 22:23:30 -03:00
Jaime Passos 5e818e1dab Custom gametype rankings 2019-12-18 22:02:37 -03: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
Jaime Passos 0421c81e04 ViewpointSwitch hook for Lua 2019-12-18 20:43:54 -03: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
Jaime Passos d0e18444fb GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes 2019-12-18 20:12:52 -03:00
Jaime Passos 04ee98a1a1 point limit/time limit 2019-12-18 19:43:12 -03:00
Jaime Passos 396106829a Ringslinger tweaks 2019-12-18 19:26:45 -03:00
Jaime Passos eadb3dec9e Limits checking 2019-12-18 18:59:47 -03:00
Jaime Passos 74d69f3731 Fix comment 2019-12-18 18:52:10 -03:00
Jaime Passos b8d47dbc60 Accept gametype rules in SOC by just their names as parameters. 2019-12-18 18:50:04 -03:00
Jaime Passos ec8682b2af GTR_NOTITLECARD 2019-12-18 18:39:59 -03:00
Jaime Passos 61cad09505 Fix lib_getenum. Also, adding gametypes also creates constant names for them. 2019-12-18 18:30:24 -03:00
Jaime Passos cb0e14035b Intermission HUD hook for Lua 2019-12-18 18:09:56 -03:00
Jaime Passos 5f73d48614 Some sort of intermission tally support. 2019-12-18 17:13:05 -03:00
Jaime Passos e3584e8230 GTR_ALLOWEXIT 2019-12-18 16:52:05 -03:00
Jaime Passos 5b0a094f67 TOL stuff 2019-12-18 16:00:02 -03:00
Jaime Passos 94f2b8f970 Fix warnings 2019-12-18 15:41:03 -03:00
Jaime Passos 7c3cde4564 How did I mess this up? 2019-12-18 15:23:41 -03:00
Jaime Passos 7768e2c7f9 More spectator tweaks 2019-12-18 15:14:24 -03:00
Jaime Passos d3d91726f5 GTR_EMERALDHUNT and GTR_SPAWNENEMIES 2019-12-18 14:57:42 -03:00
Jaime Passos 0577cec01b GTR_NOSPECTATORSPAWN 2019-12-18 14:47:39 -03:00
Jaime Passos 1e2331d672 SOC stuff 2019-12-18 14:37:48 -03:00
Jaime Passos 79d5192b7c TOL/Level platter stuff 2019-12-18 13:24:10 -03:00
Jaime Passos b759ebf622 Death of TOL_CUSTOM 2019-12-18 12:40:46 -03:00
Jaime Passos 45580ce557 Make NUMGAMETYPEFREESLOTS lower because netcode 2019-12-18 12:36:54 -03:00
Jaime Passos aa619e1b34 Rankings tweaks 2019-12-18 12:36:02 -03:00
Jaime Passos 7807424633 NUMGAMETYPES vs gametypecount 2019-12-18 12:30:01 -03:00
Jaime Passos 86ac94817a Spectator HUD tweaks 2019-12-18 12:28:01 -03:00
Jaime Passos 15862ed02c G_NewGametype 2019-12-18 12:23:42 -03:00
Jaime Passos 6660d63028 There are only so many bits 2019-12-18 12:14:18 -03:00
Jaime Passos da4e759a73 GTR_DEATHPENALTY 2019-12-18 12:13:24 -03:00
Jaime Passos 83732f38a9 GTR_PITYSHIELD 2019-12-18 12:09:44 -03:00
Jaime Passos 1b81232d32 sike 2019-12-18 11:47:26 -03:00
Jaime Passos 299f2bd8cd GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos 185fa2799d Update comments 2019-12-18 11:33:56 -03:00
Jaime Passos ea5e0d28ed More gametype rules yay!! 2019-12-18 01:54:45 -03:00
James R 23951cf938 bleh 2019-12-17 20:54:44 -08:00
Jaime Passos 7bfdc2caa0 Gametype rules draft, mind the debug command 2019-12-18 01:25:57 -03:00
Jaime Passos 317191ec7c Freeslot moment! 2019-12-18 00:52:50 -03:00
Jaime Passos 254d812901 More customisable title card 
Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC.
Add the same fields to Lua under their internal names.
Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)
 2019-12-18 00:28:58 -03: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 d1b944121a Fix "SRB2" SOC directive, though its usefulness is debatable 2019-12-17 14:11:45 -08: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 c3f0e6aa44 Avoid recreating the color LUT mid-recording-frame 2019-12-17 15:37:43 -03:00
Jaime Passos 0af71fafc5 Don't use the local palette, because OpenGL mixes it into the textures themselves 2019-12-17 15:20:22 -03:00
Jaime Passos 3d08664de4 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-17 15:14:22 -03:00
Jaime Passos 141d0376a5 Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-17 15:05:16 -03:00
Jaime Passos e3ab21c85f opengl 2019-12-17 13:48:48 -03:00
Jaime Passos aff5b52eba change ROTANGLES to 72 2019-12-17 13:39:26 -03:00
Jaime Passos 8422c88063 optimise R_CacheRotSprite 2019-12-17 13:25:55 -03:00
Jaime Passos c6f36fc470 un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Jaime Passos 6a5ea548e6 make ROTANGLES be 360 2019-12-17 13:00:50 -03:00
Jaime Passos 7e55dd31f5 fix menu spacing 2019-12-17 12:53:26 -03:00
Jaime Passos 369563ad92 allow models to change colors more than once. 2019-12-17 12:50:41 -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
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
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
MascaraSnake bcfd9fe504 Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they? 2019-12-15 00:22:17 +01:00
Jaime Passos 4d87bcca13 Move position of R_PlaneRipple in the file so this looks more organised 2019-12-14 19:50:40 -03:00
Jaime Passos 871ebef332 Merge remote-tracking branch 'origin/master' into ripple2 2019-12-14 19:36:54 -03:00
James R 14674223e8 Merge branch 'opengl-is-a-bad-renderer' into 'master' 
OpenGL fixes

See merge request STJr/SRB2!519
 2019-12-14 16:48:50 -05:00
James R b121bc2b3b Merge branch 'fix-shield-hover' into 'next' 
Stop characters from being able to activate their abilities when doing a shield ability!

See merge request STJr/SRB2!522
 2019-12-14 16:48:12 -05:00
James R 64eb89fc56 Merge branch 'portalcullsector' into 'master' 
Restore portal culling code that went gone by pure accident

See merge request STJr/SRB2!523
 2019-12-14 16:47:51 -05:00
James R e5714db75c Merge branch 'software-drawers-refactor' into 'master' 
Optimize Software drawers

See merge request STJr/SRB2!533
 2019-12-14 16:47:27 -05:00
James R 65a17a8f09 Merge branch 'customexitvars-rework' into 'next' 
Rework G_SetCustomExitVars to allow skipstats 2

See merge request STJr/SRB2!534
 2019-12-14 16:47:18 -05:00
Steel Titanium b3d678a252 Merge branch 'master' into next 2019-12-14 16:44:56 -05:00
James R c1d54007e4 Fix C90 error from NOHW 2019-12-14 13:30:10 -08:00
James R 2a22adaa60 Oops C90 2019-12-14 12:55:11 -08:00
James R 8a23ff0bc8 Handle log file in parent properly 2019-12-13 16:51:49 -08:00
James R 553ad46c74 Add this back for Windoodoo because I'm an idiot 2019-12-13 15:04:31 -08:00
Jaime Passos 4c13190b48 Merge remote-tracking branch 'origin/master' into software-drawers-refactor 2019-12-13 19:22:47 -03:00