Commit graph

7561 commits

Author SHA1 Message Date
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
Jaime Passos
7f092b884b Initialise the variable, obviously 2019-12-13 19:04:36 -03:00
Jaime Passos
a27a225a81 Remove SPANDRAWFUNC_MMX, as it's not needed anymore. 2019-12-13 19:02:36 -03:00
Steel Titanium
ad776e560c Rework G_SetCustomExitVars to allow skipstats 2 2019-12-13 16:36:33 -05:00
Jaime Passos
6720279969 Separate non-powers-of-two draw routines into its own file 2019-12-13 13:11:56 -03:00
Jaime Passos
fa58c1fb26 stuff 2019-12-13 12:26:47 -03:00
James R
c415d80e19 Merge branch 'dashmode-shader' into 'master'
Add TC_DASHMODE color shader

See merge request STJr/SRB2!526
2019-12-13 01:58:18 -05:00
James R
d64a7defed Merge branch 'toomanyflats-fix' into 'master'
Fix Ploadflat closing the game with "Too many flats in level" error message

See merge request STJr/SRB2!529
2019-12-13 01:57:55 -05:00
James R
8bea7f6dbc Rename signal caught message to be more obvious 2019-12-12 22:01:16 -08:00
James R
838850ffc1 Fix signal handler setup error reporting 2019-12-12 21:57:54 -08:00
James R
35053adfb2 Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place 2019-12-12 21:30:35 -08:00
James R
72ee91702c Kill child when wait fails, so I_Error exits both 2019-12-12 21:21:25 -08:00
James R
f34886850f Fix idiot mistake 2019-12-12 21:20:51 -08:00
Jaime Passos
b0ffe7ed70 Update v_video.c 2019-12-12 23:30:09 -03:00
Jaime Passos
4e814cd424 FINALLY, COLORCUBIUM 2019-12-12 23:18:39 -03:00
Jaime Passos
228b29e23b HWR_AllowModel 2019-12-12 22:53:19 -03:00
Jaime Passos
ca83bafae8 Initialise the variable, obviously 2019-12-12 22:32:19 -03:00
Jaime Passos
a138a3ab5f Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer 2019-12-12 22:31:34 -03:00
Jaime Passos
08794559f0 Fix TC_ blending 2019-12-12 22:26:28 -03:00
Jaime Passos
01399c7076 Update hw_main.c 2019-12-12 21:52:59 -03:00
Jaime Passos
ff348fb60a Add missing prototype, ugh 2019-12-12 21:43:19 -03:00
Jaime Passos
af3cf93683 grafik designe is m passion 2019-12-12 21:41:13 -03:00
Jaime Passos
d80bfb4e94 PU_HWRCACHE_UNLOCKED bmomento bróder 2019-12-12 21:23:55 -03:00
Jaime Passos
08d4a36f63 Texture blending port
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
2019-12-12 21:22:36 -03:00
James R
6dcdb8d951 Move everything to i_system.c
This also simplifies things; SDL isn't initialized in the parent process.
2019-12-12 15:08:27 -08:00
Jaime Passos
6c3111d809 Stop crashing with models because someone keeps freeing those tags 2019-12-12 19:54:47 -03:00
James R
55f3f27b55 Fix NOHW warnings 2019-12-12 14:00:13 -08:00
Steel Titanium
eb787c2b59 Move S_InitMusicDefs call outside of the check.
As far as I know, this is competely safe.
2019-12-12 16:32:40 -05:00
Jaime Passos
3bebfb279e Fix gr_anisotropicmode 2019-12-12 18:28:05 -03:00
Jaime Passos
58a08504c8 Make gr_spritebillboarding on by default sorry not sorry Azeon 2019-12-12 17:48:43 -03:00
Jaime Passos
a4b0195430 Model lighting 2019-12-12 17:48:29 -03:00
Jaime Passos
9246526e8a Merge remote-tracking branch 'origin/master' into opengl-is-a-bad-renderer 2019-12-12 17:39:18 -03:00
Jaime Passos
f077d17301 Save filtering mode and anisotropic mode cvars to config 2019-12-12 17:37:55 -03:00
Jaime Passos
db61d1a705 Remove HWR_AddEngineCommands 2019-12-12 17:35:41 -03:00
Jaime Passos
bf520b9e33 Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!! 2019-12-12 17:30:19 -03:00
Steel Titanium
4af0cfae36 Init MUSICDEFs if started game with music off and toggled on 2019-12-12 15:17:50 -05:00
Jaime Passos
b7c7529e75 Don't reset the FOV 2019-12-12 17:06:04 -03:00
Jaime Passos
08e3caf9bb Remove unused cvars 2019-12-12 16:53:31 -03:00
Jaime Passos
792750ee48 Add HWD_SET_MODEL_LIGHTING state 2019-12-12 16:48:37 -03:00
Nev3r
c5d8fe4752 Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection. 2019-12-12 15:04:48 +01:00
Nev3r
c64a9d7ae9 Stop things from becoming Chocapic in THZ3, ACZ2, and special stages.
Temporarily revert function call order for mapthings.
2019-12-12 11:37:48 +01:00
Nev3r
ec9f727e53 Move map data load procedure to separate functions. 2019-12-12 11:16:55 +01:00
Nev3r
43cbad200c Move loading functions around a bit and refactor the stage data allocation code. 2019-12-12 10:35:38 +01:00
James R
7c383e4a1f nix: Fork before game code and wait to catch signals and coredumps
Ditched signal_handler to avoid worrying about async-signal-safe functions.
D_QuitNetGame is not called, so players whose programs are interrupted by a
signal will time out from the server. Because the game runs in a child process,
the window can close before the "Signal Caught" text box appears.

"(core dumped)" is also included in the message if core dumping could be
determined.
2019-12-11 23:46:57 -08:00
James R
0ff421d001 Move I_ShutdownConsole to I_ShutdownSystem 2019-12-11 22:10:22 -08:00
Jaime Passos
c578cee0b1 Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs 2019-12-12 01:39:46 -03:00
Jaime Passos
ea129f701c Fix Ploadflat closing the game with "Too many flats in level" error message 2019-12-11 22:45:47 -03:00
Tatsuru
d40359ee02 Hugging now requires being in the same Z position
Don't try this at home
2019-12-11 19:13:22 -06:00
Jaime Passos
e01eb19044 Sad! 2019-12-11 22:11:00 -03:00
Jaime Passos
0652ffd67f Merge remote-tracking branch 'origin/master' into flats-in-walls 2019-12-11 21:53:47 -03:00
James R
7a59ade63d Merge branch 'garbage' into 'master'
memset SERVERINFO maptitle

See merge request STJr/SRB2Internal!624
2019-12-11 19:19:29 -05:00
James R
6464df9876 Maybe I'm mistaken but this probably isn't needed 2019-12-11 16:14:06 -08:00
lachwright
8a70759e0a Add TC_DASHMODE color shader 2019-12-12 01:27:41 +08:00
Jaime Passos
37679bb44e Organise 2019-12-11 13:26:28 -03:00
Jaime Passos
9340557d2d Update f_wipe.c 2019-12-11 13:09:27 -03:00
Jaime Passos
43946d9826 Merge remote-tracking branch 'origin/master' into wipes2 2019-12-11 12:57:59 -03:00
Nev3r
edfe053cc3 Treat warnings as errors; comment out unused function. 2019-12-11 16:37:41 +01:00
Jaime Passos
be13f463f0 Update r_plane.c 2019-12-11 12:36:54 -03:00
Nev3r
d34fd4b755 Epic oversight in upside-down spawn offset. 2019-12-11 15:48:44 +01:00
Jaime Passos
dedd5527da Restore portal culling code that went gone by pure accident 2019-12-11 11:35:34 -03:00
Nev3r
222336ac0b Oversight, do not free the data yet vres_Free() does it already at the end. 2019-12-11 15:16:56 +01:00
Nev3r
a87a9e6ff6 Remove wrappers and dupes for map lump reading, as they are no longer used. 2019-12-11 14:40:31 +01:00
Nev3r
9952bae5ee P_MakeMapMD5() now uses virtres. 2019-12-11 14:20:08 +01:00
Nev3r
14ad3b938e Use virtres in P_SpawnSpecials(). Whether accessing the lump again here is right or not is also a different question. 2019-12-11 14:04:09 +01:00
Nev3r
4d86dc11a6 'prepare' mapthings using virtres in P_LevelInitStuff(). Whether 'preparing' them or not is actually necessary is another matter. 2019-12-11 13:54:15 +01:00
Nev3r
bf5a2c68d5 P_SetupLevel() no longer makes distinction on whether the map is a WAD in a PK3 or not. 2019-12-11 13:22:07 +01:00
Nev3r
854d50f479 Added 'virtual resource' mechanism for temporary memory loaded lump lists. If you can come up with a better name then I'm all ears. 2019-12-11 11:44:46 +01:00
Nev3r
d2cbdd4fb1 Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now. 2019-12-11 11:10:31 +01:00
Nev3r
584348b91e Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead. 2019-12-11 10:13:52 +01:00
GoldenTails
07316fc5bd Stop characters from being able to activate their abilities when doing a shield ability!
Fixes #61.
2019-12-10 23:55:52 -06:00
Jaime Passos
f51253a0a8 Tilted water 2019-12-10 17:01:19 -03:00
Nev3r
ca6a7ffbb3 Fix NiGHTS bumpers height. 2019-12-10 18:53:49 +01:00
Nev3r
8466dc5813 Move mobj spawn Z calculating to a separate function. 2019-12-10 18:03:15 +01:00
Nev3r
3dfa526eea Separate Emerald Hunt emerald spawning into another function. 2019-12-10 14:21:08 +01:00
James R
4f9e227830 Cvar and menu option to let user increase turn speed
cam_turnmultiplier and cam2_turnmultiplier.

"Camera Speed" has been renamed to "Camera Spacial Speed" in the menu. "Camera
Turning Speed" is now an option.
2019-12-09 16:30:03 -08:00
Nev3r
6fe6db8e18 Removed seemingly redundant (and incorrect) mapthing Z load code.
The proper code seems to sit inside P_SpawnMapThing() and the SpawnHoop functions. Time will tell if I've actually commited an atrocity.
2019-12-09 14:05:22 +01:00
Nev3r
8ea7dd418a Move the axis spawning code out of the mapthing read function, and read the mapthing z in the mapthing read function. 2019-12-09 13:26:31 +01:00
Jaime Passos
4d83db5bb2 Die, Apple! 2019-12-08 22:31:59 -03:00
Jaime Passos
5c02bc59db Speed up level loading
Don't flush every texture just because the palette MAY have changed
2019-12-08 22:28:13 -03:00
Jaime Passos
c6769e7220 Die 2019-12-08 22:12:56 -03:00
Jaime Passos
7f58002e12 Merge branch 'opengl-is-a-bad-renderer' of https://git.magicalgirl.moe/STJr/SRB2 into opengl-is-a-bad-renderer 2019-12-08 21:10:48 -03:00
Jaime Passos
25464c867a Translate the French 2019-12-08 21:10:14 -03:00
Alam Ed Arias
e91a689478 Merge branch 'master' into opengl-is-a-bad-renderer 2019-12-08 12:50:45 -05:00
Alam Ed Arias
d8eccc2921 Merge remote-tracking branch 'public/strcasestr-swap' into buildbot 2019-12-08 12:36:23 -05:00
Alam Ed Arias
1d0cd586ba P_AddWadFile: the PK3 may not have folders 2019-12-08 12:35:21 -05:00
Alam Ed Arias
623629b04a OpenGL: note that the Buffer API is OpenGL 1.5, so we can be used in STATIC_OPENGL 2019-12-08 12:33:11 -05:00
Alam Ed Arias
35168ddeae OpenGL: yflip is used to hold more then true/false 2019-12-08 12:32:23 -05:00
Jaime Passos
d74f2a003b HWR_FreeMipmapCache already calls HWR_FreeMipmapCache indirectly
(done by calling HWR_LoadTextures, which in turn calls HWR_FreeTextureCache)
2019-12-08 04:40:29 -03:00
Jaime Passos
4c808cb7e2 Actually don't even call HWR_FreeMipmapCache between levels because I feel like it's futile outside of PWAD loading 2019-12-08 04:32:25 -03:00
Jaime Passos
d8a804febc LMFAOOOOOOOOOOOOOOOOOOOOOOOO 2019-12-08 04:15:25 -03:00
Jaime Passos
cc12496e9c Optimize mipmaps 2019-12-08 03:23:37 -03:00
Jaime Passos
ce61b17117 Update hw_main.c 2019-12-08 02:27:51 -03:00
Jaime Passos
964978a337 Delete md2_transform 2019-12-08 02:25:53 -03:00
Jaime Passos
bc60a0a887 Make some things clearer here. 2019-12-08 01:54:03 -03:00
Jaime Passos
40b862967d Just in case? 2019-12-07 23:55:28 -03:00
Jaime Passos
e9e0683d5e Cleanup FreeMipmapColormap 2019-12-07 23:46:05 -03:00
James R
d5816d44f3 Use a third variable of XOR nonsense 2019-12-07 17:36:45 -08:00
James R
cadaecbfcf memset this or the stupid masterserver (used to) show garbage bytes
Also for security I guess...
2019-12-07 15:47:18 -08:00
mazmazz
2a9a2c0f02 Travis yflip error 2019-12-07 14:30:51 -05:00
mazmazz
0d41a55071 Deployer fixes for 2.2.0 2019-12-07 13:56:05 -05:00
Jaime Passos
69c08f93bb Update d_main.c 2019-12-07 11:55:53 -03:00
MascaraSnake
79b04c5872 One more asset hash change 2019-12-07 14:17:26 +01:00
toaster
0bd1399c52 Revert paperprojection, but keep it as a #define in case someone fixes it in a patch. 2019-12-07 10:22:10 +00:00
Alam Ed Arias
d02648450a Let fix that GCC warning 2019-12-06 18:12:50 -05:00
James R
53cfba1f42 Use strncpy 2019-12-06 15:09:07 -08:00
MascaraSnake
0d22970c78 Change versionstring to 2.2.0 2019-12-06 23:47:05 +01:00
MascaraSnake
f6563c85ed Updated MD5 hashes 2019-12-06 23:43:54 +01:00
MascaraSnake
bf477c6ed4 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
MascaraSnake
239242f513 Merge branch 'stretch-credits' into 'master'
Lengthen credits for msuic parity

See merge request STJr/SRB2Internal!620
2019-12-06 17:19:17 -05:00
MascaraSnake
78de32b623 Merge branch 'creditweak' into 'master'
Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox.

See merge request STJr/SRB2Internal!621
2019-12-06 17:18:54 -05:00
Steel Titanium
5f9f255f77
Correct comment 2019-12-06 17:10:14 -05:00
toaster
66bd864592 Update SRB2 Community Contributors list for Revan's Nimbus Ruins skybox. 2019-12-06 22:06:35 +00:00
lachwright
8f2d81ec74 Lengthen credits for msuic parity 2019-12-07 05:59:26 +08:00
MascaraSnake
a0ebb32912 Merge branch 'introskiptext' into 'master'
Add "Press ENTER to skip..." text to the intro's first scene

See merge request STJr/SRB2Internal!619
2019-12-06 16:48:29 -05:00
MascaraSnake
a3549cc8f2 Merge branch 'datestuff' into 'master'
Date stuff

See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
MascaraSnake
f3fd5a50cb Merge branch 'signpost-cleanup' into 'master'
Signpost fixes

See merge request STJr/SRB2Internal!602
2019-12-06 15:58:46 -05:00
toaster
674fcd7923 Add "Press ENTER to skip..." text to the intro's first scene, for new players who might otherwise sit through a load of (polished) crap. :P 2019-12-06 20:50:41 +00:00
MascaraSnake
f4c89c2dac Merge branch 'analogfixes' into 'master'
Small analog mode fixes

See merge request STJr/SRB2Internal!604
2019-12-06 15:32:10 -05:00
Steel Titanium
f304931ac4
get lua_blockmaplib.c too 2019-12-06 15:27:20 -05:00
Steel Titanium
86cd363d16
Merge branch 'datestuff' of git.magicalgirl.moe:STJr/SRB2Internal into datestuff 2019-12-06 15:23:02 -05:00
Steel Titanium
f02418e70c
Fix copy+paste goof 2019-12-06 15:21:41 -05:00
Jaime Passos
fcc4427de6 Update r_patch.h 2019-12-06 17:07:57 -03:00
Jaime Passos
c4518cce9d Update r_patch.c 2019-12-06 17:05:36 -03:00
MascaraSnake
201cdef381 Merge branch 'f12fix' into 'master'
Fix F12 issues

Closes #356 and #377

See merge request STJr/SRB2Internal!616
2019-12-06 15:01:28 -05:00
Alam Ed Arias
1f183e1c1f Not dealing with size_t mess with SDL code 2019-12-06 14:42:47 -05:00
MascaraSnake
e105c2f749 Merge branch 'undo_double' into 'master'
OpenGL cast to float, not store in double

See merge request STJr/SRB2Internal!617
2019-12-06 14:28:41 -05:00
Jaime Passos
d7bfe7d652 Merge branch 'lt-extraneous-parameters' into 'master'
Remove unnecessary function parameters from title card code

See merge request STJr/SRB2Internal!603
2019-12-06 14:22:39 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias
f576e61753 OpenGL cast to float, not store in double 2019-12-06 13:45:11 -05:00
lachwright
2e77970526 Fix whitespace issues from when I was new to this shit 2019-12-07 02:31:31 +08:00
lachwright
4a26aec031 Actually fix F12 issues 2019-12-07 02:27:48 +08:00
lachwright
e7574957bc Hopefully fix F12 issues 2019-12-07 01:52:40 +08:00
toaster
6e8299f39d Update comments in the config on when main assets/patch.pk3 hashes have been updated (I know MS is going to update the hashes again later, but this'll still be valid to have done then). 2019-12-06 17:38:23 +00:00
toaster
fd6ecb4425 Make modid 18 to match Rob's work. 2019-12-06 17:23:55 +00:00
toaster
1684cf76bd Make modversion 40 to match Rob's work. 2019-12-06 17:19:42 +00:00
toaster
9e38af7421 * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461).
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
2019-12-06 17:14:51 +00:00
lachwright
c4f48ee979 Make Buggles spawn immediately breathable bubbles 2019-12-06 16:29:52 +08:00