3816 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
toaster	f0618d5780	Correct some minor deficiencies in the hold-for-retry system in record attack.	2018-06-15 21:42:36 +01:00
toaster	59d617d31f	Minor modifications to the intro text.	2018-06-14 22:23:55 +01:00
toaster	8f318871eb	* Make the OpenGL loading screen work with the fades better. ... * Make the closed captions not mess with fades, and improve their movement calculation.	2018-06-14 22:23:20 +01:00
toaster	255d5c6c94	* Level title movement begins before the fade in! ... * https://cdn.discordapp.com/attachments/400761370800422922/456833651645349888/srb20051.gif * Fix some wipe bugs. * Solved that thing where there was no fade between two back-to-back cutscenes. * Fixed there being no effective wipe between the end of the vanilla intro cutscene and the title screen. * Smoothed out the behaviour of titlemap fades to prevent conflicts. * [COMPLETELY UNRELATED] Kill the pause graphic and replace with a blue box with text in it, like what happens when the window loses focus. Much harder to miss.	2018-06-14 20:17:31 +01:00
toaster	a3f7e07e4d	Improve retrying text presentation. ... * Now reads "HOLD TO RETRY...". * Behind the white flash. * Shows on button tap for about half a second.	2018-06-14 14:41:14 +01:00
toaster	62927bbb76	* Hold the pause button to restart a record attack run! ... * Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif * Show powerup display in singleplayer even while holding Game Status button.	2018-06-14 00:58:28 +01:00
toaster	522fccaf2e	* Record attack tab-HUD tweaks. ... * Do not subtract a life when retrying if you have infinite lives.	2018-06-13 17:52:23 +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
Monster Iestyn	5f09f60856	Merge branch 'public_flatsprite' into 'public_flatsprite' ... OpenGL: Paper Sprites: The Thousands of Bugs See merge request STJr/SRB2!253	2018-06-11 14:46:51 -04: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
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
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
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
Monster Iestyn	d3a60d9921	Merge branch 'public_flatsprite' into 'public_flatsprite' ... OpenGL: Public flatsprite: The Fixening See merge request STJr/SRB2!252	2018-06-09 14:25:52 -04: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
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
Monster Iestyn	98addbafa7	Merge branch 'opengl-fullbrightsprite-fix' into 'master' ... OpenGL: Fix FF_FULLBRIGHT not working in sectors with multiple light levels See merge request STJr/SRB2!244	2018-06-03 15:05:00 -04:00
Monster Iestyn	a3d8ceb9e5	Merge branch 'fof-sector-special-fixes' into 'next' ... FOF sector special fixes See merge request STJr/SRB2!242	2018-06-03 15:03:10 -04: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	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
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
MascaraSnake	90d6f1d5ba	Merge branch 'flat-alignment-change' into 'master' ... Change to linedef type 7 (flat alignment): If no tag is given, affect front sector. See merge request STJr/SRB2Internal!145	2018-05-15 03:40:31 -04: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
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
Steel Titanium	29e80c5300	Don't increment totalplaytime if a demo is playing.	2018-05-08 18:16:01 -04: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
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
toaster	5f79a2f1df	Merge branch 'delag_maces' into 'master' ... Delag Maces See merge request STJr/SRB2Internal!141	2018-04-07 18:11:31 -04:00