4201 commits

Author	SHA1	Message	Date
mazmazz	71ade23739	Ifdef typo	2018-09-11 15:59:56 -04:00
mazmazz	fb7ac4ccae	Ifdef typo	2018-09-11 15:59:13 -04:00
mazmazz	c6dbf2e560	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:57:58 -04:00
mazmazz	c920827032	Consolidate colormap matching into R_GetColormapFromList	2018-09-11 15:56:21 -04:00
mazmazz	3290104922	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:50:21 -04:00
mazmazz	78aefc05cf	Consolidate colormap matching into R_GetExistingColormap	2018-09-11 15:50:12 -04:00
mazmazz	87cf18b60b	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:20:58 -04:00
mazmazz	85d89287de	Add R_CopyColormap	2018-09-11 15:20:30 -04:00
mazmazz	5dad8d15b0	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 15:03:04 -04:00
mazmazz	3da58f436c	Merge branch 'master' into colormap-overhaul	2018-09-11 15:02:35 -04:00
mazmazz	ba88f8ebb6	Smarter string digit parsing; allow alpha-only values ... * GetDefaultColormap and CheckDefaultColormapValues methods	2018-09-11 15:01:05 -04:00
mazmazz	8695a5f5df	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 13:46:47 -04:00
mazmazz	4ef016e40f	Clear colormaps properly (resolve sigsegv crash)	2018-09-11 13:46:34 -04:00
mazmazz	19fbb177ec	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-11 13:33:31 -04:00
mazmazz	506ce43627	Initialize extra_colormaps to NULL on program start	2018-09-11 13:31:09 -04:00
mazmazz	a818b9a1dc	Remove cr/cg/cb/ca in favor of rgba * Change default colormap values to be in sync with rgba/fadergba	2018-09-11 13:27:04 -04:00
Monster Iestyn	82a26580de	Merge branch 'master' into change-colormap-ldef	2018-09-11 16:43:01 +01:00
Monster Iestyn	fd783f09ea	Merge branch 'public_next' ... # Conflicts: # src/p_setup.c # src/r_data.c	2018-09-11 16:41:27 +01:00
Monster Iestyn	3218ab17e0	Merge branch 'master' into next	2018-09-11 16:34:16 +01:00
mazmazz	9a52816cb4	Use percentage calc instead of interval decrement for tic-based fading	2018-09-11 10:28:24 -04:00
mazmazz	c468451a63	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-11 10:08:13 -04:00
mazmazz	36923ae7b0	Use percentage calc instead of interval decrement for tic-based timing	2018-09-11 10:05:25 -04:00
mazmazz	df4ea79ab7	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 22:37:34 -04:00
mazmazz	b7a216c78b	Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order	2018-09-10 22:37:27 -04:00
mazmazz	36522665c3	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 22:35:45 -04:00
mazmazz	17e101a24b	Add COLORMAPREVERSELIST ifdef to toggle Newest -> Oldest extra_colormaps order	2018-09-10 22:35:26 -04:00
mazmazz	f29acffb19	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 21:57:09 -04:00
mazmazz	43ae25c4fd	Make default extracolormap on init ... * Calc fadedist in R_CreateLightTable	2018-09-10 21:56:57 -04:00
mazmazz	0c4f3cbeca	Merge branch 'colormap-overhaul' into colormap-overhaul-change-ldef	2018-09-10 21:15:44 -04:00
mazmazz	22746c1d91	Savegame fixes	2018-09-10 21:15:34 -04:00
mazmazz	c007dfacec	Savegame fixes	2018-09-10 21:12:56 -04:00
mazmazz	75267dfa2c	Merge remote-tracking branch 'origin/change-colormap-ldef' into colormap-overhaul-change-ldef	2018-09-10 21:06:28 -04:00
mazmazz	3da38f2a9b	Fixed colormap matching code again * Added debug messages for matching code	2018-09-10 20:56:59 -04:00
mazmazz	1e4f5e8d45	Remove MAXCOLORMAPS	2018-09-10 20:41:12 -04:00
mazmazz	8d78c22194	extracolormap_t refinement and netsyncing ... * Store raw values per rgba in extracolormap_t (no maskcolor or fadecolor) * Crunched some UINT16/32 into UINT8 * Calculate mask values in R_CreateLightTable * ifdef out EXTRACOLORMAPLUMPS	2018-09-10 20:36:34 -04:00
mazmazz	c92226890e	Remove bottommap and topmap from savegame because unused	2018-09-10 16:50:35 -04:00
mazmazz	7e9297d06e	Savegame netsync for sector colormaps; add spawn_midmap and co for comparison	2018-09-10 16:50:27 -04:00
mazmazz	7608583c6f	Fix shared colormap matching	2018-09-10 16:42:07 -04:00
mazmazz	53733ddf76	Type 606 renderer check allow OGL again	2018-09-10 16:32:54 -04:00
mazmazz	2701976ba3	Compiler fixes	2018-09-10 16:28:39 -04:00
mazmazz	e0d8a6eec0	Get rid of bottommap, midmap, topmap	2018-09-10 16:16:04 -04:00
mazmazz	574a591d43	P_LoadRawSideDefs2 colormap cleanup (merge ogl and software to one block)	2018-09-10 16:08:43 -04:00
mazmazz	e33ed45b7b	Colormap overhaul in r_data.c ... * Split R_CreateColormap to R_CreateLightTable * Replace extra_colormaps array with next/prev pointer chain * Remove foundcolormaps; instead store lumpnum in extracolormap_t * Add properties to extracolormap_t for portability	2018-09-10 15:59:31 -04:00
mazmazz	fef38acc59	Merge remote-tracking branch 'public-gitlab/colormap-code-cleanup' into colormap-cleanup	2018-09-10 13:24:57 -04:00
PrisimaTheFox	4ada0b0a9e	Update m_anigif.c ... Remember gif_frames starts at 0	2018-09-10 17:12:10 +01:00
PrisimaTheFox	d26ba2ee54	Update m_anigif.c ... More accurate GIF delay.	2018-09-10 17:12:04 +01:00
mazmazz	88d9da79e6	Move tic-based to EFFECT4	2018-09-10 12:00:44 -04:00
mazmazz	acea0bfd68	Move tic-based to EFFECT4, relative calc to EFFECT3	2018-09-10 12:00:15 -04:00
Monster Iestyn	40ff436829	Remove commented out stuff, now I've confirmed everything works fine without them	2018-09-10 15:49:21 +01:00
mazmazz	148e3ff538	Use ML_NOCLIMB for FF_TRANSLUCENT handling in type 452	2018-09-10 10:17:39 -04:00
mazmazz	8e75fe50db	Default to using back offset params if back linedef exists; else fallback to distance-based params	2018-09-10 10:11:27 -04:00
mazmazz	da5a7a013d	Add type 452 Set FOF Alpha ... * Fade FOF moved to type 453 * Stop Fade FOF moved to type 454	2018-09-10 10:09:02 -04:00
mazmazz	02a94dc941	Add distance-based params and make default (ML_DONTPEGBOTTOM to use back offsets)	2018-09-10 09:49:52 -04:00
mazmazz	b8da218b61	Add relative destvalue calc (ML_EFFECT4) ... * rover->alpha init fixes with invisible FOFs	2018-09-10 09:49:00 -04:00
mazmazz	e171e565ce	Remove bottommap and topmap from savegame because unused	2018-09-10 09:03:58 -04:00
mazmazz	002f1bad8f	Savegame netsync for sector colormaps; add spawn_midmap and co for comparison	2018-09-10 09:01:09 -04:00
mazmazz	a6f959ba21	Set mobj->floorrover and ceilingrover in appropriate places	2018-09-10 00:38:07 -04:00
mazmazz	0d88f31bbd	Add floorrover and ceilingrover to precipmobj_t	2018-09-10 00:23:23 -04:00
mazmazz	943dc9412d	Initialize floorrover and ceilingrover on SpawnMobj	2018-09-10 00:20:51 -04:00
mazmazz	832f891cbb	Remove rovernum increment from P_CheckPosition because unused	2018-09-10 00:13:32 -04:00
mazmazz	03d1baf422	Savegame floorrover fixes	2018-09-10 00:07:22 -04:00
mazmazz	5136293f62	Store sectornum/ffloornum as UINT32, not INT32	2018-09-09 23:52:36 -04:00
mazmazz	dd35871699	Savegame netsync for mobj->floorrover and ceilingrrover	2018-09-09 23:48:42 -04:00
mazmazz	f33f9dd284	Replace sectornum/rovernum index vars with ffloor pointers	2018-09-09 23:12:37 -04:00
mazmazz	9cc186441b	Fix fog visual glitch with fading	2018-09-09 22:14:24 -04:00
mazmazz	d01193df80	Apply ~FF_EXISTS moving plat fix for VERTICALFLIP	2018-09-09 21:59:41 -04:00
mazmazz	231f19aaab	Revert "Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists" ... This reverts commit cc11459054, reversing changes made to 7e3d5cd373.	2018-09-09 21:02:43 -04:00
mazmazz	573e1d0017	Replace firsttic with timer increment	2018-09-09 21:01:00 -04:00
mazmazz	0202bbcfd3	Replace firsttic with timer increment	2018-09-09 20:45:12 -04:00
mazmazz	703764d769	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-09 20:18:57 -04:00
mazmazz	3d5f225702	Replace firsttic with decrement timer	2018-09-09 20:18:43 -04:00
mazmazz	ea2276eb07	Fix tic-based bug returning early	2018-09-09 19:57:41 -04:00
mazmazz	43ae628adc	Cap lightlevel fading at spawn_lightlevel (don't make darker)	2018-09-09 19:44:35 -04:00
mazmazz	c3c4a251f1	Added tic-based logic to FOF fade (ML_EFFECT5)	2018-09-09 19:31:32 -04:00
Monster Iestyn	c0bf79ad8e	R_CreateColormap2 and R_MakeColormaps have been made obsolete, it's just R_CreateColormap now, like it used to be! ... With that, I moved R_CreateColormap2's exclusive software colormap malloc code to R_CreateColormap, and merged the two software-only blocks of code into one. I also disabled any unneeded variables and fixed a preprocessor-related goofup	2018-09-09 22:48:09 +01:00
mazmazz	80a4a03f8e	Finalize light level on fade finish (not forced stop) ... * Added destlightlevel property to fade_t * Fixed dotranslucent, dolighting, docollision order weirdness in function calls	2018-09-09 17:20:35 -04:00
mazmazz	368f96e605	Fade FOF lighting fixes; properly calculate destlightvalue	2018-09-09 15:41:30 -04:00
mazmazz	ca58fba24a	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-09 13:44:30 -04:00
mazmazz	aeb45132c5	Revert "Snap light level to software values (32 levels)" ... This reverts commit cc26d03c93.	2018-09-09 13:43:00 -04:00
mazmazz	baababcf0b	Add spawn_lightlevel to sector_t	2018-09-09 12:44:35 -04:00
mazmazz	675f69afea	Flag re-organization ... * Change alternate param flag from BLOCKMONSTERS to DONTPEGBOTTOM * Change tic-based flag from NOCLIMB to EFFECT5	2018-09-09 09:34:36 -04:00
mazmazz	032f95803d	Merge branch 'master' into change-colormap-ldef	2018-09-09 08:40:38 -04:00
mazmazz	5032f783d7	Don't add a thinker if alpha is already equal	2018-09-09 08:10:45 -04:00
mazmazz	3f4656e57e	Polyobject Fade logic	2018-09-09 08:08:48 -04:00
mazmazz	eb590910b2	Added NIGHTSLINK bonus type for the 2.1 Link Bonus	2018-09-09 01:13:02 -04:00
mazmazz	0049f904c0	Add light fading to FadeFakeFloor ... * Declare P_RemoveLighting in header for p_spec.c use	2018-09-08 23:44:29 -04:00
mazmazz	4ca38dc8a1	Merge branch 'lightfade-ticbased' into le-fadefof	2018-09-08 23:03:18 -04:00
mazmazz	cc26d03c93	Snap light level to software values (32 levels) ... * New properties `exactlightlevel` and `lightlevel` in `lightlevel_t`	2018-09-08 23:01:35 -04:00
mazmazz	68e67917f1	Split P_FadeLight into P_FadeLightBySector	2018-09-08 22:14:49 -04:00
mazmazz	1e1b01c157	Implemented tic-based light fading ... * ML_BLOCKMONSTERS specifies destvalue and speed by texture offsets * ML_NOCLIMB toggles tic-based logic * Added props `duration`, `interval`, and `firsttic` to `lightlevel_t`	2018-09-08 22:10:51 -04:00
mazmazz	81acf82e99	Re-render lighting when setting FF_EXISTS	2018-09-08 20:49:32 -04:00
mazmazz	069cc480c1	Add dolighting flag to FadeFakeFloor thinker	2018-09-08 20:41:45 -04:00
mazmazz	3eb7c3931e	When detecting invisible FOFs, don't include light blocks	2018-09-08 20:08:48 -04:00
mazmazz	3858a93cfa	Initialize invisible FOF alpha to 1 on first fade	2018-09-08 09:31:23 -04:00
mazmazz	fa0918c2f1	Handle rendering flags for invisible FOFs	2018-09-08 09:08:32 -04:00
mazmazz	fcc7180d5c	Enable FF_CUTSOLIDS handling and updating by sector->moved	2018-09-08 08:59:17 -04:00
mazmazz	47c9bf2ebc	Disable FadeFakeFloor for laser block	2018-09-08 01:33:12 -04:00
mazmazz	dc964738eb	Never handle FF_EXISTS if FF_BUSTUP	2018-09-08 01:23:15 -04:00
mazmazz	66dc84509a	Fix Mario block triggering during ghost fade	2018-09-08 01:12:34 -04:00
mazmazz	b629104197	Also check for FF_SOLID	2018-09-08 01:07:08 -04:00
mazmazz	cc11459054	Merge branch 'random-fof-fixes' into fof-fixes-movingplatexists	2018-09-08 00:37:04 -04:00
mazmazz	7e3d5cd373	Comment out tmfloorrover and tmceilingrover because unused	2018-09-08 00:36:43 -04:00
mazmazz	76d7a54b2b	Fix player Z snap to floor on moving platform ~FF_EXISTS ... * Track player's old floorz by mo->floor_sectornum and floor_ffloornum * Track tmfloorz by tmfloorrover, tmfloor_sectornum, tmfloor_rovernum * Ceiling variants of the above	2018-09-08 00:34:56 -04:00
mazmazz	f52f72256b	Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS	2018-09-07 18:14:52 -04:00
Monster Iestyn	316c08bbbb	Merge branch 'netcode-nitpicking' into 'next' ... Netcode nitpicking See merge request STJr/SRB2!274	2018-09-07 15:59:49 -04:00
mazmazz	0b365d0d08	Initial polyobj fade skeleton	2018-09-07 15:27:18 -04:00
mazmazz	49b27fc124	Deduct marescore immediately on instakill ... * Deduct player->spheres too, missed that one	2018-09-07 08:19:22 -04:00
mazmazz	c50a0d60f5	Merge branch 'master' into nights-keeppoints	2018-09-07 08:13:57 -04:00
mazmazz	4147773d0c	Merge branch 'master' into le-fadefof	2018-09-06 18:12:24 -04:00
mazmazz	9e5b9ac50e	Flicky colors indexing fix	2018-09-06 13:20:55 -04:00
mazmazz	956d48b5e0	Compiler errors	2018-09-06 13:16:50 -04:00
mazmazz	bd6bc368a3	Stray comments	2018-09-06 12:13:03 -04:00
mazmazz	1c273cdcc8	Make default flicky home radius 384	2018-09-06 11:59:55 -04:00
mazmazz	e75213b14d	Limit random fish color to SRB2's defaults	2018-09-06 11:56:55 -04:00
mazmazz	f15bb2dfba	Change default radius to 448 ... * Put default radius back in FLICKY_CENTER states	2018-09-06 11:54:06 -04:00
mazmazz	0c2340b0bc	Impose home radius on aimless flickies; improve randomness of flickyhitwall angle	2018-09-06 11:17:08 -04:00
mazmazz	f8d260b044	Only allow flicky bounce (MF_NOCLIPTHING) if also in-place (MF_GRENADEBOUNCE)	2018-09-06 10:32:26 -04:00
mazmazz	7d834ff894	Erase default home radius from states and impose default on home check	2018-09-06 10:20:01 -04:00
mazmazz	2cfd941778	Re-organize flags for FLICKY_CENTER ... * Flickies can be in-place with just one flag (MF_GRENADEBOUNCE) * Flickies can now hop whether orbiting, aimless, or in-place * Removed ability to customize movedir for orbit; will always be random * Removed ability to customize gravity sink for aimless flying flickies * Misc: Use P_SetTarget to set actor->tracer for flicky center	2018-09-06 10:17:41 -04:00
mazmazz	fe2d1e9020	Merge branch 'master' into flicky-things	2018-09-06 08:09:02 -04:00
mazmazz	f000a68150	Impose default radius for orbiting flickies	2018-09-06 08:08:53 -04:00
mazmazz	21a55a4702	Make default behavior: aimless flying flickies stay at Z height	2018-09-06 08:07:13 -04:00
mazmazz	956b83729b	Store extravalue1 (home radius) immediately in A_FlickyCenter, not during player look routine	2018-09-06 07:55:15 -04:00
mazmazz	e5dd74eb45	Change flicky thing #s to 2200s	2018-09-06 07:24:46 -04:00
Monster Iestyn	16c7c264a5	Wrap the text and snap to bottom	2018-09-04 19:52:50 +01:00
Monster Iestyn	bffaafd61e	Add V_DrawTutorialBack for drawing a console-like background box, add Lorem ipsum as filler test	2018-09-04 19:21:58 +01:00
Monster Iestyn	df51997022	Merge branch 'master' into tutorial-time	2018-09-04 17:06:50 +01:00
Monster Iestyn	2b0ce807c7	Fix mixed d+c in NiGHTS trigger code, fix stray "INT8" in A_ConnectToGround	2018-09-04 17:04:24 +01:00
Monster Iestyn	aba9bd13bb	Add "tutorialmode" var to help the game know when we're in a tutorial or not, add placeholder for tutorial HUD to test it works	2018-09-04 16:58:49 +01:00
Monster Iestyn	bcc9e58d0e	Merge branch 'master' into tutorial-time	2018-09-04 15:54:50 +01:00
Monster Iestyn	2ac50cd2b7	Merge branch 'public_next' ... # Conflicts: # src/r_main.c	2018-09-04 15:53:07 +01:00
Monster Iestyn	38ac999d77	Merge branch 'addfile-verify-fix' into 'next' ... Addfile command verify fix. See merge request STJr/SRB2!272	2018-09-03 17:17:46 -04:00
Monster Iestyn	ea06e8a62b	SOCK_Send: Split the actual sending data parts into a new function, SOCK_SendToAddr, to make everything look a bit neater in general	2018-09-03 20:53:40 +01:00
Monster Iestyn	7b083f07cd	UDP_Socket: I doubt client addresses are meant to be included in the total for broadcast addresses	2018-09-03 15:56:02 +01:00
Monster Iestyn	846bddfdcf	SOCK_Send: Fix what appears to be a mistaken use of i instead of j	2018-09-03 15:52:22 +01:00
Monster Iestyn	24aafa6dac	UDP_Socket: Add missing limit checks for s, for client and broadcast addresses	2018-09-03 15:43:36 +01:00
Digiku	01314b6674	Merge branch 'nightsplus-le' into 'master' ... NiGHTS Linedef Executor Triggers Closes #102 See merge request STJr/SRB2Internal!142	2018-09-02 18:10:50 -04:00
Monster Iestyn	6ae78da47e	Merge branch 'master' into next	2018-09-02 13:00:56 +01:00
Steel Titanium	54fec7fa5c	Merge branch 'master' into addfile-verify-fix	2018-09-01 19:33:59 -04:00
Monster Iestyn	322da62b3c	Fix HOM removal not working properly for non-green resolutions	2018-08-31 17:14:44 +01:00
Steel Titanium	0f5d685d1f	Only do this if the admin player isn't the server host also.	2018-08-30 18:32:26 -04:00
mazmazz	fed72c344a	Dummy out NiGHTS item faster attract	2018-08-30 10:50:03 -04:00
mazmazz	dae37e2749	Drill mash penalty fix	2018-08-30 09:09:19 -04:00
mazmazz	a44be49535	Merge remote-tracking branch 'origin/master' into nights-inufixes	2018-08-30 08:13:34 -04:00
Monster Iestyn	523a02aa54	Merge branch 'master' into hud-cleaning	2018-08-29 20:46:35 +01:00
Monster Iestyn	1c5080151d	Fix typo introduced by changes to the setrings command	2018-08-29 20:46:08 +01:00
Monster Iestyn	a48326383c	Merge branch 'master' into hud-cleaning ... # Conflicts: # src/y_inter.c	2018-08-29 16:39:02 +01:00
mazmazz	6d97a10273	Merge remote-tracking branch 'origin/master' into nightsplus-le	2018-08-29 11:06:00 -04:00
mazmazz	dc86fe9b5f	Merge remote-tracking branch 'origin/master' into nightsplus-laplogic	2018-08-29 10:16:49 -04:00
Digiku	e0601616fe	Merge branch 'nights-bumper-fix' into 'master' ... NiGHTS: Fix player positioning when touching Bumper See merge request STJr/SRB2Internal!165	2018-08-29 06:02:24 -04:00
Digiku	a28cc10861	Merge branch 'op-nights-bumper' into 'master' ... Objectplace: Place NiGHTS Bumpers with the player's fly angle See merge request STJr/SRB2Internal!166	2018-08-29 06:01:27 -04:00
Digiku	f8332f6765	Merge branch 'nights-nightserizeangle' into 'master' ... NiGHTS: Reset player another/flyangle on De/Nightserize See merge request STJr/SRB2Internal!139	2018-08-29 04:27:02 -04:00
Digiku	4882b7c3f8	Merge branch 'intermission-bonuslivesmax' into 'master' ... Intermission: MaxBonusLives level header option for # of lives in score tally See merge request STJr/SRB2Internal!162	2018-08-29 04:25:03 -04:00
Digiku	9746442a93	Merge branch 'le-ringspheres' into 'master' ... Line Execs: Make Ring triggers accept spheres in NiGHTS levels See merge request STJr/SRB2Internal!163	2018-08-29 04:24:47 -04:00
Digiku	78c78d9e63	Merge branch 'sphere-ring-concurrence' into 'master' ... Change SETSPHERES console command to SETRINGS to handle player->spheres transparently See merge request STJr/SRB2Internal!167	2018-08-29 04:24:23 -04:00
Monster Iestyn	58a844d3cf	Merge branch 'public_next' ... # Conflicts: # src/r_things.c # src/v_video.c	2018-08-28 19:31:08 +01:00
Monster Iestyn	61836e1565	Merge branch 'master' into next	2018-08-26 21:10:41 +01:00
toaster	710550bb9d	Missed one!	2018-08-26 12:38:53 +01:00
Monster Iestyn	d5ab3e75a5	Merge branch 'v_video_killed_the_r_radio_star' into 'master' ... v_video Killed The r_radio Star See merge request STJr/SRB2!270	2018-08-25 16:43:25 -04:00
Monster Iestyn	ed5bed4d2c	Merge branch 'zalloc_potter_and_the_death-free_hallows' into 'master' ... Zalloc Potter and the Death-Free Hallows See merge request STJr/SRB2!269	2018-08-25 16:43:14 -04:00
toaster	85474e33dd	Introduce a temporary measure to enable the old stuff, minus one of the most obviously terrible bugbears of yesteryear. Let it be known that any downstream poirt will almost certainly toggle this ASAP.	2018-08-25 21:17:34 +01:00
toaster	80ac2366ba	Clean up a bunch of v_video.c functions that previously exhibited unfortunate side effects when run in non-green resolutions. ... * V_DrawFixedPatch and ilk: * Change the offset of V_FLIP so it's not one screen-pixel off where its non-flipped sprite would have started being drawn from. * Write to x and y as well as desttop so that anti-screen-overflow checks later in the function behave properly with non-green resolutions. * V_DrawFill: * Reduce number of operations performed upon `c`. * V_DrawString and ilk: * Offset the left and right boundary checks in non-green resolutions such that you can actually draw stuff to the left of basevid screen x coordinate 0.	2018-08-25 19:52:17 +01:00
Digiku	cddb743fe1	Merge branch 'op-nightshoop' into 'master' ... NiGHTS objectplace: Place new hoop 1713 instead of 1705 See merge request STJr/SRB2Internal!136	2018-08-25 13:23:51 -04:00
toaster	91eb248e46	Fix up them there ghosts! ... * Stop orphaning their memory. They ARE PU_LEVEL, so they'll disappear eventually, but, like... it's not good memory management practice to just *orphan* them when you're literally never going to do anything with them ever again. Y'know? * Make ghosts spawn properly on slopes.	2018-08-25 17:11:49 +01:00
toaster	973b3c3f5e	Continuing my recent streak of making random lighting/colormap-related fixes to long-standing bugs: ... * Fix that thing where ALL transparent FOF planes were continuously fullbright unless encased in a fog which disables sprite fullbrightness, which was long-hated by many people in the community! * For backwards compatibility, setting flag 1 in that fog field (which is probably the most common "in-the-wild" usage of this feature) will continue to make objects un-fullbright. * For situations where you desperately want the behaviour to be enabled, you can apply fog flag 2. * Change the fadestart and fadeend range in which colormaps are generated. * The problem HERE was that the darkest light level reached by generated colormaps was actually slightly brighter than the darkest level reached by normal colormaps. * The typo I fixed does have SOME basis in fact - standard colormap lumps are 34 (33 in 0-indexing) long rather than 32 (31), but whoever wrote this didn't realise that the code for generating them didn't do it DooM style, just bright-to-dark with no extras on the end...	2018-08-25 16:46:45 +01:00
wolfy852	6ddee877c5	Expose NEWTICRATE and NEWTICRATERATIO to Lua ... This should keep 70FPS-compatible scripts from throwing nil value errors.	2018-08-25 03:40:43 -05:00
Monster Iestyn	aee7dce891	Rewrite seenames HUD code even more; use text color flags rather than the special text color chars	2018-08-23 23:00:15 +01:00
Monster Iestyn	011459790f	Add INFLIVES as a constant that Lua/SOC can use	2018-08-23 22:18:52 +01:00
Monster Iestyn	e2c280504b	Make switch case for cv_seenames.value in ST_Drawer	2018-08-23 22:09:48 +01:00
Monster Iestyn	6a88a65b94	Add quick macro for drawing the 1st person timer icons with timer string, add comments to ST_drawPowerupHUD	2018-08-23 22:00:37 +01:00
Monster Iestyn	0948b12eae	ST_drawNiGHTSHUD tweaks: Split NiGHTS link drawing into its own function, remove "minlink" hack and just do things properly	2018-08-23 21:13:45 +01:00
Monster Iestyn	d2a4408610	Make switch case for stplyr->textvar in ST_drawNightsRecords	2018-08-23 20:27:40 +01:00
Monster Iestyn	aa863e481e	Add INFLIVES macro, to make it easier to find infinite lives-related code	2018-08-23 20:09:39 +01:00
Monster Iestyn	e37f6585fa	Merge branch 'master' into tutorial-time	2018-08-22 21:30:29 +01:00
Monster Iestyn	f8c4c6dbc4	Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125	2018-08-22 17:16:11 +01:00
Monster Iestyn	e88ebb6f75	Merge branch 'master' into tutorial-time	2018-08-21 15:41:35 +01:00
Monster Iestyn	87e37e21df	Merge branch 'public_next' ... # Conflicts: # src/sdl12/i_cdmus.c # src/win32ce/win_cd.c	2018-08-21 15:40:54 +01:00
Monster Iestyn	2daaf637d9	Merge branch 'master' into next	2018-08-21 15:36:36 +01:00
Monster Iestyn	9d3aad9036	Merge branch 'XPMupdate' into 'master' ... update XPM icon See merge request STJr/SRB2!267	2018-08-21 10:31:25 -04:00
Monster Iestyn	dcf843e485	Merge branch 'defaultsoundvol' into 'master' ... Change default sound volume See merge request STJr/SRB2!238	2018-08-20 09:41:04 -04:00
mazmazz	4b07246565	Add "finalize" flag to Type 453 Stop Fade	2018-08-18 06:04:11 -04:00
mazmazz	773d8bdb8d	P_ResetFakeFloorFader: Unclamp rover->alpha from software levels	2018-08-18 05:31:41 -04:00
mazmazz	d94608fa10	Add alpha clamping so OpenGL conforms to Software's translucent levels	2018-08-17 17:07:07 -04:00
mazmazz	bf5efe6457	Cleanup fade fake floor code	2018-08-17 15:59:34 -04:00
mazmazz	45ae6efbad	Refactor function and variable names; change defaults for fake floor fader line flags	2018-08-17 15:25:25 -04:00
mazmazz	020b18b84b	Revised and re-organized P_DoFakeFloorAlpha fading procedure ... * dosolid routine now refers to spawnflags	2018-08-17 14:49:33 -04:00
Digiku	e943259057	Remove unnecessary totalring deduction condition ... Because it would be triggered by !(maptol & TOL_NIGHTS) in the old code anyway	2018-08-17 09:11:59 -04:00
Digiku	792360ea97	Revert "Checkpoint (unfinished): player->totalsphere" ... This reverts commit 6a0175147f	2018-08-17 09:09:10 -04:00
mazmazz	677f19ede6	Move fading thinker to ffloor_t.fadingdata	2018-08-17 02:28:52 -04:00
mazmazz	2e252cb905	Move fadingdata (fade_t thinker) to line_t	2018-08-17 01:11:04 -04:00
mazmazz	cf853e3982	Merge branch 'le-fadefof-remove-storedthinker' into le-fadefof	2018-08-16 23:38:03 -04:00
mazmazz	931297e2d7	Rename dofadeinonly to doghostfade ... * Ghost fading: when transitioning to/from alpha=0, don't set solid/tangibility until fade is finished	2018-08-16 22:27:26 -04:00
mazmazz	e8c221f691	Place backwards Bumpers with the correct Thing angle	2018-08-16 22:07:53 -04:00
Monster Iestyn	b63290211a	Merge branch 'master' into next	2018-08-16 22:04:00 +01:00
Monster Iestyn	a4cfa9e82a	Merge branch 'lua-sector-names-fix' into 'next' ... Lua sector names fix See merge request STJr/SRB2!263	2018-08-16 16:57:41 -04:00
Monster Iestyn	364339e1ce	Merge branch 'sdl_mixer_fixes' into 'master' ... SDL Mixer fixes Closes #31 See merge request STJr/SRB2!260	2018-08-16 16:57:14 -04:00
mazmazz	18b6b53722	Adjust vertical angle and forwards/backwards of NiGHTS bumper in objectplace	2018-08-16 16:51:48 -04:00
mazmazz	6a0175147f	Checkpoint (unfinished): player->totalsphere	2018-08-16 13:11:32 -04:00
mazmazz	7474e073f8	Change SETRINGS to support player->spheres in NiGHTS	2018-08-16 12:13:57 -04:00
mazmazz	03c4a626c3	Line from revert	2018-08-16 11:35:35 -04:00
mazmazz	365a59f186	Revert "SETSPHERES console command for debugging/cheating" ... This reverts commit 4cb7036f51.	2018-08-16 11:34:57 -04:00
mazmazz	08f35c0792	Don't apply autobrake on NiGHTS bumpers	2018-08-15 23:40:42 -04:00
mazmazz	432c1ab862	Also center non-NiGHTS players on NiGHTS bumpers	2018-08-15 19:09:54 -04:00
mazmazz	67da64a064	Use more efficient position setting. For Z, also adjust for bumper mobj scale.	2018-08-15 18:50:28 -04:00
mazmazz	55d2da2201	Fix NiGHTS Bumper player positioning	2018-08-15 18:42:20 -04:00
mazmazz	61c84be704	Fix bonus time quirk where lines are run if player->marebonuslap is 0 ... * Bonus laps start at 1, so if a line is looking for bonus laps, they should only be run at >= 1.	2018-08-14 16:08:21 -04:00
mazmazz	c3703cfc24	Comments	2018-08-14 14:57:58 -04:00
mazmazz	efdf684770	Fix Capsule Entrance exec firing repeatedly	2018-08-14 12:48:00 -04:00
mazmazz	3f312ce114	Make Bonus Time Start executor into a general Egg Capsule Touch executor ... * Entrance/exit flags * Enough/not-enough-rings flags (with "doesn't matter" line option)	2018-08-14 12:00:37 -04:00
mazmazz	8c57218027	Alternate take on pre-blowup: Do it on first touching tic, instead of first ring pop ... * Use MT_EGGCAPSULE extravalue2 for tic timer	2018-08-14 11:41:10 -04:00
mazmazz	1cb68a615e	Make LE Ring triggers accept spheres for NiGHTS levels	2018-08-14 11:10:10 -04:00
mazmazz	62a6fe845d	Add ML_BOUNCY flag to Bonus Time executor to execute BEFORE the capsule is destroyed and player has enough spheres	2018-08-14 10:48:50 -04:00
mazmazz	d53582596f	Preproc comment out Y_SetLinkBonus because unused	2018-08-14 10:20:56 -04:00
mazmazz	841c31a6ba	Attach fade_t thinker to proper control sector upon savegame load	2018-08-13 22:17:58 -04:00
mazmazz	004cbe6a3d	Whitespace	2018-08-13 22:10:16 -04:00
mazmazz	ca84e7265e	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof	2018-08-13 14:47:57 -04:00
mazmazz	d8c565407c	MaxBonusLives level header option for # of lives in score tally	2018-08-13 14:17:38 -04:00
mazmazz	f1fc205b31	Deduct marescore when player hits ground ... * ~~For speedrunning~~: Land on the Drone, keep your points!	2018-08-13 11:12:53 -04:00
mazmazz	c3e0267029	Fix attraction bug on non-NiGHTS and Nightopian Helper ... * Switch from mo->movecount to mo->movefactor for type compat * Adjust timings for regular and paraloop attraction	2018-08-12 23:03:12 -04:00
mazmazz	296d527993	Merge nightsplus-laplogic	2018-08-12 21:20:14 -04:00
mazmazz	d3001db9dc	Merge from nights-score and use Lap Bonus instead of Link Bonus ... * One BONUSTYPE = NIGHTS option instead of several * Use NiGHTS Bonus for special stages, not Link Bonus	2018-08-12 20:56:57 -04:00
mazmazz	54343bc05f	Change special stage bonus to NiGHTS in-level score, per MB	2018-08-12 20:36:53 -04:00
mazmazz	89f57cb111	Have just one NiGHTS bonus option: NIGHTS and LINK together	2018-08-12 20:25:35 -04:00
mazmazz	fcd6b16646	Make lap bonus more valuable	2018-08-12 20:08:40 -04:00
mazmazz	30fa526f6f	Merge branch 'nightsplus-laplogic' into nights-score-lap	2018-08-12 19:59:58 -04:00
mazmazz	0c8e2ffd78	Totalmarescore typo	2018-08-12 19:59:41 -04:00
mazmazz	ec8d264029	totalmarescore player variable for NiGHTS scoring ... # Conflicts: # src/p_setup.c	2018-08-12 19:59:34 -04:00
mazmazz	5938a57970	totalmarelap and totalmarebonuslap player variables	2018-08-12 19:57:33 -04:00
mazmazz	fe904b0eb2	NiGHTS lap score bonus	2018-08-12 19:48:45 -04:00
mazmazz	0c0a403bb3	Merge branch 'nightsplus-laplogic' into nights-score-lap ... # Conflicts: # src/p_setup.c	2018-08-12 19:39:31 -04:00
mazmazz	feadcbfc94	BONUSTYPE typo; bonus alignment	2018-08-12 19:32:11 -04:00
mazmazz	372fc540bc	Totalmarescore typo	2018-08-12 19:26:18 -04:00
mazmazz	30d57eac79	NiGHTS bonus implementation	2018-08-12 19:25:21 -04:00
mazmazz	61999100e5	totalmarescore player variable for NiGHTS scoring	2018-08-12 19:21:55 -04:00
mazmazz	4e02171c23	Add lapbegunat and lapstartedtime player variables ... There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.	2018-08-12 14:21:26 -04:00
mazmazz	02d5e4e902	MT_FLICKY_CENTER flag adjustments	2018-08-12 12:49:23 -04:00
Monster Iestyn	0da21244c0	Added "Tutorialmap" MainCfg option for SOC	2018-08-12 14:30:49 +01:00
mazmazz	2f6c0d7e4e	Make Flicky color, move direction, and flags configurable by A_FlickyCenter var1	2018-08-12 09:23:50 -04:00
Nev3r	f19b7bfacf	Merge branch 'horizon-line-hom-fix' into 'master' ... Horizon line HOM fix See merge request STJr/SRB2Internal!152	2018-08-12 03:48:20 -04:00
mazmazz	f4a813891f	Decouple Flicky Thing logic from spawnpoint variables; use mobj variables	2018-08-12 02:34:37 -04:00
Monster Iestyn	51b8d6e01a	Make "Tutorial" warp directly to MAPZ0 (not configurable yet)	2018-08-11 21:17:52 +01:00
Monster Iestyn	0b88c364bc	Add "Tutorial" to the 1P menu, above "Start Game". It doesn't actually do anything yet, mind! ... Also, change said menu's def to start at "Start Game" when entering it for the first time.	2018-08-11 18:01:54 +01:00
Steel Titanium	d9c7334dea	Fix white being treated as transparent.	2018-08-10 19:02:03 -04:00
mazmazz	c72e724122	Merge branch 'nightsplus-laplogic' into nightsplus-le ... # Conflicts: # src/p_map.c # src/p_setup.c	2018-08-10 17:24:12 -04:00
mazmazz	872761e258	Add lapbegunat and lapstartedtime player variables ... There is no lapfinishedtime because [mare]finishedtime refers to when Egg Capsule is destroyed. That concept does not apply to laps.	2018-08-10 17:12:26 -04:00
Alam Ed Arias	3479310546	SDL: update IMG_xpm.c	2018-08-10 17:09:11 -04:00
mazmazz	18b5b70822	Add lastmarelap and lastmarebonuslap player variables	2018-08-10 16:30:49 -04:00
mazmazz	d58445fdf3	Set player->finishedrings upon new mare ... (Forgot this line from the player->spheres merge, so let's straggle here)	2018-08-10 16:17:28 -04:00
mazmazz	f69f102531	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le ... # Conflicts: # src/p_map.c # src/p_setup.c	2018-08-10 15:51:20 -04:00
Monster Iestyn	30e4d2cd51	Merge branch 'polyobj-sky-plane-crash-fix' into 'master' ... Polyobject sky plane crash fix See merge request STJr/SRB2Internal!146	2018-08-10 15:40:43 -04:00
mazmazz	1b922b8ba5	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic ... # Conflicts: # src/p_map.c # src/p_setup.c	2018-08-10 15:10:26 -04:00
Monster Iestyn	a5510cab5d	Merge branch 'master' into polyobj-sky-plane-crash-fix	2018-08-10 20:06:12 +01:00
Monster Iestyn	8d0a44899a	Merge branch 'master' into change-colormap-ldef	2018-08-10 20:05:04 +01:00
Monster Iestyn	d7830dfff4	Merge branch 'master' into horizon-line-hom-fix	2018-08-10 20:04:39 +01:00
mazmazz	7f4e2a6164	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into op-nightshoop	2018-08-10 15:04:14 -04:00
Monster Iestyn	55fd60b29b	Merge branch 'master' into leveltitle-tinkering ... # Conflicts: # src/hu_stuff.h	2018-08-10 20:03:59 +01:00
mazmazz	b8eb282367	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof-remove-storedthinker	2018-08-10 15:03:07 -04:00
mazmazz	508e1a2595	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into le-fadefof	2018-08-10 15:02:43 -04:00
mazmazz	d405bdfd9b	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nights-inufixes	2018-08-10 15:00:41 -04:00
mazmazz	07c882139b	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into flicky-things	2018-08-10 14:58:27 -04:00
Monster Iestyn	fa382c0233	Merge branch 'public_next'	2018-08-10 19:36:51 +01:00
Monster Iestyn	7ee9c5b0f4	Merge branch 'master' into next	2018-08-10 19:31:15 +01:00
Digiku	a439dce584	Merge branch 'hardcoding-nights-spheredamage' into 'master' ... NiGHTS: Handle sphere damage correctly upon timeout * Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP * Handle player->spheres and player->rings consistently See merge request STJr/SRB2Internal!157	2018-08-10 13:50:57 -04:00
Digiku	ed99f3a425	Merge branch 'nights-invertloopfix' into 'master' ... NiGHTS fix lap detection on inverted axis See merge request STJr/SRB2Internal!138	2018-08-10 13:49:42 -04:00
mazmazz	d97c25f6dd	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-le ... # Conflicts: # src/p_setup.c # src/p_user.c	2018-08-10 13:44:47 -04:00
mazmazz	487c62fe31	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into nightsplus-laplogic ... # Conflicts: # src/p_setup.c	2018-08-10 13:35:59 -04:00
mazmazz	672e196aa4	Pandora's Box support for player->spheres ... Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.	2018-08-10 13:15:54 -04:00
MascaraSnake	04063ba3a2	Merge branch 'hardcoding-time-again' into 'master' ... Hardcoding time again See merge request STJr/SRB2Internal!130	2018-08-10 13:14:53 -04:00
mazmazz	4cb7036f51	SETSPHERES console command for debugging/cheating ... Fixed sphere spill bug where no spheres spill if player->rings is 0	2018-08-10 13:06:53 -04:00
mazmazz	5115097dc2	Make bigger default Flicky follow trigger from 128 radius to 320 radius	2018-08-10 04:24:14 -04:00
mazmazz	bd8316f49b	Track player's previous mare rings with player->finishedrings. ... There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.	2018-08-10 04:05:20 -04:00
mazmazz	b05960431d	Reset player->rings on denightserize and on new mare	2018-08-10 04:01:33 -04:00
mazmazz	14c17cf012	Tag damage fix error	2018-08-10 02:34:21 -04:00
mazmazz	62e288a664	Correct player->spheres deduction upon losing spheres ... player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level. Therefore, just deduct player->spheres.	2018-08-10 02:18:34 -04:00
mazmazz	e0f6dee8be	MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP implementation	2018-08-10 02:18:24 -04:00
mazmazz	fe61678437	MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP entries	2018-08-10 02:18:20 -04:00
mazmazz	09f4309f45	Standardize NiGHTS link timer w/ NightsLinkTics MAINCFG option	2018-08-09 23:14:14 -04:00
mazmazz	b28183129f	NiGHTS drill meter penalty when mashing jump button ... Thanks Inuyasha (KS) for code	2018-08-09 22:15:13 -04:00
mazmazz	bf74b81842	Snappier NiGHTS pickup attraction ... * Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug. * Thanks Inuyasha (KS) for original code 🐶	2018-08-09 21:24:01 -04:00
mazmazz	5eafebe4d4	A_FlickyCenter implementation - now Flickies can be attracted to players! ... * Changed default movement to attraction, vs. aimless * Flickies spawned from this will always have the FLICKY_CENTER mobj as its target * Use P_IsFlickyCenter to identify FLICKY_CENTER mobjs versus players * FLICKY_CENTER mobj tracer points to the spawned Flicky * Thanks toaster for the original code~~	2018-08-09 17:28:37 -04:00
toaster	145c050e14	...and R_DrawTranslucentSplat_8, even though it isn't used!	2018-08-09 17:08:20 +01:00
mazmazz	38eae01400	MT_FLICKY_x_CENTER defs	2018-08-09 12:08:06 -04:00
toaster	5daeaf529f	Apply the double-colormap ordering fix to R_DrawTiltedTranslucentSpan_8 as well.	2018-08-09 16:56:43 +01:00
mazmazz	904ff6fccb	Choose Flicky Fish Color by Thing Parameter	2018-08-09 04:19:18 -04:00
mazmazz	f7c80f3980	Make standing flickies bounce if MTF_AMBUSH and not MTF_OBJECTSPECIAL	2018-08-09 02:55:22 -04:00
mazmazz	9127a835c1	Flicky stand animation fixes	2018-08-09 02:27:25 -04:00
mazmazz	abbc7631cd	Flicky stand implementation by MTF_AMBUSH ... * MTF_OBJECTSPECIAL: Set no gravity for flicky	2018-08-09 02:08:25 -04:00
mazmazz	d5f32cc0e5	Flicky stand states	2018-08-09 01:44:21 -04:00
mazmazz	db7bc927e7	Mapthingnums for MT_SECRETFLICKYies	2018-08-09 01:01:20 -04:00
mazmazz	292654e498	Fix FlickyFly momentum on MTF_OBJECTSPECIAL	2018-08-09 00:57:35 -04:00
mazmazz	332136b9bf	Assign mapthingnums to MT_FLICKY ... * Type # 570-585	2018-08-09 00:17:46 -04:00
mazmazz	fc2517d8e2	FlickyFly: Configure gravity by MTF_AMBUSH	2018-08-09 00:13:08 -04:00
Monster Iestyn	10a2ba8d39	Merge branch 'master' into next	2018-08-07 20:54:19 +01:00
toaster	ecc9ebe8c1	Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice). ... Please note I haven't touched the ASM equivalent, given as it's not actually used.	2018-08-07 19:12:10 +01:00
Monster Iestyn	c703bc2fd7	Trim off any extra null bytes off the end of sector floorpic/ceiling when you access them in Lua	2018-08-06 22:37:44 +01:00
Monster Iestyn	02d2b61866	Merge branch 'master' into next	2018-08-06 15:15:35 +01:00
Monster Iestyn	2738f3a537	Rewrite archiving/unarchiving of Lua strings for netgames. ... This now means: * Lua strings longer than 1024 chars can now be read properly without awful crashes * Lua strings with embedded zeros can be written/read without truncating anything (hopefully)	2018-08-05 22:02:20 +01:00
Monster Iestyn	8d622ff6f8	Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server!	2018-08-05 20:17:30 +01:00
MascaraSnake	21cb0cab3c	Reorganized the thing type numbers	2018-08-03 23:58:11 +02:00
Monster Iestyn	83d87c343b	Fix Cacolantern's preparing sound being played everywhere across the map ... (or, in other words, fixing this to be the same as the equivalent state in the original SOC)	2018-08-02 16:15:30 +01:00
Monster Iestyn	b5ec286667	Merge branch 'master' into hardcoding-time-again	2018-08-02 16:04:54 +01:00
Monster Iestyn	d1b45c72b9	Merge branch 'pk3-wad-map-noreload-hotfix' into 'master' ... PK3 WAD Map NoReload hotfix See merge request STJr/SRB2Internal!148	2018-07-31 14:43:14 -04:00
Monster Iestyn	be5d0406bd	Merge branch 'public_next' ... # Conflicts: # src/hardware/hw_md2.c	2018-07-31 19:41:54 +01:00
Monster Iestyn	74646052b0	Merge branch 'master' into next	2018-07-31 19:36:30 +01:00
Monster Iestyn	485d990949	Merge branch 'gme-lowvolume-fix' into 'master' ... GME low volume fix See merge request STJr/SRB2!248	2018-07-31 14:35:32 -04:00
Monster Iestyn	16999b7080	Merge branch 'gme-pause' into 'master' ... Fix pausing on gme See merge request STJr/SRB2!251	2018-07-31 14:33:56 -04:00
Steel Titanium	c02ee9a502	Re-did this fix.	2018-07-28 01:58:25 -04:00
Monster Iestyn	c88bbda028	fix visual studio complaining about negating an unsigned var	2018-07-25 22:19:07 +01:00
Alam Ed Arias	79e4c3760a	Merge branch 'master' into next	2018-07-20 17:35:53 -04:00
Alam Ed Arias	1ee7eda0ad	Fixup PROFILEMODE	2018-07-20 17:35:18 -04:00
Monster Iestyn	6b1fa399dc	Use plain malloc instead of Z_Malloc to allocate sound buffers in mixer_sound.c's I_GetSfx. ... This should prevent I_FreeSfx making a mess of things later, hopefully.	2018-07-14 18:15:59 +01:00
Monster Iestyn	90ebce0557	Merge branch 'master' into fof-slope-skew-backport	2018-07-11 21:38:09 +01:00
Monster Iestyn	a06ef26149	Merge branch 'master' into next	2018-07-11 21:37:23 +01:00
Monster Iestyn	8e19611033	Merge branch 'opengl-fof-lowerunpegged' into 'master' ... OpenGL: FOF walls + Lower unpegged See merge request STJr/SRB2!258	2018-07-11 16:36:26 -04:00
Monster Iestyn	09ae0aae53	Merge branch 'master' into next	2018-07-11 21:18:39 +01:00
Monster Iestyn	c127ea3ceb	Merge branch 'opengl-projectsprite-fix' into 'master' ... OpenGL HWR_ProjectSprite fix See merge request STJr/SRB2!255	2018-07-11 16:15:42 -04:00
Monster Iestyn	2cd2b6bf10	Backport Kart Krew's fix for the 1px HOM with horizon lines	2018-07-08 22:30:37 +01:00
colette	0a931a1364	Update f_finale.c	2018-07-07 20:20:46 -04:00
Alam Ed Arias	17570c1ad6	Merge branch 'master' into next	2018-07-07 16:42:50 -04:00
Alam Arias	a79b9a9127	Update m_misc.c	2018-07-07 20:41:11 +00:00
Alam Arias	7da6aca450	Update m_misc.c	2018-07-07 20:33:19 +00:00
Monster Iestyn	f1bba60373	Merge branch 'md2-fopen-error' into 'master' ... More helpful error messages See merge request STJr/SRB2!243	2018-07-06 14:38:59 -04:00
Monster Iestyn	130de10f97	Merge branch 'md2-smoother-interpolation' into 'master' ... Smoother MD2 interpolation See merge request STJr/SRB2!224	2018-07-06 14:38:37 -04:00
GoldenTails	761a221840	Merge remote-tracking branch 'STJrSRB2/master' into patch-1	2018-07-05 16:44:34 -05:00
Monster Iestyn	e5236c3137	Merge branch 'master' into next	2018-07-05 21:09:39 +01:00
Monster Iestyn	8c56e39c18	Merge branch 'lua-exploit-fix' into 'master' ... Lua exploit fix See merge request STJr/SRB2!259	2018-07-05 16:08:08 -04:00
LJSonik	3b39b3b7c8	Merge branch 'master' into password-security-fix	2018-07-05 20:58:00 +02:00
LJSonik	bd6373bc86	Merge branch 'master' into minor-net-command-fixes	2018-07-05 20:00:38 +02:00
LJSonik	8e3c3a6f65	Merge branch 'master' into password-security-fix	2018-07-05 19:46:36 +02:00
Steel Titanium	c8d0eb04f4	Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation	2018-07-05 01:23:56 -04:00
Steel Titanium	44144e379e	Merge remote-tracking branch 'upstream/master' into defaultsoundvol	2018-07-05 01:22:39 -04:00
Steel Titanium	c61035571b	Merge remote-tracking branch 'upstream/master' into md2-fopen-error	2018-07-05 01:21:09 -04:00
Steel Titanium	46aa4c3503	Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix	2018-07-05 01:20:32 -04:00
Steel Titanium	8aee862ff8	Merge remote-tracking branch 'upstream/master' into gme-pause	2018-07-05 01:16:43 -04:00
Monster Iestyn	82d953bbc2	Fixed the Lua crash exploit.	2018-07-04 20:15:36 +01:00
Monster Iestyn	dfb5f06d7e	fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype)	2018-07-02 21:03:04 +01:00
Monster Iestyn	bcffe61277	remove MF_RUNSPAWNFUNC from MT_CACOLANTERN	2018-07-02 20:35:39 +01:00
Monster Iestyn	c045e8cf8d	Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore. ... Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.	2018-07-01 22:01:00 +01:00
Monster Iestyn	daa87947a4	huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems	2018-07-01 19:47:26 +01:00
Monster Iestyn	76c8d30ed2	Fix special stage map end var defaults to use the correct map numbers	2018-06-30 18:14:04 +01:00
Monster Iestyn	80d6253eec	Don't re-enable MD5 checks yet, we're not even near RC phase yet	2018-06-30 18:09:39 +01:00
Monster Iestyn	25cd61c094	Merge branch 'master' into next	2018-06-27 15:06:12 +01:00
Monster Iestyn	d8a86a8d74	Fix OpenGL completely missing the ability to alter FOF wall pegging by lower unpegged flag. Stupid OpenGL. ... Sorry in advance Lat'!	2018-06-26 21:41:05 +01:00
Monster Iestyn	ac21a529c7	Merge branch 'master' into fof-slope-skew-backport	2018-06-26 20:11:08 +01:00
Monster Iestyn	415c095274	fix the multiplayer menu not allowing the full max length for player names unlike the "name" console command	2018-06-26 17:46:04 +01:00
Monster Iestyn	aed30519d4	Fix HWR_ProjectSprite to check properly whether the displayed player's mobj or its subsector exists, to avoid a crash when checking for fake planes. (also use viewplayer since its available to use, silly hardware code) ... Also tweaked a weird splitscreen check in HWR_DrawSpriteShadow; still investigating whether stplyr is ever not player 2 when it's player 2's view, but this looks better for now	2018-06-23 18:47:32 +01:00
MascaraSnake	a601cacfff	Added sprite2 to precipmobj_t	2018-06-20 14:04:49 +02:00
toaster	1ffa45f875	Rework software coronas a bit, apply them to the flame and flame holder too, and spawn them only if MTF_EXTRA is given.	2018-06-19 23:16:49 +01:00
toaster	2ab1d91ec9	* Fix nextstate, radius, and painchance of fire torch decoration. ... * Fix waving flag object type's... flags. *womp womp*	2018-06-19 21:58:49 +01:00
Monster Iestyn	89478a7ba4	Added linedef 447 as the change colormap linedef exec special. ... IMPORTANT NOTE: UNTESTED	2018-06-14 21:51:21 +01:00
Monster Iestyn	fe6b47dc00	Merge branch 'master' into leveltitle-tinkering ... # Conflicts: # src/hu_stuff.h # src/st_stuff.c	2018-06-14 21:26:44 +01:00
toaster	37e1fae07d	Fixing dehacked.c consistency.	2018-06-13 18:10:32 +01:00
toaster	7f86e147f3	Fix the starposts not being cleared properly.	2018-06-12 02:26:42 +01:00
toaster	a56811cb0d	Fix all the Floral Fieldsing pv2 discovered.	2018-06-12 01:08:03 +01:00
toaster	1bd963db7a	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again	2018-06-12 00:57:21 +01:00
Monster Iestyn	75d2073307	Do the usual hack for loading a lump from a map WAD in a pk3, but this time for P_LoadThingsOnly	2018-06-11 20:23:00 +01:00
Monster Iestyn	e39bbab532	Merge branch 'public_flatsprite' ... # Conflicts: # src/hardware/hw_main.c # src/r_things.c	2018-06-11 19:53:16 +01:00
Sryder	672ca12550	Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite	2018-06-11 19:40:35 +01:00
Monster Iestyn	54e92a96b3	backport fix to L/R sprite loading code from internal ... basically we don't want L/R sprites to always be flipped, for obvious reasons	2018-06-11 19:36:47 +01:00
toaster	934c178941	Remove unpopular exitlevel limitation.	2018-06-10 20:02:34 +01:00
Sryder	ea915e5778	Fix papersprites more for real this time ... (Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)	2018-06-09 22:58:03 +01:00
toaster	c5ab2ffa11	At FF and Sphere's suggestion, make the ring hoops work natively in normal stages and require more replacing for special stage conversion purposes.	2018-06-09 21:42:37 +01:00
toaster	94b2ad2836	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again	2018-06-09 21:18:17 +01:00
Monster Iestyn	82b69b7de5	Merge branch 'public_flatsprite' ... # Conflicts: # src/dehacked.c # src/hardware/hw_main.c # src/p_enemy.c # src/p_inter.c # src/p_map.c # src/p_mobj.c # src/p_mobj.h # src/p_pspr.h # src/p_user.c # src/r_defs.h # src/r_things.c # src/r_things.h	2018-06-09 21:14:41 +01:00
toaster	eb948cf78a	Restore music upon successful completion of old-style special stage	2018-06-09 21:12:56 +01:00
toaster	1242180667	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again	2018-06-09 19:36:48 +01:00
Monster Iestyn	14d49b8bf1	Merge branch 'public_next' ... # Conflicts: # src/d_main.c # src/d_netfil.c # src/p_setup.c	2018-06-09 19:35:36 +01:00
toaster	3bc8987586	Disable bumper score icon in NiGHTS to match enemies.	2018-06-09 19:22:28 +01:00
Sryder	0f4e8c1eda	Merge branch 'next' into public_flatsprite ... I also fix papersprites in regards to flipping on one sprite fits all rotation stuff # Conflicts: # src/hardware/hw_main.c	2018-06-09 18:47:42 +01:00
toaster	9a309b29c6	* Made P_LevelInitStuff's stuff clearer. ... * Changed a caption I'd meant to modify earlier in the branch's lifespan.	2018-06-09 18:20:59 +01:00
toaster	16c8d17a4c	* (probably) fix crash with followmobj not being properly invalidated on mapload ... * clean up P_LevelInitStuff * [unrelated] make the bot use directionchar if you are (i only realised it wasn't as a consequence of testing this)	2018-06-09 18:06:14 +01:00
toaster	adc0e3d6c3	Kart Krew discovered a crash, and I was already fiddling around with this, so...	2018-06-08 22:30:38 +01:00
toaster	30843fecb6	My little experiments with super transformation animation! (Requires new player.dta.)	2018-06-08 21:11:59 +01:00
toaster	a7c6977b6e	* Make bomb spheres respawn with new laps ... * Make the mapthing detection for stuff to be spawned by P_SpawnHoopsAndRings more consistent. * Make NiGHTS stuff prevent perfect bonus.	2018-06-08 17:16:20 +01:00
toaster	35a5f7447e	* Remove flashing from spheres in bonus time through #ifdef. ... * Fix inconsistency in counting nummaprings. * Prevent perfect bonus in non-special stage NiGHTS maps.	2018-06-07 15:10:43 +01:00
toaster	e054208a31	Fix hanging bug if A_ConnectToGround's supplied object's height is zero.	2018-06-06 22:36:55 +01:00
toaster	01dfe31c3c	So MI tells me there's a good reason why that was not done. :V	2018-06-06 21:48:27 +01:00
toaster	3f7ffc61a5	Fixed the fireball Sal sleepily helped me with.	2018-06-06 18:48:37 +01:00
toaster	0bb5419785	CORRECTION OF MINOR ANNOYANCES ... * On request of Nev3r and Sphere (combined with my own annoyances), make SOC-loading in .pk3 files use the /SOC folder rather than the /SOCS folder. * Make the Crushstacean's claw launch sounds stop when killed.	2018-06-06 17:11:12 +01:00
toaster	13053bd1ba	FINAL CHANGE, I PROMISE, I THINK ... * MainCfg property smpstage_start - controls the special stage multiplayer games go to.	2018-06-06 16:07:14 +01:00
toaster	33e0343cac	* Consistency in realtime. ... * Actual indication of modified game status on the addons menu. * Yes, I know this has nothing to do with the branch, I'm just doing little things I found useful.	2018-06-06 15:13:09 +01:00
toaster	5032ae2552	* Patch.pk3 as requested by literally everyone else on the team. ... * Enable SECTORSPECIALAFTERTHINK since we probably really want to use that sloped lava wave in RVZ. * Allow for infinite lives to be set via the setlives command/Pandora's Box. * Refactor P_DoFiring(), with guidance from Sal. * Correct the CRAWLA HONCHO\nCAN NOW BECOME\nSUPER CRAWLA HONCHO sliding movement in non-green resolutions.	2018-06-06 14:42:50 +01:00
toaster	db8f3e83b2	There's always something... a slightly more forgiving radius for the Crushstacean's claw, since I've gotten hit whilst apparently jumping at a safe place next to the claw a few times this evening.	2018-06-06 00:48:14 +01:00
toaster	adf8f0e391	* Some minor info.c tweaks I discovered I needed to make while transferring material across from patch.dta to srb2.pk3. ... * Making the particle generator dynamic, as requested by Nev3r. * i....... think this is done? i'll double check in the morning.	2018-06-06 00:40:23 +01:00
toaster	9c2d30ce35	* Almost everything except players and badniks get removed on deathpit collision, as requested by Nev (very useful for the Bridge). May need serious checking for mobjtypes this is safe to do for. ... * Flames fall with flameholders. * New modification to teleport cheat: -sp <val> <val> allows instantaneous jump to any starpost in the map, including spawnpoints as starpost index 0! * Also, -ang <val> and -aim <val>, which can be combined with -nop to pivot on the spot.	2018-06-05 20:47:30 +01:00
toaster	3725203bcd	Bit of a random one today, but the branch approaches completion... ... * Bomb sphere! Paraloopable hazard. Replaces MT_SPECIALSPIKEBALL. * Blueberry bushes, both normal and Xmas, from patch.dta. * BSZ tulips, also from patch.dta! * Frozen Hillside badniks - Penguinator and Pophat. * Frozen Hillside ice decoration! * Fixed some big bugs with the DSZ light beams. * Made multi-mare special stages work, in a troll way - the Chaos Emerald disappears in a puff of smoke, and the Spinbobert laughter sound plays... >:3c * Reverted the mobjtype number changes from the source SOC/Lua, which we can do later when doing a final pass of the levels. * State optimisation. * Serious cruft-removal of the NiGHTS drone thinker. * Fix the issues where the player wouldn't curl into jump in waterslides or dropping off rope-hangs. * Tweak NiGHTS player flashing. * Add text colour support to the titlecard font. * Use that to make the PRESS SPIN\nMID-JUMP thing when you get all Chaos Emeralds use the titlecard font for readability. * Fix the GOT ALL EMERALDS page not lasting the correct, extended amount of time. * Fix that thing where flying mid-spin didn't enact autobrake. * Modify graymap a little on Sryder's suggestion. * [COMPLETELY UNRELATED] fix that thing where the addons menu will fail on files/paths with spaces in [/COMPLETELY UNRELATED]	2018-06-05 17:22:28 +01:00
Louis-Antoine	c389c0b3dc	xd	2018-06-04 22:30:27 +02:00
Louis-Antoine	91081a3e53	Disable admin password by default	2018-06-04 22:14:01 +02:00
Steel Titanium	77362c45cc	Fix pausing on gme	2018-06-03 18:15:20 -04:00
toaster	6e07631cc9	MONSTER COMMIT. ... OLD SPECIAL STAGES: * Spheres in old special stages instead of rings! * Individual timers in old special stages instead of a global one! * Old special stages use a variant of the NiGHTS HUD now! * Special stage damage in old special stages loses 5 seconds of time instead of 10 rings/spheres! * All damage gained through old special stages is converted to special stage damage! As a consequence, the special spikeball has no need to be special anymore. * Made emerald gaining function be based on special stage number rather than gained emeralds! * Consistency with... NiGHTS SPECIAL STAGES: * Spheres now flash in bonus time. https://cdn.discordapp.com/attachments/400761370800422922/452590553100713984/srb20032.gif * Sphere and ring mapthingnums are now less fucked up in 'em. (Rings are 300, same as usual, while Spheres are now 1706 replacing NiGHTS Wings.) SPECIAL STAGES IN GENERAL: * useNightsSS is now dead. Each individual special stage is now assessed for NiGHTS-mode behaviour based on maptol & TOL_NIGHTS. * CRAWLA HONCHO\n CAN NOW BE\n SUPER CRAWLA HONCHO end tally modification now also includes a mini-tutorial on turning super. https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif * SONIC GOT A CHAOS EMERALD? https://cdn.discordapp.com/attachments/400761370800422922/452623869497573386/srb20034.gif NiGHTS NON-SPECIAL STAGES: * Colour Chips and Star Chips! Replaces Spheres and Rings of NiGHTS Special Stages. * Colour Chips turn yellow in bonus time. * Ideya! * Its own "drowning" music! * All of the object types for Dream Hill. * GIF: https://cdn.discordapp.com/attachments/400761370800422922/452844894113759233/srb20036.gif RANDOM BS: * Turn super with the spin button instead of the jump button! * Followmobj now correctly set with P_SetTarget instead of pointer assignment. * Emerald hunt uses new sprites! * Made unlock noise different from emblem gain noise! (It's the CRAWLA HONCHO CAN NOW TURN yadda yadda sound from S3K now.)	2018-06-03 22:41:54 +01:00
Monster Iestyn	bf042ed86c	Merge branch 'master' into next	2018-06-03 20:17:51 +01:00
Monster Iestyn	650e0eafce	Merge branch 'fixedmul-c-fix' into 'master' ... Correct C FixedMul() off-by-one errors See merge request STJr/SRB2!245	2018-06-03 15:14:06 -04:00
Monster Iestyn	602d5e0aa0	Merge branch 'f12-fix' into 'master' ... F12 fix See merge request STJr/SRB2!250	2018-06-03 15:11:20 -04:00
Monster Iestyn	37b8be2103	Merge branch 'demototalplaytime' into 'next' ... Don't increment totalplaytime if a demo is playing. See merge request STJr/SRB2!241	2018-06-03 15:10:42 -04:00
Monster Iestyn	ef174f7b43	Merge branch 'opengl-mappalette-fix' into 'master' ... OpenGL: Map Specific Palette Fix See merge request STJr/SRB2!247	2018-06-03 15:09:23 -04:00
Monster Iestyn	8e5dbb22f0	Merge branch 'opengl-bigmap-fix' into 'master' ... OpenGL: Very large map rendering issue fixed See merge request STJr/SRB2!249	2018-06-03 15:08:10 -04:00
Monster Iestyn	f4152e2e5d	Merge branch 'addfile-typo' into 'master' ... Fix console typo See merge request STJr/SRB2!246	2018-06-03 15:06:13 -04:00
toaster	8d00192fee	New CEZ hardcoding done!! ... * Better Robo Hood arrows. * Shield break animation for Egg Guard. (Temporary state slot so I don't have to compile from scratch until I do something more complicated later.) * Suspicious Facestabber Statue animates a little before bursting open. * Fix Facestabber radius. * Fix some stuff in Flicky functions that could be overwritten in Lua call actions by mistake.	2018-05-31 21:00:12 +01:00
toaster	2ec1c3cd9d	First commit on new tablet-laptop! ... * Robo Hood. * Hi MI, I know you're looking at this just because it features Robo hood. :V	2018-05-30 23:16:57 +01:00
Steel Titanium	e394f7992d	Removed CONS_Printf line. That wasn't meant to be commited.	2018-05-29 22:12:36 -04:00
Steel Titanium	0248fcecd4	Some small change ... Really this is just to prevent the music end up being disorted at max volume	2018-05-29 20:31:28 -04:00
toasterbabe	cea4562c74	Realised I forgot to commit these, didn't want to move to a new laptop-tablet and just have them disappear on me. ... * Facestabber statues now have fun breaking effects. * Fake coronas for candles and prickets. * hnext and hprev are properly dealt with in MobjThinker if P_MobjIsRemoved.	2018-05-29 18:48:57 +01:00
Monster Iestyn	41e9c20c04	Ignore mouse button events if the mouse's focus is not actually on the window at the moment. ... This should hopefully kill the F12 getting stuck issue once and for all.	2018-05-28 21:29:46 +01:00
Sryder	f4181f7eb6	Very large map rendering issue fixed ... Move old fix for too large maps having rendering issues from R_CheckBBox to OpenGL's HWR_CheckBBox From what I know, this effects at least Aerial Garden and Seraphic Skylands	2018-05-26 13:13:37 +01:00
Monster Iestyn	3a7241d9d3	change fickle's hack so that the bottoms of polyobj plane columns are set to 0 instead of 65535 when not intended to be visible	2018-05-25 20:54:50 +01:00
Steel Titanium	0b6d6c3363	GME low volume fix	2018-05-24 16:24:09 -04:00
toasterbabe	364984ac12	Fix bugs (uninitialised memory the compiler didn't pick up, and not setting scale) I sleepily caused last night.	2018-05-24 13:19:42 +01:00
toasterbabe	cb86ed7721	* Castlebot Facestabbers. ... * Facestabber statues, of both the suspicious and non-suspicious kind. * New object type for the end of grabbable chains. * I moved my compilation .bat file to my Releases folder, so it should .gitignore .bat's. * Random extra stuff.	2018-05-24 01:40:57 +01:00
toasterbabe	dbcd259bd6	* New Egg Guard behaviour! ... * Fix the thing I mistakenly messed up with all of the things I moved out of P_SpawnMapThing without good reason to.	2018-05-22 23:02:54 +01:00
toasterbabe	847f8b4ef0	* CEZ decorations! ... * Moved a bunch of stuff that had no business being in mapthing spawns into mobj spawns.	2018-05-22 11:04:28 +01:00
Monster Iestyn	f061ffa00e	Stop Each Time trigger linedefs and object-carrying scrollers from doing anything with FOFs without FF_EXISTS	2018-05-21 20:02:30 +01:00
Tasos Sahanidis	001e4e11ca	Correct C FixedMul() off-by-one errors ... The FixedMul() C implementation would produce off by one results, causing constant desyncs on 64 bit builds and builds without an ASM implementation of the function. This is fixed by shifting instead of dividing, possibly avoiding rounding errors.	2018-05-20 22:55:21 +03:00
toasterbabe	ee42132ed1	* Bumpers and Balloons in a more final state. ... * Blue diagonal springs, because that gap is very, very odd. * Improved A_SpawnFreshCopy. * Tweaked P_LookForEnemies for consistency's sake. (Previously, it was impossible to make a spring that could neither be homing-attacked or attraction-shotted.)	2018-05-20 00:04:39 +01:00
Sryder	092e709235	OpenGL Map Specific palettes working ... This makes OpenGL stop using a specific function that doesn't really do anything for it anymore. It looks like it was used for a hack that would change the colour of polygons for the flashpal equivalent in DOOM. I made it so ST_DoPaletteStuff doesn't set the flashpal in OpenGL as it already does its own hacky overlay and doing that would cause all the textures to be flushed more mid-level, it could be enabled for more correct flashpals, but they still wouldn't effect fog or lighting. This means the palette will be set when going to the title screen, and twice when starting a map, (causing the OpenGL cached textures to also be flushed at those times)	2018-05-17 22:17:20 +01:00
Steel Titanium	0bef99f566	Fix console typo	2018-05-17 13:57:19 -04:00
Sryder	badbb4324e	Fix FF_FULLBRIGHT not working in sectors with multiple light levels in OpenGL	2018-05-16 21:04:57 +01:00
LJSonik	87ba5a2233	Merge branch 'master' into minor-net-command-fixes	2018-05-15 21:31:47 +02:00
toasterbabe	786fd65f3c	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again	2018-05-15 16:29:32 +01:00
toasterbabe	720de810bd	The start of implementing FuriousFox's bumpers/balloons! ... No hardcoding of states, but the test .wad they're stored in right now is predominantly state, object, and sprite definitions/assets right now - the only hook is for setting the colour of the balloons!!	2018-05-15 16:10:42 +01:00
MascaraSnake	2e8cb9582a	Consistency: Pointer declarations next to the variable name instead of the type	2018-05-15 09:39:52 +02:00
MascaraSnake	975a318460	Change to linedef type 7 (flat alignment): If no tag is given, affect front sector.	2018-05-14 19:34:22 +02:00
toasterbabe	3c50acd1bf	* Minor changes to make A_CrushclawAim more useful. ... * Some fun with the chain. https://cdn.discordapp.com/attachments/402861856219463681/445539938633515018/srb20022.gif * More corrections to closed captions.	2018-05-14 13:20:24 +01:00
toasterbabe	26d13db548	* Crushtacean! ... * Behaves a bit differently to the one in DSZres.pk3. * Can now punch DSZ mines! * Also has mapthingnum 126 instead of 610. * Some other mapthingnum changes. * DSZ2 stalagmite is now 1009, formerly 999. * Big DSZ gargoyle is now 1011, formerly 1009.	2018-05-14 01:19:24 +01:00
Steel Titanium	b4d479ad9a	Include errno if not already included.	2018-05-13 16:04:34 -04:00
Steel Titanium	7f084868b9	More helpful error message	2018-05-13 15:35:38 -04:00
GoldenTails	7783ddd134	Update hw_md2.c	2018-05-13 14:34:08 -05:00
GoldenTails	5f0a45124c	Update hw_md2.c	2018-05-13 14:32:33 -05:00
GoldenTails	e66e0bb20e	Fixed MD2 models not loading correctly on Linux	2018-05-13 14:19:36 -05:00
toasterbabe	5c11131230	Fix inverted chaining condition!	2018-05-13 17:25:55 +01:00
toasterbabe	a738ef99e3	* DrT's Spincushion hardcoded. ... * Make the MF_PAIN stuff ONLY depend on mass, using the bottom 8 bits for the type and the custom sound in the upper ones. * A bunch of cleanup of random other stuff, including an unused Deton state and an unused Jetty type's sprite.	2018-05-13 14:09:20 +01:00
Monster Iestyn	4f75ae3a68	Fix both Bouncy FOF and Space Countdown sector specials working on FOFs without the FF_EXISTS flag ... Also move the Bouncy FOF sector special check above the FOF heights checking in P_CheckBouncySectors, because it means not having to waste time calculating FOF heights only for it not to be bouncy anyway :P	2018-05-11 20:35:46 +01:00
Alam Ed Arias	6be0f90fbe	Merge branch 'master' into next	2018-05-08 21:26:26 -04:00
Steel Titanium	a1d696b38e	Fix small typo	2018-05-08 18:38:28 -04:00
Steel Titanium	9ff491dd78	Add indentation	2018-05-08 18:36:47 -04:00
toasterbabe	8a61d87961	* Add new damagetype flag (DMG_CANHURTSELF) that allows a player to hurt themselves indirectly. ... * Add damagetype to P_RadiusAttack (optinteger in lua, A_Explode var1). * Removed the prevention of MF_BOSS objects from getting P_RadiusAttacked. This was a holdover from DooM (I checked) - a way to prevent the Cyberdemon from gibbing itself when firing point blank into a wall, and also a way to make it and the Spider Mastermind harder. * Enemies are solid to other enemies movement-wise now. * (Fun little aside - if you remove MF_SOLID from a monitor, it now behaves like they did in Sonic Adventure (poppable by colliding with, not just attacking). * Fixed Metal Sonic battle conflict in MF_PAIN/mass not picked up earlier. * Miscellaneous tiny code tweaks.	2018-05-08 23:26:36 +01:00
Steel Titanium	29e80c5300	Don't increment totalplaytime if a demo is playing.	2018-05-08 18:16:01 -04:00
toasterbabe	d0575f7fb0	* Hive Elementals and Bumblebores, plus associated useful action functions. ... * Made Facestabbers take two hits and have associated pain/death animations. No other changes, just wanted to make sure THIS was done. * Move Bubblebuzz-related stuff to go alongside the secret badniks and etc. * MF2_INVERTAIMABLE. Inverts whether P_LookForEnemies can get at; replaces a hardcoded thingy.	2018-05-04 21:30:15 +01:00
toasterbabe	8f71e93cee	* Remove Commander-specific hack, incorporate into A_CrawlaCommanderThink. ... * Make my changes to its thinker slightly more consistent.	2018-05-03 14:04:29 +01:00
toasterbabe	94c7d9bc52	Forgot to do this before making the previous commit; completes support for no-points drone badniks.	2018-05-03 00:00:22 +01:00
toasterbabe	6d1ba20a1d	* Add native support for multi-hit badiks to MF_ENEMY. ... * MF2_FRET application and removal. * Flashing when flag present. * Bounce player back on successful damaging. * Add their spawnhealth to the chain. * Reduce code duplication in P_TouchSpecialThing. * Play with Crawla Commander a little bit as a test of its power.	2018-05-02 23:48:50 +01:00
toasterbabe	856edd50df	Remove the ugly double-hack for monitors! Doesn't QUITE do it via the return value of P_DamageMobj like MI and I theorised it should do, but it's functionally identical whilst being less code to maintain.	2018-05-02 20:55:07 +01:00
toasterbabe	cf9d53efd8	Kill MF2_STANDONME (mechanically; still occupies the slot... will change that next time I have to handle the DEHACKED lists.)	2018-05-02 20:35:20 +01:00
toasterbabe	dbc0ac2303	* Springs no longer need MF_SOLID to function. (I tried to add a special Sonic 1-3 style "springs are solid from the side" thing with native support, but it turns out that requires too many hacks for an optional extra feature not used in the campaign, so No.) ... * Springs no longer send you flying relative to the slope whilst you're on a slope. (I tried fixing this before, but this is a much more solid fix.)	2018-05-02 20:03:18 +01:00
toasterbabe	5cc1befcad	* Haunted Heights! Smashing spikeball, Cacolantern, Spinbobert and Hangster, along with the Spider and Bat flickies and general decoration/ambience stuff. ... * MF_PAIN and MF_MISSILE now support setting damagetype via their Mass parameter. The two existing conflicts - the fuse setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful for palmtrees and stuff. * Some other, relatively hacky A_ functions. * (Unrelated) Remove the need for a "Mario block mode" for the token by making it natively compatible. * Spikes and their time-offsetting via that Lua script sphere made. Also allow for wallspikes to do it via their angle/360.	2018-04-28 15:13:44 +01:00
toasterbabe	1eb84f57c5	* Billiards mines! With support for both above and below water, replacing both the below-and-above-water old mines at once. ... * Explosion executors. * Minor refactor of P_KillMobj.	2018-04-26 20:18:51 +01:00
Monster Iestyn	8e5ac64d7c	Merge branch 'dedicated-nosoundinit' into 'master' ... Don't init the sound system on dedicated servers See merge request STJr/SRB2!225	2018-04-21 17:40:45 -04:00
Monster Iestyn	452aef4981	Merge branch 'connect-empty-address-fix' into 'master' ... Fixed "invalid pointer" error when passing "" to Command_connect(). See merge request STJr/SRB2!234	2018-04-21 17:32:50 -04:00
Monster Iestyn	83a84d5a81	Merge branch 'connect-server-fix' into 'master' ... Removed contradictory `-connect` check See merge request STJr/SRB2!236	2018-04-21 16:25:28 -04:00
Monster Iestyn	eb0f9681d7	Merge branch 'findfile-rewrite' into 'master' ... Rewrite of d_netfil.c's findfile See merge request STJr/SRB2!240	2018-04-21 16:22:21 -04:00
Monster Iestyn	48a85512a0	Merge branch 'dedicated-debug-hotfix' into 'master' ... Dedicated debug hotfix See merge request STJr/SRB2!239	2018-04-21 16:13:38 -04:00
Monster Iestyn	6c7acdbd9e	Merge branch 'movie-spec-stage-fade-fix' into 'master' ... Movie mode: special stage intro fade recording fix See merge request STJr/SRB2!229	2018-04-21 16:12:46 -04:00
Monster Iestyn	9cdf87404e	Rewrote findfile to store whether any of the three paths searched had a bad MD5 rather than just simply being not there. ... This means that, if the three paths are not the same, you should be able to tell if at least one of them has a file that just had a bad MD5. Most relevant for Linux peeps I expect. Note: Untested as of writing	2018-04-15 22:00:31 +01:00
Monster Iestyn	3fb12cf337	Don't use CV_StealthSetValue on cv_itemfinder if running the game in dedicated mode	2018-04-15 19:59:57 +01:00
Steel Titanium	2139d4771f	Default sound volume is too loud	2018-04-11 14:40:05 -04:00
toasterbabe	976331fb03	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again	2018-04-08 16:23:19 +01:00
toasterbabe	375c3c584e	[13:01] toaster: hey ... [13:01] toaster: would anyone object if i pushed this to master [13:02] toaster: so my changes to devmode don't fuck with gifs, for example https://cdn.discordapp.com/attachments/428262628893261828/432500920773771264/srb20575.gif [13:02] NEV3R: ¯\_(ツ)_/¯ [13:02] toaster: ok i'll just do it	2018-04-08 13:03:40 +01:00
toasterbabe	790e334d19	comment goof	2018-04-07 23:10:34 +01:00
mazmazz	606df6482e	Merge branch 'master' into nightsplus-laplogic	2018-04-07 07:54:46 -04:00
mazmazz	f903d01bc1	Add ML_DONPTEGTOP flag to Nights LE ... * Nightserize: Run only if player is already NiGHTS * DeNightserize: Run only if >0 players are NiGHTS	2018-04-07 07:33:07 -04:00
mazmazz	ff6fe27748	Merge branch 'master' into nightsplus-le	2018-04-07 07:09:41 -04:00
mazmazz	bd6276a39e	Allow immediate alpha setting when speed = 0; refactoring ... * Separate fade logic into P_FindFakeFloorsDoAlpha, P_DoFakeFloorAlpha * Change INT32 destvalue and speed to INT16	2018-04-07 07:09:04 -04:00
Digiku	7cf2c78522	Fix whitespace weirdness	2018-04-07 06:28:31 -04:00
mazmazz	27ca70d069	checkpoint	2018-04-07 05:52:01 -04:00
mazmazz	afa0aae131	Refactor flag handling toggles	2018-04-06 23:14:48 -04:00
mazmazz	73e4cab1e4	Little adjustments ... * Swap MF_NOCLIMB and MF_EFFECT1 * Implement if Front Y Offset < 1 (== 0), then set alpha immediately	2018-04-06 22:34:45 -04:00
mazmazz	8d3c9d91f1	Merge branch 'le-fadefof' into le-fadefof-remove-storedthinker	2018-04-06 22:22:42 -04:00
mazmazz	3427c304f4	Merge branch 'master' into le-fadefof	2018-04-06 22:22:23 -04:00
toasterbabe	ff9775225e	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into delag_maces ... # Conflicts: # src/p_mobj.c	2018-04-07 01:54:43 +01:00
Digiku	e1cd6357cc	Merge branch 'op-nightsbumper' into 'master' ... NiGHTS Objectplace: Preserve MT_NIGHTSBUMPER vertical angle upon WRITETHINGS See merge request STJr/SRB2Internal!137	2018-04-06 20:21:25 -04:00
toaster	d315072e3f	Merge branch 'texture-fixes' into 'master' ... Texture fixes See merge request STJr/SRB2Internal!135	2018-04-06 17:44:17 -04:00
toaster	8c33cb9134	Merge branch '100-make-slopes-static-by-default-and-require-flag-to-turn-them-dynamic' into 'master' ... Resolve "Make slopes static by default, and require flag to turn them dynamic." Closes #100 See merge request STJr/SRB2Internal!140	2018-04-06 17:43:47 -04:00
toasterbabe	4f3c9b5fad	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff ... # Conflicts: # src/hardware/hw_draw.c	2018-04-06 19:38:19 +01:00
Monster Iestyn	a3b86a737e	Merge branch 'public_next' ... # Conflicts: # src/f_finale.c # src/hardware/hw_draw.c # src/hardware/hw_main.c # src/hardware/r_opengl/r_opengl.c # src/sdl12/hwsym_sdl.c # src/sdl12/i_video.c	2018-04-06 18:42:07 +01:00
toasterbabe	3f427d0161	* Improve devmode text. ... * Make sure showfps never covers anything relevant to the base game. * Tweak spectator text for raising/lowering. * Minor code-smell squishes.	2018-04-06 18:40:08 +01:00
toasterbabe	15903c6271	* Correct V_PERPLAYER's screen-centered (no snapto flags on a given axis) behaviour. ... * Fix that one comment Digiku mentioned. ;P * Make extra lives/100 ring rewards consistent between lives being relevant and lives being infinite/not present, which was a problem this branch made evident when Race ended up getting the infinite lives symbol!	2018-04-06 14:42:49 +01:00
toasterbabe	3c74952522	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff	2018-04-06 12:54:39 +01:00
Monster Iestyn	740e0cf8c1	Merge branch 'master' into hardcoding-time-again	2018-04-05 19:03:49 +01:00
Wolfy	ca8e14d5e9	Revert "THZ Hardcoding" ... This reverts commit 8bd91bd2f2. Note to self: read through the fucking merge requests	2018-04-05 12:49:39 -05:00
Wolfy	1d63f53aeb	Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal	2018-04-05 03:55:03 -05:00
Wolfy	8bd91bd2f2	THZ Hardcoding ... Feel free to reorganize as necessary.	2018-04-05 03:23:27 -05:00
Steel Titanium	d446f3420e	Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit	2018-04-03 16:16:20 -04:00
Steel Titanium	759ea8cb42	Indentation fixup	2018-04-03 16:11:07 -04:00
Alam Ed Arias	59f5b46ad3	Merge branch 'public_next' into master	2018-04-03 16:09:11 -04:00
Alam Ed Arias	cf6a30a8ef	Merge branch 'master' into next	2018-04-03 15:48:06 -04:00
toasterbabe	4f3f647f5b	A minor assortment of changes.	2018-04-03 01:46:42 +01:00
toasterbabe	156cc031ea	* Optimise them even further... AGAIN! Using an offset-based system rather than a multiplication-based one... ... * Again, tweak the spawning code to take maximum advantage of these gains. * Fix potential crashes with MT_NULL mace/chain types supplied. * #ifdef out the height-clipping code. It needs more TLC than I can give it right now, and the existing behaviour is less obviously broken (sadly enough). * Fix chainmace points, which were apparently broken without anyone realising.	2018-04-03 01:10:10 +01:00
toasterbabe	4051ae8915	* Revamp mace creation again to potentially serve as the foundation for further optimisation (and also not rely on a while (1) loop, which easily went wrong several times whilst I was making changes to it). ... * Fix minor typoes and other small tweaks in the P_MaceRotate function, which I'm probably about to rewrite again anyways...	2018-04-02 21:36:12 +01:00
mazmazz	b80277b7f1	Merge branch 'nightsplus-stillvisangle' into nights-nightserizeangle	2018-04-02 15:26:41 -04:00
mazmazz	49682f58bf	Make NiGHTS face forward or backward upon Nightserizing	2018-04-02 15:21:19 -04:00
mazmazz	294d583166	Dumb stupid hack where NiGHTS faces you upon Nightserizing ... Because I can't figure out how to tell which player angle is "forward" in an axis track.	2018-04-02 14:41:29 -04:00
mazmazz	37eeb5d25c	Merge branch 'nightsplus-laplogic' into nightsplus-le ... # Conflicts: # src/p_map.c	2018-04-02 09:21:55 -04:00
mazmazz	0c6f722ff2	For NiGHTS OP Hoop, make mt->options XOR cv_opflags more SRB2-like	2018-04-02 08:36:33 -04:00
mazmazz	53503cd01f	Slight fixes for NiGHTS LE Trigger logic	2018-04-02 08:13:53 -04:00
mazmazz	2c72c6e660	Split NiGHTS LE trigger logic into P_CheckNightsTriggerLine ... This makes P_RunTriggerLinedef more readable because the logic is too different from the other triggers. Also replace BOOL with boolean	2018-04-02 08:11:28 -04:00
toasterbabe	0102da824e	Make the h-chain repairing safer.	2018-04-02 01:20:32 +01:00
toasterbabe	5ac70bbb7e	* Fix multispoke mace/chainbars having problems. ... * Completely rework how mace/chainbars are spawned to reduce the number of matrix multiplications required EVEN FURTHER! * Reimplement the maceretry solidity stuff (effect 4). * Flip the mminlength stuff so that existing dev maps don't break badly. * Fix hacky chainbar grabbing. * Tweak height of tinychain a smidge.	2018-04-02 01:08:31 +01:00
toasterbabe	97ddb8881d	* Remove ability to change speed of chains. ... * Fix ability to turn chains (still disabled by default, just at least want the option...) * Replace max speed setting with a "minimum chainlink distance" setting - if greater than zero, that many chains will not be spawned from the center outwards. Doesn't affect the head of the chain at all, since otherwise what's the point? :V	2018-04-01 22:05:59 +01:00
toasterbabe	6d59551afd	Mace optimisation! ... * Handle all chain objects as a hnext/hprev chain. * When removing mobjs with hnext/hprev, "repair the chain" (make the h links meet). * Fix hidden slings, which I accidentially broke when I revamped maces the first time. * Kill MF2_MACEROTATE. Not needed for anything anymore. * P_MaceRotate now available to Lua to make up for it. * Related: Made modifying hnext/hprev using Lua safer, so it keeps the reference counts in play.	2018-04-01 20:54:19 +01:00
mazmazz	9dc90f2df8	Implement logic branching for NiGHTS LE triggers and add Bonus Time trigger	2018-04-01 08:23:59 -04:00
mazmazz	3d72c105df	Initial checkpoint for NiGHTS LE triggers	2018-03-31 10:11:27 -04:00
mazmazz	cd7573550b	Remove fader thinkers by stored pointers in fadingdata	2018-03-31 01:15:24 -04:00
mazmazz	3e8d264a2d	Add fadingdata to sector_t	2018-03-31 00:41:20 -04:00
mazmazz	c1c6b4746f	Better fading comments	2018-03-31 00:10:46 -04:00
mazmazz	c13f561b50	Fix fade_t handleflags to UINT32	2018-03-31 00:02:37 -04:00
mazmazz	bf0f24b16e	Bring back FF_TRANSLUCENT processing for fade FOF ... The rules for accompanying flags are: * If FF_TRANSLUCENT, deflag FF_CUTLEVEL and flag FF_EXTRA | FF_CUTEXTRA. * If not FF_TRANSLUCENT, flag FF_CUTLEVEL and deflag FF_EXTRA | FF_CUTEXTRA * If FF_SOLID, deflag FF_CUTSPRITES * If not FF_SOLID, flag FF_CUTSPRITES This reverts commit 73c7df6f5b.	2018-03-30 23:42:14 -04:00
mazmazz	0ac96b5a93	Merge branch 'le-fadefof' into le-fadefof-fflags ... # Conflicts: # src/p_spec.c	2018-03-30 23:03:06 -04:00
mazmazz	047fffb6da	Remove log comments for Fade FOF	2018-03-30 22:59:33 -04:00
mazmazz	73c7df6f5b	Maybe let's not handle FF_TRANSLUCENT for fade FOF. ... Why: FF_TRANSLUCENT is often packaged with flags FF_EXTRA, FF_CUTEXTRA; for intangibles, FF_CUTSPIRTES; in some cases (?), FF_CUTLEVEL. I *think* the rules are consistent amongst predefined FOFs, but maybe there are exceptions? There's too much that can go wrong with assuming too many flags for an FOF. Just make it the modder's responsibility to tag this special to the proper translucent FOF.	2018-03-30 22:56:43 -04:00
mazmazz	d449aae76d	Add predefined behaviors for fading FOF flags ... * ML_BLOCKMONSTERS: Handle FF_EXISTS * ML_NOCLIMB: Handle FF_SOLID * ML_EFFECT1: Don't handle FF_TRANSLUCENT	2018-03-30 22:43:13 -04:00
mazmazz	3fbffb0b4d	Add player_t marelap and marebonuslap, with logic	2018-03-30 20:28:27 -04:00
Sryder	6f2de824fb	Uncomment HWR_CorrectSWTricks but set gr_correcttricks to be off by default ... I wasn't aware of the cvar, this should do for now since I don't believe any maps use these software tricks, probably an old leftover from DOOM.	2018-03-30 23:12:44 +01:00
Marco Z	e617753d00	Initial logic attempt ... * Front X offset: ffloor alpha target (1-256) * Front Y offset: Speed, alpha per tic (1+) * MF_BLOCKMONSTERS: Do not handle FF_EXISTS	2018-03-30 17:45:48 -04:00
toasterbabe	0fbebcaa08	Make special stage tallies do the token noise if you cash in a token!	2018-03-30 22:03:14 +01:00
toasterbabe	d9b5155e6e	* Make Tokens appear in competition. ... * Tweak thrown ring colours. * Make Armageddon shield loop properly. * Tweak drowning numbers to be consistent between third and first person.	2018-03-30 21:49:15 +01:00
Marco Z	44b25be69a	fade_t fields	2018-03-30 16:19:19 -04:00
Marco Z	0fedd2e566	Define fader thinker names	2018-03-30 15:33:03 -04:00
mazmazz	c09991d3d4	Merge branch 'nightsplus-laplogic' into nightsplus-le ... # Conflicts: # src/p_map.c	2018-03-30 14:39:00 -04:00
mazmazz	637a4a8446	Add player_t marelap and marebonuslap, with logic	2018-03-30 14:38:28 -04:00
mazmazz	56d7f9ed38	Nights LE checkpoint	2018-03-30 14:22:59 -04:00
Sryder	0aaae501d3	Warnings must die	2018-03-30 18:53:23 +01:00
Sryder	f3aa02e26d	Start with lightnum on sector lightlevel	2018-03-30 18:13:52 +01:00
Sryder	66f220d6ad	Merge branch 'master' into openglquickfixes	2018-03-30 18:09:41 +01:00
toasterbabe	de8f1fa407	* Incorporate (almost) all of Mystic's feedback. ... * Prevent ANY input when blindfolded. * Make CECHOs always perplayer'd. (A little hacky; quads will need work here.) * Make NiGHTS link timer bounces not a mess, and only when the colour changes.	2018-03-30 16:39:59 +01:00
Sryder	65c893da86	static tempsec for R_FakeFlat ... I don't fully understand this, but it's what software does and it fixes the issue of the lighting in DSZ3. Also don't need the extra call to R_Prep3DFloors.	2018-03-29 23:28:54 +01:00
Nevur	fc3e863fd3	asdf ... Signed-off-by: Nevur <apophycens@gmail.com>	2018-03-29 20:12:19 +02:00
toasterbabe	98601dc757	A lot! ... * cv_powerupdisplay. Never, First-person only (default), Always. * New monitor stuff. * Fixed hitmessages. * Some CTF stuff. * Aaaaugh it's a lot I hate myself I need to work on my coursework. * I'll figure out what I did here in the merge request when that's done.	2018-03-26 23:53:09 +01:00
mazmazz	ac8be33752	Reset player->another/flyangle on any Nightserize or DeNightserize	2018-03-26 01:54:38 -04:00
mazmazz	4281c9ca10	Nightserize: Reset player another/flyangle on new mare	2018-03-26 01:40:15 -04:00
mazmazz	ce215195f8	NiGHTS drone loop: Change flyangle comparison to fix detection from vertical angles ... Use > 90 && < 270 instead of >= 90 && <= 270. Fixes a bug where if you fly directly up (flyangle 90) or directly down (flyangle 270), that registers as a backwards direction, so you trigger the loop detection by flying BACKWARDS, not FORWARDS. This edge case (only possible via JUMPTOAXIS) should default to FORWARDS looping.	2018-03-26 01:04:02 -04:00
mazmazz	67e4381284	Fix NiGHTS drone loop detection by using pl->flyangle	2018-03-26 00:33:17 -04:00
mazmazz	d85f108997	P_SpawnMapThing: Ignore MTF_ flags if MT_NIGHTSBUMPER	2018-03-25 19:42:46 -04:00
mazmazz	dc9fd6f02e	MT_NIGHTSBUMPER Spawn: Don't reset mthing->options	2018-03-25 19:07:21 -04:00
mazmazz	e87530a9c3	NiGHTS objectplace: Place new hoop 1713 instead of 1705 ... * Add cv_ophoopflags consvar to manage hoop flags separately from other flags * Simplify hoop mt->options operation so we're not recalculating Z flags; just XOR cv_opflags OR cv_ophoopflags	2018-03-25 18:07:15 -04:00
toasterbabe	33afd94252	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into pretty_stuff ... # Conflicts: # src/d_main.c # src/st_stuff.c	2018-03-24 17:17:01 +00:00
jameds	876d0fa58b	Removed contradictory -connect check	2018-03-23 18:09:07 -07:00
Sryder	f62cb3a30a	I've commented out the call to HWR_CorrectSWTricks. ... I don't think it does anything for us anymore, and might even break things with slopes. Someone let me know if I'm wrong and am breaking things horribly here.	2018-03-23 22:27:29 +00:00
jameds	a431197921	Fixed "invalid pointer" error when passing "" to Command_connect().	2018-03-22 21:21:26 -07:00
Sryder	fab4b7f5ea	Stop squashing the screen vertically in non-green resolutions	2018-03-22 01:10:53 +00:00
Sryder	839ee0ab85	OpenGL Sprite Splitting	2018-03-22 00:52:14 +00:00
Sryder	0885d27171	Transform sprites in world space rather than screen space ... Transformation based on screen space would make sense if we didn't want anything in the world to effect the sprites. This should allow sprite splitting and sorting of sprites with level geometry easier. stransform is no longer needed.	2018-03-21 19:45:37 +00:00
toasterbabe	24c017564e	Mammoth commit! ... * Make TIME part of HUD count down in a bunch of circumstances where it was otherwise some other seperate thing. * Make race countdown happen in a bunch of appropriate circumstances. * Refactor race countdown. * Remove a lot of useless stuff from H&S/Tag UI. * Make co-op/competition/race end-of-act countdown use the race countdown and bigger HUD font. * Remove useless PLAYING/SPECTATE text from lives element. * Merge lap counter into lives element. * Move some other text around.	2018-03-21 18:18:45 +00:00
toasterbabe	05bf3674d3	* M_Random function access to v! (so v.RandomFixed(), etc...) ... * Remove deprecated P_Random() from Lua.	2018-03-20 15:00:27 +00:00
Sryder	4e95066f5a	Some fixes and updates for HWR_SplitWall ... Solid walls *can* be cut Fix issues with water and fog FOFs not cutting each other out correctly Fix Fog colourmap and lighting setting that is done here. Remove HWR_SplitFog There is currently a bug with FF_DOUBLESHADOW (that also exists in software) but has a larger impact here. When 2 FF_DOUBLESHADOW lights are directly stacked on each other the bottom one has its height set incorrectly. This causes all the Fog in the timed gravity flipping section of ERZ2 to be drawn and it looks really bad.	2018-03-20 14:20:08 +00:00
toasterbabe	ae033a9409	* Clean up a lot of NiGHTS stuff still using the old, shitty NOSCALESTART offsetting in nonstandard resolutions. ... * Clean up the ST_ drawing macro list.	2018-03-20 00:19:20 +00:00
toasterbabe	7885ae57e2	* Allow for V_ flag control for hudinfo SOC/Lua stuff through hudinfo[n].f (for flags). ... * Fix Old Special Stage offsets. * Fix drowning number offsets. * Remove useless "WS" macros.	2018-03-19 23:08:51 +00:00
toasterbabe	4798f85382	Fix issues with the level platter in nonstandard resolutions.	2018-03-19 17:41:53 +00:00
toasterbabe	c0cc1471e5	Make some tweaks to devmode offsets.	2018-03-19 16:39:37 +00:00
toasterbabe	7d1885917a	Some minor intro tweaks.	2018-03-19 16:36:14 +00:00
Sryder	f3d63b82ce	Revert "Fix screenshot functionality in fullscreen in SDL2" ... This reverts commit 121fcd8369. The reason I am reverting this is because the last commit actually fixes the *old* screenshot functionality, as the screen is being drawn back onto the buffer after they're swapped in the "real" size. Meaning the old function actually works perfectly fine now.	2018-03-18 18:33:53 +00:00
Sryder	a984d979d1	Fix wipes in low resolutions	2018-03-18 17:12:12 +00:00