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

8771 commits

Author SHA1 Message Date
Monster Iestyn 23b6679b3a Merge branch 'buggle-trouble' into 'next' 
P_HomingAttack related fixes

See merge request STJr/SRB2!836
 2020-03-22 16:57:22 -04:00
Monster Iestyn 3b9dd31faf Merge branch 'fix-setspriteinfo' into 'next' 
Fix lib_setSpriteInfo indexes being off-by-one

See merge request STJr/SRB2!854
 2020-03-22 16:40:34 -04:00
fickleheart f9027ccaeb Split horizon lines for minimal distortion 2020-03-22 12:52:17 -05:00
fickleheart 14d6a01292 Distort far edges to viewz for a flat horizon line 2020-03-22 12:28:49 -05:00
fickleheart deff1565dc GL horizon lines 2020-03-22 12:13:59 -05:00
MascaraSnake 42445b39d7 Merge branch 'master' into next 2020-03-21 19:16:52 +01:00
LJ Sonic fa9c2f43f7 Merge branch 'skip-empty-gametypes' into 'master' 
Skip empty gametypes in level select menu

See merge request STJr/SRB2!819
 2020-03-21 08:52:54 -04:00
fickleheart f32ab5918e Define SERVER_URL_PROTOCOL const for easy reconfiguration 2020-03-21 07:47:29 -05:00
fickleheart feb18208cb Add support for srb2:// URL handler (server links) 2020-03-21 01:36:39 -05:00
Louis-Antoine 892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Monster Iestyn 7a585e2498 Merge branch 'next' into demos-refactor 
# Conflicts:
#	src/g_game.c

(also update g_demo.c)
 2020-03-20 17:48:31 +00:00
fickleheart 78ec210896 hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh 2020-03-19 18:55:10 -05:00
Jaime Passos 5eaa73b6ac Fix lib_setSpriteInfo indexes being off-by-one 2020-03-19 19:09:34 -03:00
Monster Iestyn 4236ae7c08 We don't need m_cheat.h either in g_demo.c 2020-03-19 21:10:23 +00:00
Monster Iestyn 6610150bfe We definitely don't need these files to compile! 2020-03-19 20:43:56 +00:00
Monster Iestyn dd76be16cb Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all) 2020-03-19 20:42:51 +00:00
Monster Iestyn 1a14234088 update Makefile, CMakeLists.txt and MSVC project files 2020-03-19 20:13:39 +00:00
Monster Iestyn dcb4ce8cb9 Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c 2020-03-19 20:09:55 +00:00
Louis-Antoine e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Louis-Antoine c1b50397ce Fix compiler warning 2020-03-19 14:40:35 +01:00
Louis-Antoine 1d5d6ead65 Fix misleading naming 2020-03-19 14:40:12 +01:00
Louis-Antoine 58c42eec29 Simplify hook code 2020-03-19 14:38:42 +01:00
fickleheart 725826a64b Avoid infinite loops if no maps are selectable (y tho) 2020-03-18 22:56:20 -05:00
fickleheart 05b2570ae7 Merge remote-tracking branch 'upstream/next' into lua-music 2020-03-18 22:43:07 -05:00
fickleheart 9c86cd0bc2 More union types for the union type god 2020-03-18 22:42:31 -05:00
fickleheart 520e3c5dc3 Are these casts unnecessary...?? 2020-03-18 22:40:11 -05:00
fickleheart 647f73c8f2 Clean up after myself 2020-03-18 22:38:51 -05:00
fickleheart dd0d86120b > building SRB2 without Lua in 2020 2020-03-18 22:38:18 -05:00
fickleheart e0badd1e5b Rename hook to ShouldJingleContinue 2020-03-18 22:35:21 -05:00
Steel Titanium 5dac9c6875 Merge branch 'master' into next 2020-03-18 15:42:02 -04:00
SteelT 04131d3268 Merge branch 'fix-nights-mode-menu-wrong-return' into 'master' 
NiGHTS Mode menu fixes

See merge request STJr/SRB2!841
 2020-03-18 15:41:17 -04:00
SteelT e3a5164ddf Merge branch 'deadzone-sigfpe-fix' into 'master' 
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones

See merge request STJr/SRB2!838
 2020-03-18 15:39:04 -04:00
SteelT bd058ecc4b Merge branch 'viewpointswitch-fix' into 'next' 
Fix incorrect newdisplayplayer in forced ViewpointSwitch

See merge request STJr/SRB2!814
 2020-03-18 15:34:18 -04:00
LJ Sonic 38bcfe4997 Merge branch 'screenshot-menu-header' into 'master' 
Actually use the "SCREENSHOT OPTIONS" header for its menu.

See merge request STJr/SRB2!832
 2020-03-18 10:56:35 -04:00
LJ Sonic c43ca31dc2 Merge branch 'increase-input-buffer' into 'next' 
Increase the length of the player input buffer

See merge request STJr/SRB2!835
 2020-03-18 09:49:14 -04:00
Jaime Passos 1904e3b5e9 Fix OpenGL 2020-03-17 15:23:13 -03:00
Jaime Passos c2cd9a71fa Fix con_backpic 2020-03-17 13:05:54 -03:00
Monster Iestyn 31b1188a3e Merge branch 'master' into next 2020-03-15 20:32:43 +00:00
LJ Sonic 0a54c40ff4 Merge branch 'fix-playernode-crash' into 'next' 
Fix buffer overrun with players with no associated node

See merge request STJr/SRB2!810
 2020-03-15 15:36:45 -04:00
Monster Iestyn 3f43dd22f9 Merge branch 'skins-refactor' into 'master' 
Skins refactor

See merge request STJr/SRB2!843
 2020-03-15 15:31:49 -04:00
Steel Titanium efab0f479c Merge branch 'master' into next 2020-03-14 22:21:12 -04:00
SteelT 49001b207e Merge branch 'nadraw-fix' into 'master' 
Fix NiGHTS Attack crash after render mode change

See merge request STJr/SRB2!837
 2020-03-14 22:19:35 -04:00
SteelT 88fff119ea Merge branch 'hwrflipcolchromakey' into 'master' 
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF

See merge request STJr/SRB2!826
 2020-03-14 22:13:19 -04:00
SteelT e80a09a651 Merge branch 'tex' into 'master' 
Replace NextTexAvail with glGenTextures

See merge request STJr/SRB2!828
 2020-03-14 22:12:02 -04:00
SteelT 2d16281d86 Merge branch 'acz-fence' into 'master' 
Fix ASTBlendPixel blending with nothing

See merge request STJr/SRB2!827
 2020-03-14 22:11:23 -04:00
sphere bdab78152c Check if emblem hints are actually unlocked. 2020-03-13 10:46:57 -04:00
Monster Iestyn ddc0762ecc Merge branch 'master' into next 2020-03-09 19:53:08 +00:00
Monster Iestyn db6a3bbd1f Merge branch 'archive-sprite2-hotfix' into 'master' 
Archive sprite2 Hotfix

See merge request STJr/SRB2!845
 2020-03-09 15:50:55 -04:00
Monster Iestyn 40e728fdb5 One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it 
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
 2020-03-09 15:04:22 +00:00
Monster Iestyn f4cb6e1f5e Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff 
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
 2020-03-09 13:54:56 +00:00
Monster Iestyn 1dd4ed4afa Reorganise r_things.h 2020-03-08 21:17:30 +00:00
Monster Iestyn e81ef824d6 Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway 
This way we don't have to make it some extern in order for r_skins.c to use it
 2020-03-08 19:51:18 +00:00
Monster Iestyn 37ecb47436 update Makefile, CMakeLists.txt and MSVC project files 2020-03-08 19:48:23 +00:00
Monster Iestyn b2d9697e07 remove r_skins.c include in r_things.c, on second thoughts 2020-03-08 19:36:56 +00:00
Monster Iestyn a67dbfff54 Create r_skins.c/.h, to contain skins code formerly in r_things.c/h 2020-03-08 19:32:07 +00:00
colette ce29129f3a Fix resyncs never recovering if node and player mismatch 2020-03-08 13:09:39 -04:00
Tatsuru be338da3f6 I guess 2020-03-08 14:06:18 -03:00
Steel Titanium e5270ad9c7 Fix guest data being deleted regardless of choice 2020-03-08 00:34:15 -05:00
Steel Titanium a3f3dd649f Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu 2020-03-08 00:02:43 -05:00
GoldenTails cdba9ba033 Fix spaces before someone yells at me for it 2020-03-07 21:48:40 -06:00
GoldenTails 0d92bf3dd0 Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot. 
Disclaimer: I'm not actually from Florida.
 2020-03-07 21:41:52 -06:00
Zipper 4b28e19d16 Update p_inter.c 2020-03-05 18:48:20 -05:00
Zipper 4d8a523da9 Update p_inter.c 2020-03-05 18:30:27 -05:00
ZipperQR da9bf34175 fix source player being nil 2020-03-05 12:26:27 +03:00
Zwip-Zwap Zapony bce6349b1d More gamepad deadzone tweakage 2020-03-04 21:44:57 +01:00
Zwip-Zwap Zapony df220aa2c2 Hotfix for 100% deadzone returning 0 input 
It makes more sense for 100% deadzone to just make it so that
you have to push the axis all the way to trigger it,
rather than 100% deadzone resulting in no axis input
ever happening... So, let's make it be the former way instead
 2020-03-04 21:11:55 +01:00
Zwip-Zwap Zapony 27e084a827 Fix division-by-0 crash with gamepad deadzones 
Fix division-by-0 crash with gamepad deadzones
The problem was that it checked if A was more than B,
then lowered A to a max value, then subtracted B from A,
then divided something by that, without checking if A minus B was 0,
allowing division by 0 if B was the same as that max value

This fixes that by making sure that A is less than the max value
 2020-03-04 17:31:52 +01:00
Jaime Passos b8db3e2216 Fix NiGHTS Attack crash after render mode change 2020-03-04 09:42:34 -03:00
Tatsuru 761ec3b6a4 Separate PvP damage from non-friendly gametypes 2020-03-03 11:56:57 -03:00
Tatsuru 776951c6a8 Never forget who your enemy is 2020-03-03 11:40:35 -03:00
SteelT 039aeed633 Merge branch 'tolflag-fix' into 'next' 
Fix G_TOLFlag returning the wrong type

See merge request STJr/SRB2!834
 2020-03-02 21:27:45 -05:00
Steel Titanium 10d08fc8bb Merge branch 'master' into next 2020-03-02 15:26:01 -05:00
SteelT 7d14796954 Merge branch 'fix-ogllib' into 'master' 
Fix -OGLlib

See merge request STJr/SRB2!794
 2020-03-02 15:21:50 -05:00
Jaime Passos 67b8a7eb67 Merge remote-tracking branch 'origin/next' into tolflag-fix 2020-03-02 13:14:12 -03:00
Louis-Antoine 04a1f479be Increase the length of the player input buffer 2020-03-02 15:36:28 +01:00
Louis-Antoine 7ba93c184f Fix warning and formatting 2020-03-02 13:33:12 +01:00
sphere c671097c04 Actually use the "SCREENSHOT OPTIONS" header for its menu. 2020-03-02 13:23:54 +01:00
Jaime Passos 70a103b9af Fix G_TOLFlag returning the wrong type 2020-03-02 00:20:53 -03:00
Jaime Passos 76bda716cd Merge branch 'tol-moment' into 'next' 
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags

See merge request STJr/SRB2!825
 2020-03-01 11:14:29 -05:00
LJ Sonic 2cace6e147 Merge branch 'lua-io' into 'next' 
Support for Lua's I/O library

See merge request STJr/SRB2!727
 2020-03-01 11:12:45 -05:00
Jaime Passos 94107a5320 Set pixel RGBA to nothing instead of the alpha only 2020-02-29 19:36:50 -03:00
Monster Iestyn cf95837a76 Merge branch 'follow-is-mobj' into 'next' 
Turn FollowMobj into a mobj hook

See merge request STJr/SRB2!803
 2020-02-29 12:48:39 -05:00
Jaime Passos 4a489c4d95 Fix NOTEXTURE_NUM 2020-02-28 18:57:34 -03:00
Jaime Passos 9b88edc458 Same deal for screen textures 2020-02-28 18:57:15 -03:00
Jaime Passos 48b352049f Stop using NextTexAvail 2020-02-28 18:56:41 -03:00
Jaime Passos 4446b0d563 Fix ACZ fence texture 2020-02-28 17:33:58 -03:00
Jaime Passos 7f32a53233 Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF 2020-02-28 17:31:41 -03:00
Jaime Passos 4abe112af8 Merge remote-tracking branch 'origin/master' into next 2020-02-25 22:43:15 -03:00
Jaime Passos 8350a8c58a Merge branch 'new-color-chat-fix' into 'master' 
Fix new skin colors using default chat color

See merge request STJr/SRB2!822
 2020-02-25 20:38:36 -05:00
Jaime Passos 25cf369f22 Fix (technically functional) string comparison counting an extra character in the comparison length 2020-02-25 22:34:19 -03:00
Jaime Passos 3d7cd29eda Fix TYPEOFLEVEL options not having enough bits for TOL_ flags 2020-02-25 22:30:34 -03:00
LJ Sonic 8dd4e47a35 Merge branch 'realmo' into 'next' 
Let Lua access spectator mobjs

See merge request STJr/SRB2!756
 2020-02-25 15:06:29 -05:00
fickleheart de789add8a Fix menu enterwipes being overridden? 2020-02-24 18:00:52 -06:00
fickleheart 141df606c2 Use a named macro for menu hierarchy 
This _really_ needs to be a UINT8 array instead of
all this bit-shifting nonsense that saves no space,
but at least this way reading the menu structs doesn't
make me want to die.
 2020-02-24 18:00:17 -06:00
fickleheart da122ca2fd Fix missing menuname entries 2020-02-24 17:56:00 -06:00
Jaime Passos fe93155578 Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables 2020-02-24 20:03:08 -03:00
Steel Titanium ce801e1076 Fix new skin colors using default chat color 2020-02-24 16:58:19 -05:00
fickleheart b66be478d9 Increase COM_BUF_SIZE 
The config file is starting to get close to the old max,
so this should be enough headroom for a while...
 2020-02-24 11:45:22 -06:00
fickleheart f8408f3c99 Fix ExecCfg not working on files added via command line 2020-02-24 11:44:45 -06:00
fickleheart 1f8dbd1b8c Allow using lump names in ExecCfg 2020-02-24 11:44:27 -06:00
sphere 0df094021e Allow emblem hints (and radar) in record attack. 2020-02-24 17:31:30 +01:00
fickleheart 1848ce4b97 Skip empty gametypes in level select menu 2020-02-24 10:02:48 -06:00
fickleheart d1dcdf88c7 Fix MD2 rollangle in reverse gravity 2020-02-23 18:44:22 -06:00
fickleheart 352029fd76 Add music position functions to Lua 2020-02-23 17:58:32 -06:00
fickleheart f2c968dea8 Add JingleStatus hook for carrying custom jingle tunes 
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
 2020-02-23 17:20:44 -06:00
fickleheart c5f3868819 Expose P_PlayJingle/Music() to Lua 2020-02-23 17:19:18 -06:00
James R 711c8ed6b4 Merge branch 'console-in-menus-mk-ii' into 'master' 
Console in menus again!

See merge request STJr/SRB2!797
 2020-02-23 18:15:43 -05:00
James R 95b8f950b4 Merge branch 'nomd5-crash' into 'master' 
Fix crash under NOMD5

See merge request STJr/SRB2!807
 2020-02-23 18:15:04 -05:00
Jaime Passos 94738bfd2d Don't get chosen as the tagger if you're a spectator 2020-02-23 19:28:16 -03:00
fickleheart 40488096c0 Make P_PlayLivesJingle player optional in Lua 2020-02-23 15:40:59 -06:00
fickleheart 283bb52e7d Disable NOHUD/INLEVEL checks on Lua sound functions 
None of these are implicitly sync-safe anyway, and most have
no need to be walled off from HUD code or intermission thinkers.
 2020-02-23 12:50:45 -06:00
Snu 2dc72219e7 Merge branch 'master' into supergoldedit 2020-02-23 17:57:39 +00:00
Jaime Passos 0362f53e9b Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
Tatsuru ff8a62819b Oopsie 2 2020-02-22 22:36:44 -03:00
Tatsuru 4c00e33096 Oopsie 2020-02-22 21:14:05 -03:00
James R 4244480d63 Add patch_music.pk3 2020-02-22 14:43:41 -08:00
Steel Titanium 03e38e9486 Enable use of the patch file 2020-02-22 16:42:24 -05:00
Steel Titanium 1c1163bd0f Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
Louis-Antoine d19fe295e0 Fix buffer overrun with nodeless players 2020-02-22 15:08:17 +01:00
James R af12f26f37 Merge remote-tracking branch 'origin/master' into next 2020-02-21 21:06:27 -08:00
James R f6df71ba54 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
James R 0f2b8b8b2c Register servername etc. under NOMD5 
This fixes crashes in the menus.
 2020-02-21 20:04:28 -08:00
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
SteelT cfd190c453 Merge branch 'warp-gamedata-corruption-fix' into 'next' 
Warp gamedata corruption fix

See merge request STJr/SRB2!802
 2020-02-21 21:00:29 -05:00
SteelT a1cf58cf7f Merge branch 'update-copyright-year' into 'master' 
Update copyright year

See merge request STJr/SRB2!801
 2020-02-21 20:59:56 -05:00
Louis-Antoine 778715f611 Cleanup code a little 2020-02-22 02:21:27 +01:00
Louis-Antoine af9164f336 Improve join refusal handling 2020-02-22 02:17:21 +01:00
Louis-Antoine 472befd183 Replace MAX_WADPATH with plain numbers 
This is not ideal either, but I would rather
not use a constant for something unrelated.
 2020-02-21 17:31:32 +01:00
Louis-Antoine ec5b88e79f Fix weird comment style 2020-02-21 17:17:39 +01:00
James R 93046c5e59 Merge remote-tracking branch 'origin/master' into next 2020-02-20 17:30:50 -08:00
James R 08627752b2 Fix NOPNG compiling 2020-02-20 17:30:32 -08:00
James R 2df4717f18 Fix NO_LUA compiling 2020-02-20 17:20:50 -08:00
James R cce5308108 Fix compiler warnings 2020-02-20 17:18:26 -08:00
James R fb0bedf02c Merge branch 'ogl-colorbug' into 'master' 
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
 2020-02-20 19:32:34 -05:00
James R 62d943b609 Merge branch 'thin-fixed' into 'next' 
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
 2020-02-20 19:27:01 -05:00
Snu 2a93ddc2dd Change SKINCOLOR_SUPERGOLD1-5 2020-02-20 21:53:21 +00:00
Sally Cochenour 400366802c Make hook_FollowMobj a mobj hook instead of a player hook 
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
 2020-02-20 16:40:39 -05:00
Monster Iestyn 5c33ff0458 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn 903cc311a7 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00
Louis-Antoine 3502278f8a SpaceSpaceSpaceSpace 2020-02-20 01:15:54 +01:00
James R 54794f325d :) 2020-02-19 14:44:22 -08:00
James R 61470201f9 Regex bruh moment 2020-02-19 14:37:42 -08:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine 12959ff4a9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00
Louis-Antoine 20d054a679 Minor code cleanup 2020-02-19 22:37:30 +01:00
Louis-Antoine ebc1809da9 Fix bad tabulation 2020-02-19 22:01:33 +01:00
Tatsuru 380b2f87bb Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye 2020-02-19 17:47:13 -03:00
Tatsuru 3022e38d15 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00
Tatsuru 80edefa56e Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
Steel Titanium 281d40d6d2 Merge branch 'master' into next 2020-02-18 22:03:08 -05:00
James R d3d8f85602 Merge branch 'the-colors-feel-so-right' into 'next' 
New skin colors, add support for preferred opposite color to save cards, new lua features.

See merge request STJr/SRB2!787
 2020-02-18 22:02:01 -05:00
James R 92f65fd822 Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
James R a447a3d8a9 Merge branch 'rscache' into 'master' 
Fix R_CacheRotSprite not working with PNG lumps

See merge request STJr/SRB2!800
 2020-02-18 21:54:45 -05:00
James R b92d66a54c Merge branch 'seenames-fix' into 'master' 
Fix seenames not working without a SeenPlayer hook

See merge request STJr/SRB2!799
 2020-02-18 21:53:28 -05:00
James R c1a91cdc2e Merge branch 'setrenderneeded-fix' into 'master' 
Clear setrenderneeded after calling VID_CheckRenderer

See merge request STJr/SRB2!793
 2020-02-18 21:53:14 -05:00
James R 26825a2b4c Merge branch 'pw-justlaunched' into 'next' 
Add pw_justlaunched to tell modders when a player launches from a slope

See merge request STJr/SRB2!792
 2020-02-18 21:53:05 -05:00
James R 2d8522b9ec Merge branch 'titlecard-options' into 'next' 
Allow more options for when the titlecard shows up

See merge request STJr/SRB2!765
 2020-02-18 21:52:03 -05:00
James R 8054f341a1 Merge branch 'startup-file-not-found' into 'master' 
Fix the issue !678 did, but just don't exit if the file was added twice

See merge request STJr/SRB2!753
 2020-02-18 21:50:11 -05:00
James R 3fc9c7d298 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-02-18 18:23:20 -08:00
Tatsuru 4a8de7cb55 Enough 2020-02-18 22:55:40 -03:00
Tatsuru b1ad7787f4 Standards 3 2020-02-18 22:54:11 -03:00
Tatsuru ec67e776dc Standards 2 2020-02-18 22:50:22 -03:00
Tatsuru c76a8e8a58 Standards 2020-02-18 22:46:16 -03:00
Steel Titanium da15c92568 Merge branch 'master' into next 2020-02-18 17:41:13 -05:00
Jaime Passos 1dc080e8cd Merge remote-tracking branch 'origin/master' into rscache 2020-02-18 19:38:19 -03:00
Jaime Passos 72edf514c2 Merge remote-tracking branch 'origin/master' into seenames-fix 2020-02-18 19:37:55 -03:00
Steel Titanium f0e2ba9e6a Merge branch 'next' into the-colors-feel-so-right 2020-02-18 14:29:50 -05:00
Monster Iestyn 2b3034a7af Merge branch 'master' into next 2020-02-18 17:38:05 +00:00
James R e3ba369ae4 Fix M_Ftrim 
- Use '%f' instead of '%g' to avoid going scientific. Should also fix some
  compiler warnings.
- The trailing zero trimming code is now useful. It started on the terminating
  byte before and wouldn't have done anything with '%g' anyway.
- Use the absolute fractional value to avoid a sign.
 2020-02-17 19:38:14 -08:00
Jaime Passos 369fd8e35f Fix LUAh_SeenPlayer not working 2020-02-17 23:06:38 -03:00
Jaime Passos b3933c7842 Fix R_CacheRotSprite not working with PNG lumps 2020-02-17 22:59:36 -03:00
Jaime Passos bd7b2fcb93 setrenderneeded is already cleared earlier 2020-02-17 22:33:36 -03:00
Jaime Passos d3abf5dcfa Set the palette :) 2020-02-17 22:31:34 -03:00
James R b78fc670d0 Don't let console open with menu keys while the menu is open 2020-02-17 17:10:29 -08:00
Jaime Passos bef6cb532b Fix what !785 tried to fix, but correctly 2020-02-17 21:58:32 -03:00
James R b2733eba73 Draw console in the Record/NiGHTS Attack menus 
(cherry picked from commit 4efd915d28d0f193528d141b04c5f88b84877f97)
 2020-02-17 16:37:29 -08:00
James R a9a0601c84 Revert "Revert "Let the console open in menus"" 
This reverts commit 705cf9fd40.
 2020-02-17 16:37:13 -08:00
Jaime Passos e53a17bb52 Rename stuff around 2020-02-17 21:11:56 -03:00
Jaime Passos cac5f9d171 add -nogl parm 2020-02-17 12:14:51 -03:00
James R d0b9027d0a Merge branch 'viewroll' into 'next' 
Rolling

See merge request STJr/SRB2!690
 2020-02-17 00:10:57 -05:00
James R 9bd9e667c5 Merge branch 'push-special-params' into 'master' 
"+" command line parameters make sense

See merge request STJr/SRB2!707
 2020-02-17 00:05:49 -05:00
James R 3ea51c943a Merge branch 'trim-floats' into 'master' 
Trim the trailing zeros off floats for cvars

See merge request STJr/SRB2!716
 2020-02-17 00:04:15 -05:00
James R 8e4cb953c8 Merge branch 'extra-emblem-display' into 'next' 
Extra emblem hint display

See merge request STJr/SRB2!721
 2020-02-17 00:00:36 -05:00
James R 132e8f82d5 Merge branch 'local-color-table' into 'master' 
Local Color Table for GIF movie mode

See merge request STJr/SRB2!742
 2020-02-16 23:58:11 -05:00
James R af14166730 Merge branch 'stoppedclock-exposed' into 'next' 
Expose stoppedclock to Lua

See merge request STJr/SRB2!771
 2020-02-16 23:55:33 -05:00
James R 7ed7e53c81 Merge branch 'tolfix' into 'master' 
Don't freeslot TOL_ twice

See merge request STJr/SRB2!779
 2020-02-16 23:52:45 -05:00
James R 11a1ce6df9 Merge branch 'lua-hud-get-rotsprites' into 'next' 
Get rotated sprites with v.getSprite(2)Patch

See merge request STJr/SRB2!773
 2020-02-16 23:51:49 -05:00
James R f4c2a4551b How many bruh moments can we have? 2020-02-16 20:45:09 -08:00
James R fb66691991 Merge branch 'colormap_flags_refactor' into 'next' 
Clean up the mess that is extracolormap_t::fog

See merge request STJr/SRB2!790
 2020-02-16 23:28:26 -05:00
James R 94aec0101f Merge branch 'grfang' into 'master' 
Allow models for skin/sprites with same name

See merge request STJr/SRB2!767
 2020-02-16 23:21:07 -05:00
Jaime Passos 067a2667e3 move hw texture used to be always below. 2020-02-17 01:20:00 -03:00
Sally Cochenour 07d71778dc FIX COLOR BUG 2020-02-17 01:19:28 -03:00
Jaime Passos f90b6d241f Merge branch 'setrenderneeded-fix' into fix-ogllib 2020-02-17 01:17:54 -03:00
Jaime Passos 8da832986c Don't center the window when changing renderers 2020-02-17 01:15:18 -03:00
Jaime Passos 04ee6ca12c Don't call HWR_Switch twice 2020-02-17 01:15:11 -03:00
Jaime Passos 7ddad9c9ec Remove redundant check 2020-02-17 01:15:04 -03:00
Jaime Passos 9d9de3aff6 Only set OpenGL as the target renderer if it loaded successfully 2020-02-17 01:14:48 -03:00
Jaime Passos 3fa4db891f Always load the GL library! 2020-02-17 01:13:13 -03:00
Jaime Passos 07afd7520f Only initialise OpenGL if you actually intend to use it. 2020-02-17 01:12:53 -03:00
Jaime Passos 6c5db5f462 Missing comment 2020-02-17 01:08:55 -03:00
Jaime Passos cca3665525 Fallback to Software if the renderer version doesn't match 2020-02-17 01:08:41 -03:00
Jaime Passos b6089ccdaf Fix -OGLlib 2020-02-17 01:08:15 -03:00
Steel Titanium 0299f21dc7 Merge branch 'next' into the-colors-feel-so-right 2020-02-16 22:56:27 -05:00
Jaime Passos ae013108ab Merge remote-tracking branch 'origin/next' into fix-overtime 2020-02-17 00:48:42 -03:00
Jaime Passos 9e83e2751d Clear setrenderneeded after calling VID_CheckRenderer 2020-02-17 00:36:10 -03:00
fickleheart 0fbff66e25 Let scripters see if player just launched from slope 2020-02-16 21:34:07 -06:00
fickleheart c4b390bc76 Merge remote-tracking branch 'upstream/master' into viewroll 2020-02-16 21:32:57 -06:00
fickleheart ae53c146e6 Allow SHOWTITLECARDFOR = NONE 2020-02-16 21:32:40 -06:00
fickleheart 187bd9ab23 Merge remote-tracking branch 'upstream/master' into titlecard-options 2020-02-16 21:32:27 -06:00
Steel Titanium 847b2bde13
Merge remote-tracking branch 'public/next' into public_next 2020-02-16 20:41:17 -05:00
James R e245354c80 Merge remote-tracking branch 'origin/master' into next 2020-02-16 17:35:59 -08:00
James R 705cf9fd40 Revert "Let the console open in menus" 
This reverts commit ef3d462eb7.
 2020-02-16 17:14:54 -08:00
Steel Titanium 773ed0a056
Update credit at Rob's request 2020-02-16 20:10:30 -05:00
Steel Titanium 728e01e60d
Merge branch 'public_next' into mobj-shadowscale-send 2020-02-16 18:55:44 -05:00
Steel Titanium b44358df63
Update file hash yet again 2020-02-16 18:54:51 -05:00
Steel Titanium cb97aafd05
Fix object shadow not appearing for mid-joiners 2020-02-16 18:45:49 -05:00
MascaraSnake 512c6f24a9 Clean up the mess that is extracolormap_t::fog 2020-02-16 20:19:24 +01:00
Steel Titanium 3a82864ce9
Update comment 2020-02-16 11:34:02 -05:00
Steel Titanium 13a521d808
Merge remote-tracking branch 'public/next' into public_next 2020-02-16 11:32:43 -05:00
Steel Titanium 45ab4244fc Restore this that got shifted. 2020-02-15 17:55:25 -05:00
Louis-Antoine 7b13f0a2de Fix dedicated servers not running gamelogic 
Note to future testers:
Remember to test dedicated servers before merging.
And splitscreen also.
 2020-02-15 23:47:11 +01:00
Steel Titanium 2b678aaef0 New Lua functions: R_GetColorByName and R_GetNameByColor 2020-02-15 17:35:00 -05:00
Steel Titanium 2b615aa09c Add prefoppoistecolor support to save cards 2020-02-15 17:34:21 -05:00
Jaime Passos 5dc0f0649e Fix overtime not working 2020-02-15 13:07:53 -03:00
Jaime Passos a98e84faa0 change prefix to "PLAYER" 2020-02-15 12:40:41 -03:00
MascaraSnake e7a0fc65bd Update hashes (again) 2020-02-15 12:44:03 +01:00
MascaraSnake 9dd788a90c Merge remote-tracking branch 'Public/next' into public_next 2020-02-15 12:32:39 +01:00
MascaraSnake 31bce6c857 Merge branch 'master' into next 2020-02-15 12:32:09 +01:00
MascaraSnake 63ffe561ae Merge branch 'dropshadows-refactor' into 'next' 
Use exact object types when setting shadowscale

See merge request STJr/SRB2!755
 2020-02-15 06:31:25 -05:00
MascaraSnake 7bb7cb61ea Merge branch 'leftover-tokens' into 'next' 
Don't carry extra tokens into the next level if you got all 7 emeralds already

See merge request STJr/SRB2!778
 2020-02-15 06:31:17 -05:00
MascaraSnake 869748dfbf Merge remote-tracking branch 'Public/next' into public_next 2020-02-15 12:25:29 +01:00
MascaraSnake 9bf0cfda5c Merge branch 'po-slide-fixes' into 'next' 
Improvements to polyobjects carrying things

See merge request STJr/SRB2!772
 2020-02-15 06:24:45 -05:00
MascaraSnake fff638f46a Merge branch 'S_SKIN-missing-flag' into 'next' 
Missing flag in S_SKIN

See merge request STJr/SRB2!781
 2020-02-15 02:07:56 -05:00
Steel Titanium d9e2256a3c Add six new skin colors 2020-02-14 22:30:37 -05:00
James R ba92db412a Merge branch 'patch-valid' into 'next' 
Don't error when checking patch.valid on invalid patches

See merge request STJr/SRB2!780
 2020-02-12 21:19:19 -05:00
James R 71319dce6b Revert "Update file hashes" 
This reverts commit 4281de3b89.
 2020-02-12 18:15:15 -08:00
James R 64b7a5e4d6 SF_NONIGHTSSUPER for disabling super colors in NiGHTS 2020-02-12 18:03:39 -08:00
James R 841094976b Add flag name variant of SF_NONIGHTSROTATION to S_SKIN 2020-02-12 18:02:36 -08:00
Sally Cochenour 934808ef62 BotRespawn hook 
Lets you force when and when not to respawn the bot
 2020-02-12 14:16:23 -05:00
Jaime Passos 2fc7e56951 Cast Moment 2020-02-12 13:59:08 -03:00
Jaime Passos 7bc58c4c0e Add MAXTOL 2020-02-12 13:41:30 -03:00
Jaime Passos c827a72aab Merge remote-tracking branch 'origin/next' into tolfix 2020-02-12 13:03:16 -03:00
colette d3e5cbffba comment 2020-02-12 08:54:20 -05:00
fickleheart b7a6773ff5 Don't error when checking patch.valid on invalid patches 2020-02-11 23:25:01 -06:00
Jaime Passos d8793ce579 Merge branch 'gtr-shift' into 'next' 
1 left shifted by zero is still 1

See merge request STJr/SRB2!766
 2020-02-11 23:33:43 -05:00
James R ae2041d686 Remove extra tokens if we got all 7 emeroods 2020-02-11 19:36:09 -08:00
Jaime Passos 6b8195dbc1 player model prefix 2020-02-11 23:54:39 -03:00
Steel Titanium c44442ef7c
Merge remote-tracking branch 'public/next' into public_next 2020-02-11 20:43:26 -05:00
James R 0993b71355 Merge branch 'patch-1' into 'next' 
Fix title/card hud hooks grabbing the wrong functions

See merge request STJr/SRB2!758
 2020-02-11 20:17:50 -05:00
GoldenTails 9f7bfd901b I broke SHIFT in the Connect IP Textbox.. whoops. 
It's okay, I literally had to remove one line lmao.
 2020-02-11 19:07:48 -06:00