10645 commits

Author	SHA1	Message	Date
Hannu Hanhi	7941a5fb63	R_FindPlane optimization	2020-10-18 01:27:01 +03:00
Zippy_Zolton	f602944efd	titlecard	2020-10-17 15:51:22 -05:00
GoldenTails	00f38d41e5	Give the GIF dynamic delay memory to base future delays off of, instead of calculating for the current frame and being jank	2020-10-17 07:10:24 -05:00
James R	4b0725f36f	Use FIELDFROM in lua polyobject code	2020-10-15 16:17:51 -07:00
James R	374c19f915	Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro	2020-10-15 16:15:20 -07:00
James R	d6b314951e	Merge branch 'step-down-ceiling' into 'next' ... Apply step up/down to opposite plane too See merge request STJr/SRB2!1192	2020-10-15 19:11:13 -04:00
James R	bd9fda8ceb	Merge branch 'lua-polyobjects' into 'next' ... Lua polyobjects Closes #19 See merge request STJr/SRB2!1140	2020-10-15 19:08:54 -04:00
James R	31977878e1	Merge branch 'raretry-fix' into 'next' ... Make record attack's quick retry more consistent. Closes #80 See merge request STJr/SRB2!1193	2020-10-15 19:02:34 -04:00
Jaime Passos	70ada935ec	Don't free PU_HWRCACHE and PU_HWRCACHE_UNLOCKED memory tags in HWR_ClearAllTextures. ... Probably fixes a random annoying crash around that function. (I was also suspecting renderer switching was doing other slightly weird stuff.)	2020-10-15 14:31:16 -03:00
Jaime Passos	060c25c14d	[Software floor sprites] Set the colormap and translation outside of the loop	2020-10-15 14:12:19 -03:00
Jaime Passos	bf9ed39ec3	Change vis->transmap statement	2020-10-15 14:05:18 -03:00
Jaime Passos	bc3ac7615f	Remove unnecessarily duplicated code in R_GetSpriteTranslation	2020-10-15 11:32:21 -03:00
Jaime Passos	8294479a5f	Merge branch 'next' into allowshaders	2020-10-15 01:25:11 -03:00
Jaime Passos	4c59f8c615	Fix OpenGL GIF recording crashing with gif_localcolortable disabled	2020-10-15 01:14:16 -03:00
Jaime Passos	50bd8abc78	Fix precipitation	2020-10-15 00:03:32 -03:00
Jaime Passos	3bace37a25	Don't project if rot_y is less than a single fracunit	2020-10-14 21:26:23 -03:00
Jaime Passos	bf8bb383ab	Simplify the floor splat clipping code a bit	2020-10-14 21:20:37 -03:00
Steel Titanium	b19764dc8e	Merge branch 'master' into next	2020-10-14 14:58:07 -04:00
Jaime Passos	b4294220e5	Fix a crash in R_CalculateSlopeVectors called from R_RenderFloorSplat	2020-10-14 14:08:25 -03:00
Jaime Passos	e63efdac13	Only create floor sprite slopes when needed, instead of always allocating them. ... Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.	2020-10-14 13:07:02 -03:00
sphere	a2ff89f007	Make record attack's quick retry more consistent.	2020-10-14 17:39:23 +02:00
James R	b35633bb61	brug	2020-10-14 01:19:43 -07:00
James R	cce55ccf90	Merge branch 'ffloorclip-2' into 'next' ... Software 3D floor rendering optimization (second attempt) See merge request STJr/SRB2!1184	2020-10-14 03:10:44 -04:00
James R	f7e9772e10	Merge branch 'i-pity-you' into 'next' ... Allow JumpSpin abilities to be used with non-ability shields Closes #277 See merge request STJr/SRB2!1146	2020-10-14 03:08:20 -04:00
Jaime Passos	ab526e47cc	Implement object-defined floor sprite slopes.	2020-10-14 00:57:13 -03:00
Jaime Passos	a8a66f698a	[Software] Use the light at the bottom of the object for splats	2020-10-13 23:14:05 -03:00
James R	bc23f582fe	Don't need to set this actually	2020-10-13 19:11:18 -07:00
James R	5fca04c3dd	Apply step up/down to opposite plane too	2020-10-13 19:04:52 -07:00
Jaime Passos	4b7bfce95e	Implement sloped floor sprites	2020-10-13 22:42:07 -03:00
Jaime Passos	fccbc00cac	Fix the wrong freeing function call being used in Patch_FreeData	2020-10-13 19:18:01 -03:00
Jaime Passos	63e471d902	Correctly return the output patch's size in Picture_PatchConvert	2020-10-13 19:16:25 -03:00
Zippy_Zolton	6fd226eb29	Crosshair fix, no GAMEQUIT	2020-10-13 16:41:39 -05:00
Jaime Passos	0e62cb2ada	Fix infinitely long splat spans	2020-10-13 17:03:50 -03:00
Zippy_Zolton	5d699591c7	more!!!!! :3	2020-10-13 14:23:56 -05:00
Jaime Passos	4273896311	Implement relative and absolute sprite offsets for objects (mobjs) ... Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS	2020-10-13 12:57:36 -03:00
Zippy_Zolton	45b52e3729	good night	2020-10-13 02:19:20 -05:00
Zippy_Zolton	2ba1017dab	More whitelists :D	2020-10-13 02:13:35 -05:00
Jaime Passos	87e5d63723	Improve sorting between sprites and floor sprites	2020-10-13 02:24:18 -03:00
Jaime Passos	95d0097df6	Improve splat sorting: ... Adjust the sort scale of splats Do splat sorting in R_CreateDrawNodes if either vissprite is a splat, instead of if both are	2020-10-13 01:45:18 -03:00
Jaime Passos	7dbd34345c	Fix splat sorting	2020-10-13 01:09:17 -03:00
Jaime Passos	f2aca01e2b	Fix other uninitialized variable warnings	2020-10-13 00:14:27 -03:00
Jaime Passos	1ea3bd8fff	Fix uninitialized variable warning	2020-10-12 22:08:45 -03:00
Jaime Passos	453f49cb77	Fix floorsprites not being rendered when viewed from the bottom	2020-10-12 22:07:11 -03:00
James R	cb8f6097cf	Merge branch 'save-netvars' into 'next' ... Save netvars See merge request STJr/SRB2!1179	2020-10-12 19:03:01 -04:00
Jaime Passos	831ccccdd6	OpenGL support for splats, fix some shadow draw bugs in Software	2020-10-12 19:53:21 -03:00
James R	58464771a8	Merge branch 'addfile-vararg' into 'next' ... Give the addfile command variable argument support. See merge request STJr/SRB2!1176	2020-10-12 18:32:20 -04:00
lachwright	6a73e81227	Merge remote-tracking branch 'origin/next' into i-pity-you	2020-10-13 09:24:09 +11:00
James R	d73fbd8616	Merge branch 'slight-shader-cleanup' into 'next' ... Shader code cleanup See merge request STJr/SRB2!1103	2020-10-12 18:22:08 -04:00
GoldenTails	87a5e1d30c	Futureproof against strict buildbots.	2020-10-12 17:14:32 -05:00
James R	d7b8d5d0f3	Merge branch 'penalty-of-death' into 'next' ... I am going to die :D (closes #337) Closes #337 See merge request STJr/SRB2!1183	2020-10-12 18:11:09 -04:00
James R	5a5024faf4	Merge branch 'skip-credits-gone-wrong' into 'next' ... Fix clients being able to skip credits AGAIN (closes #339) Closes #339 See merge request STJr/SRB2!1182	2020-10-12 18:09:48 -04:00
James R	d4bef36c19	Merge branch 'specialstagecheck' into 'next' ... A special stage is a special stage, even outside of coop. Closes #211 See merge request STJr/SRB2!1180	2020-10-12 18:08:02 -04:00
James R	d1c8d41f94	Merge branch 'no-demo-visit' into 'next' ... Don't count demo playback as visiting a level. Closes #327 and #340 See merge request STJr/SRB2!1177	2020-10-12 18:05:43 -04:00
GoldenTails	94f6d0b002	Fix gzip failing to compress SRB2's objdump on non-Windows.	2020-10-12 16:59:47 -05:00
James R	35c666514b	Merge branch 'splitscreen-parameter' into 'next' ... Add `-splitscreen` commandline parameter See merge request STJr/SRB2!1175	2020-10-12 17:46:55 -04:00
James R	9538ca696a	Merge branch 'ceilingz' into 'next' ... Add P_CeilingzAtPos function See merge request STJr/SRB2!1164	2020-10-12 17:44:51 -04:00
Jaime Passos	b620f4835a	Support spritexscale and spriteyscale in OpenGL ... Fix papersprite scaling with spritexscale and spriteyscale in Software	2020-10-12 17:25:18 -03:00
Zippy_Zolton	da27f720da	Whitelist the "X" shown in the HUD	2020-10-11 23:22:16 -05:00
Jaime Passos	cc97e22e2f	Changes to sprite rendering: ... - Added render flags (see r_defs.h) - Implemented floor splats - Drop shadow sprite rendering through render flags	2020-10-12 00:13:22 -03:00
Jaime Passos	b808b3ef41	Move calculation of rotated patch dimensions into its own function ... Simplify rotation code when the pivot isn't in the center	2020-10-11 03:39:31 -03:00
James R	7f8ec74c27	Use the macro in sectorlines_num too	2020-10-10 17:40:01 -07:00
James R	8bc8946be8	Turn the lua sector lines hack into a macro	2020-10-10 16:43:09 -07:00
Jaime Passos	6145442a34	Fix rotated flipped patches	2020-10-10 19:06:29 -03:00
Jaime Passos	b2f45986ad	Add r_patchrotation.h	2020-10-10 18:53:05 -03:00
Jaime Passos	6e5f71dd45	Refactor patch rotation	2020-10-10 18:43:26 -03:00
Jaime Passos	b15bbd505c	Merge branch 'next' into patch-stuff-again-2	2020-10-10 17:01:10 -03:00
Hannu Hanhi	465693b242	Put newline to end of m_perfstats.h	2020-10-10 22:23:33 +03:00
Hannu Hanhi	4f20a20165	Performance stats	2020-10-10 22:12:34 +03:00
Jaime Passos	06c0932ab4	Only check the tRNS (trans) chunk if the image is still palettized	2020-10-10 14:17:53 -03:00
Jaime Passos	4d847f4223	Compare the PNG's palette with the game's palette instead of assuming they are the same	2020-10-10 14:17:42 -03:00
Jaime Passos	0021a9aeaf	Fix bug	2020-10-10 13:37:23 -03:00
Jaime Passos	c5a3a61b28	Make 3D floors cull areas below or above them to reduce overdraw (2)	2020-10-10 01:00:39 -03:00
James R	4b5cb8025b	Show revert value of cvar with help command	2020-10-09 16:28:03 -07:00
James R	b67807dd04	When save/loading config use revert value for netvars if you are not the server	2020-10-09 16:22:17 -07:00
James R	f5e4d076b9	Add CV_NETVAR to server affecting cvars ... showjoinaddress maxplayers joindelay rejointimeout resynchattempts blamecfail maxsend noticedownload downloadspeed jointimeout maxping pingtimeout servername	2020-10-09 15:23:16 -07:00
James R	aa102dcea0	Add CV_SAVE to netvars ... dumpconsistency allowjoin joinnextround restrictskinchange allowteamchange startinglives respawndelay competitionboxes allowseenames matchboxes specialrings powerstones countdowntime touchtag hidetime autobalance teamscramble scrambleonchange friendlyfire overtime pointlimit timelimit basenumlaps allowexitlevel inttime coopstarposts cooplives advancemap playersforexit exitmove pausepermission respawnitemtime respawnitem flagtime tv_recycler tv_teleporter tv_superring tv_supersneaker tv_invincibility tv_jumpshield tv_watershield tv_ringshield tv_forceshield tv_bombshield tv_1up tv_eggmanbox	2020-10-09 15:06:09 -07:00
Zippy_Zolton	1c751fdf0f	I am going to die :D	2020-10-09 15:42:55 -05:00
James R	a17446f905	Oops, go straight to evaluation if not in a netgame ... serverrunning means that you are actually the server.	2020-10-09 13:16:56 -07:00
sphere	76d16473b9	how did this even happen	2020-10-09 05:55:10 -04:00
Jaime Passos	0811f60b2a	Let the server or an admin toggle clients' custom shaders	2020-10-09 02:06:13 -03:00
James R	15008f31a7	Merge branch 'sanity-meter-empty' into 'next' ... Replace cvar initializers with a macro See merge request STJr/SRB2!1178	2020-10-08 22:02:25 -04:00
James R	7c72eab58b	Merge branch 'manifest-stuff' into 'next' ... Provide a default exe manifest See merge request STJr/SRB2!1174	2020-10-08 22:01:17 -04:00
James R	ddb6823fe5	Merge branch 'fix-theoretical-lua-exposure-crashes' into 'next' ... Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions in Lua. See merge request STJr/SRB2!1173	2020-10-08 22:01:02 -04:00
James R	45b9e23895	Merge branch 'ogl-driver-error' into 'next' ... Add error message when the GDI Generic OpenGL renderer is encountered in Windows See merge request STJr/SRB2!1172	2020-10-08 22:00:43 -04:00
James R	933381fb8f	Merge branch 'expose-modversion-to-lua' into 'next' ... Expose MODVERSION to Lua (because for some reason it wasn't). See merge request STJr/SRB2!1158	2020-10-08 21:57:38 -04:00
James R	d83a112fc5	Merge branch 'next' into 'next' ... Updated 16 bit momentum values to 32 bit in demos, changed demo version See merge request STJr/SRB2!1157	2020-10-08 21:56:30 -04:00
Jaime Passos	63d4c1dffc	Merge remote-tracking branch 'origin' into slight-shader-cleanup	2020-10-08 22:45:39 -03:00
James R	c3c34c489b	Merge branch 'lua-sectorsounds' into 'next' ... Support sectors as sound origins in Lua See merge request STJr/SRB2!1144	2020-10-08 21:05:01 -04:00
James R	355cc1a697	Merge branch 'autocomplete-aliases' into 'next' ... Autocomplete aliases in console See merge request STJr/SRB2!1113	2020-10-08 20:30:07 -04:00
James R	88b3a3cd2e	Merge branch 'v-string-colormap-lua-exposure' into 'next' ... Expose V_GetStringColormap to Lua via v.getStringColormap(). See merge request STJr/SRB2!1111	2020-10-08 20:28:25 -04:00
James R	95a5bb888a	Merge branch 'chain-attraction-homing' into 'next' ... Chain Homing with Attraction Shield See merge request STJr/SRB2!1109	2020-10-08 20:19:21 -04:00
sphere	b71c75d2ec	A special stage is a special stage, even outside of coop.	2020-10-08 18:45:20 +02:00
James R	b3d8ed7d43	Revert netvars after leaving a netgame	2020-10-06 23:32:11 -07:00
James R	dbd79a29a4	Replace C90's junk with a modest macro	2020-10-06 23:04:23 -07:00
Zachary McAlpin	0f3c87a705	Made states unmodifable in CMD building code	2020-10-06 16:54:23 -05:00
Zachary McAlpin	e393093e73	Update comment	2020-10-06 16:43:14 -05:00
sphere	f210316d8a	Only set MV_MP in multiplayer or a netgame.	2020-10-06 19:06:06 +02:00
sphere	48ca58f580	Don't count demo playback as visiting a level.	2020-10-06 16:49:53 +02:00
GoldenTails	d5848e78fc	Update help message to mention supported file extensions, and change the description to "Load add-ons"	2020-10-06 03:37:23 -05:00
Zachary McAlpin	1681371fbd	Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port	2020-10-06 02:07:05 -05:00
GoldenTails	2d3a589167	Add warning when files are skipped due to being previously processed.	2020-10-04 21:03:29 -05:00
GoldenTails	0b74818771	Give the addfile command variable argument support.	2020-10-04 21:02:20 -05:00
gm3k4g	2cc8de2bdd	Added splitscreen command line parameter	2020-10-05 00:12:13 +03:00
Steel Titanium	0aa1b16fd1	Provide a default exe manifest	2020-10-03 19:53:59 -04:00
GoldenTails	2ae5c02050	Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions.	2020-10-03 13:24:47 -05:00
Louis-Antoine	e49032eaf7	Let Lua scripts access userdata metatables	2020-10-03 18:40:37 +02:00
Hannu Hanhi	684b868524	Add error message when the GDI Generic OpenGL renderer is encountered in Windows	2020-10-03 18:45:56 +03:00
Louis-Antoine	121c7da809	Let Lua scripts relink tables to their metatables when unarchiving ... This is done through the new "registermetatable" function, in a somewhat similar fashion to "freeslot" but for metatables: it must be called at script load to tell SRB2 your metatable can be automatically relinked during the unarchiving process.	2020-10-03 16:31:04 +02:00
James R	17ce7d57c3	Merge branch 'update-228' into 'next' ... 2.2.8 prep See merge request STJr/SRB2!1170	2020-10-03 01:45:06 -04:00
James R	b1d59c6641	Merge branch 'picfmt-pngfix' into 'next' ... Fix uninitialized variable issue in patches with missing grAb chunks See merge request STJr/SRB2!1171	2020-10-02 20:24:10 -04:00
James R	27d96bb21c	Merge branch 'fartification' into 'next' ... Prevent Canarivore gas from teleporting up walls See merge request STJr/SRB2!1154	2020-10-02 20:23:36 -04:00
James R	8beee3761e	Merge branch 'windows-console-go-brrr' into 'next' ... Fix #178 Closes #178 See merge request STJr/SRB2!1112	2020-10-02 20:23:20 -04:00
James R	c35c5ad568	Merge branch 'remove-renderer-notice' into 'next' ... Remove "The OpenGL renderer is incomplete" notice (closes #281) Closes #281 See merge request STJr/SRB2!1169	2020-10-02 20:22:38 -04:00
Jaime Passos	ebf50aad44	Use leftoffset and topoffset, not loffs and toffs	2020-10-02 20:40:42 -03:00
James R	401508e9d4	Update Srb2win.rc	2020-10-02 16:11:39 -07:00
James R	c51a4c8fb1	Update version to 2.2.8	2020-10-02 16:10:21 -07:00
James R	1c6c51744c	Update patch.pk3	2020-10-02 16:07:15 -07:00
Jaime Passos	aaa9cff6ac	Fix PNG issue in OpenGL + optimize PNG sprite loading	2020-10-02 19:48:13 -03:00
James R	be4c5751f8	Revert "Warn when going to OpenGL from the menu" ... This reverts commit 569453ee93. And one line from b6089ccdaf.	2020-10-02 15:37:23 -07:00
Steel Titanium	386db4b7a1	Model fallback	2020-10-02 15:45:43 -04:00
James R	8a8e0ceda2	Move HU_LoadGraphics after startuppwads are loaded ... This is needed for graphics replacements to take effect.	2020-10-02 11:54:58 -07:00
James R	61cae79bd4	Fix off by one	2020-10-01 16:55:17 -07:00
James R	1cfb1f673b	Add wads from the -file parameter after netvars are registered ... This is so netvars registered by any lua scripts will load in the correct order.	2020-10-01 16:50:31 -07:00
sphere	a9a0137d22	Remove "RC3"	2020-09-30 20:25:55 +02:00
sphere	d45d5b4e20	Merge branch 'credits-changes' into 'next' ... Credits changes See merge request STJr/SRB2!1161	2020-09-30 13:25:39 -04:00
lachwright	e715b2f01a	Update ICNS icon for macOS ... Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!	2020-10-01 02:47:24 +10:00
Snu	bfd8bd7564	comment typo	2020-09-30 08:44:43 +01:00
Snu	8a00b47b38	Make the function ACTUALLY work	2020-09-30 08:40:21 +01:00
Snu	82ceddb2be	god damnit	2020-09-30 08:10:28 +01:00
Snu	feb011ee52	Expose function to Lua	2020-09-30 07:58:41 +01:00
Snu	ca88db00cd	Create P_CeilingzAtPos function	2020-09-30 07:56:57 +01:00
Snu	afcadb3232	Remove all instances of PF_CANBUSTFLOORS	2020-09-29 20:16:06 +01:00
sphere	2642df4c98	Fix Arrietty's name being misspelled.	2020-09-29 18:06:50 +02:00
sphere	2ebe731bd4	Game design is a team effort.	2020-09-29 17:23:44 +02:00
Snu	cd4f755e53	Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively.	2020-09-29 13:52:35 +01:00
Snu	75042d781f	Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls.	2020-09-29 13:47:48 +01:00
Snu	90fbb752fa	Add functionality to PF_CANBREAKFLOORS	2020-09-29 12:58:36 +01:00
Snu	04b749f1f9	Remove SF_BUSTABLEBUSTER, change SF_CANBREAKFLOORS to a pflags; PF_CANBREAKFLOORS	2020-09-29 11:05:04 +01:00
Snu	d07422bda1	Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS.	2020-09-29 10:32:45 +01:00
Snu	07a57d0419	Add SF_CANBREAKWALLS, SF_CANBREAKFLOORS and SF_BUSTABLEBUSTER	2020-09-29 09:45:34 +01:00
sphere	2e172de6eb	Merge Programming and Programming Assistance, and some other tweaks.	2020-09-28 15:54:10 +02:00
sphere	a3d09ca625	These people deserve to be in the credits proper, also formatting fixes.	2020-09-28 14:48:55 +02:00
Lachlan	becc42920b	Bump RC version	2020-09-28 11:39:57 +08:00
Lachlan	5946b54a92	Fix compiler warning	2020-09-28 11:38:56 +08:00
Lachlan	7697553498	Update patch.pk3 checksum	2020-09-28 11:12:15 +08:00
Lachlan Wright	09c83b43b1	Merge branch 'fix-shoop-da-koop' into 'next' ... Fix Eggmobile spawning Bowsers after hitting Fang with pinch phase laser Closes #288 See merge request STJr/SRB2!1160	2020-09-27 22:42:28 -04:00
Lachlan Wright	ca2eb78055	Merge branch 'special-stage-respects-nextmapoverride' into 'next' ... Make Special Stage map transitions respect nextmapoverride. See merge request STJr/SRB2!1129	2020-09-27 22:42:07 -04:00
Lachlan Wright	27b7b5efce	Merge branch 'fix-noscalepatch-with-string-drawers' into 'next' ... Fix string drawing functions so they account for V_NOSCALEPATCH effectively… See merge request STJr/SRB2!1107	2020-09-27 22:41:39 -04:00
Monster Iestyn	ddd59a6e9d	A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser	2020-09-26 17:31:49 +01:00
SteelT	060f46653d	Merge branch 'ogl-model-uv-adjust' into 'next' ... Re-adjust model UVs when sprite texture dimensions change See merge request STJr/SRB2!1068	2020-09-25 21:19:59 -04:00
Steel Titanium	9e036e6291	Fix quotes appearing in product version string	2020-09-25 18:55:37 -04:00
Steel Titanium	375d09c734	Update patch.pk3 hash	2020-09-25 18:15:52 -04:00
Steel Titanium	5d54c70bfa	Change prerelease version suffix to RC2	2020-09-25 17:58:02 -04:00
James R	057d765821	Add Jeck to the credits	2020-09-25 11:47:24 -07:00
Lachlan Wright	b4f9767b7b	Merge branch 'sound-origin' into 'next' ... Apply volume to sounds with origin too See merge request STJr/SRB2!1156	2020-09-25 10:04:46 -04:00
Lachlan Wright	92b61aacd8	Merge branch 'name-change-spam' into 'next' ... Don't let players change their name more than five times per minute See merge request STJr/SRB2!1155	2020-09-25 09:36:39 -04:00
Lachlan Wright	86b7957b61	Merge branch 'clarity' into 'next' ... Add-on clarity from Kart See merge request STJr/SRB2!1153	2020-09-25 09:33:04 -04:00
Lachlan Wright	1caf92f0ae	Merge branch 'fix-236' into 'next' ... Only allow explicitly living players to trigger sector specials Closes #236 See merge request STJr/SRB2!1152	2020-09-25 09:31:06 -04:00
Lachlan Wright	8f5f248c87	Merge branch 'turret-seeing-ghosts' into 'next' ... Fix P_SupermanLook4Players assigning spectators as targets Closes #209 See merge request STJr/SRB2!1151	2020-09-25 09:30:38 -04:00
Lachlan Wright	9208f0bc33	Merge branch 'no-skincolor-space-warning' into 'next' ... Remove "skincolor name contains spaces" console warning Closes #280 See merge request STJr/SRB2!1148	2020-09-25 09:30:24 -04:00
Lachlan Wright	3117dfaf2b	Merge branch 'botsavestuff' into 'next' ... Save changes made to the bot's skin, and display it properly in save select See merge request STJr/SRB2!1147	2020-09-25 09:30:03 -04:00
Lachlan Wright	256fa9fa10	Merge branch 'more-helpful-lua-error' into 'next' ... Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened See merge request STJr/SRB2!1145	2020-09-25 09:28:49 -04:00
Lachlan Wright	c42f247ce5	Merge branch 'snake-fixes' into 'next' ... Fix bonus items sometimes overriding apples in Snake minigame See merge request STJr/SRB2!1134	2020-09-25 09:23:33 -04:00
Lachlan Wright	f1d2992f51	Merge branch 'dye-fix' into 'next' ... Fix players not properly decolorizing via linedef action See merge request STJr/SRB2!1127	2020-09-25 08:54:16 -04:00
Lachlan Wright	982435cf86	Merge branch 'more-stats' into 'next' ... Add tic and UI times to render stats See merge request STJr/SRB2!1125	2020-09-25 08:54:01 -04:00
Lachlan Wright	650635e780	Merge branch 'w-initfile-bruh' into 'next' ... Fix a bug where adding the same mod multiple times counted towards the mod limit See merge request STJr/SRB2!1124	2020-09-25 08:52:22 -04:00
Lachlan Wright	7fee293034	Merge branch 'gl-shearing-fix-2' into 'next' ... Fix cv_glshearing 2 in first person See merge request STJr/SRB2!1114	2020-09-25 08:51:57 -04:00
Lachlan Wright	dbc32ea9ea	Merge branch 'console-silly-characters' into 'next' ... Get rid of some silly behavior with certain characters in console See merge request STJr/SRB2!1110	2020-09-25 08:31:08 -04:00
Lachlan Wright	86252cbea7	Merge branch 'more-nodes' into 'next' ... Increase MAXNETNODES, show more servers in the server browser See merge request STJr/SRB2!1106	2020-09-25 08:24:16 -04:00
GoldenTails	021061d80b	Expose MODVERSION to Lua (because for some reason it wasn't). ... The wiki even states its existence!	2020-09-23 22:28:29 -05:00
James R	30056157c2	Merge branch 'listserv' into 'next' ... Percent decode listserv (closes #244) Closes #244 See merge request STJr/SRB2!1150	2020-09-23 18:43:41 -04:00
James R	aa4c1eeea8	Merge branch 'bird-pain' into 'next' ... Fix playing back demos never working (closes #203) Closes #203 See merge request STJr/SRB2!1149	2020-09-23 18:37:56 -04:00
Riku Salminen	e947007920	Wrote 3 lines in 1, as Zwip-Zwap Zapony suggested	2020-09-23 22:37:06 +03:00
Riku Salminen	b261e17fdd	Update g_demo.c, Remove old comments of fractional loss of one byte	2020-09-23 15:29:03 -04:00
Riku Salminen	1447aba964	Updated 16 bit momentum values to 32 bit in demos, changed demo version	2020-09-23 21:26:51 +03:00
James R	de9d1d2b35	Forgot to commit s_sound.h	2020-09-22 20:51:01 -07:00
James R	b18d60c1d3	Apply volume to sounds with origin too ... Previously sounds with an origin would always start at max volume. This is because the distance calculation adjusts the volume, and that volume needs to be updated every tic as distance changes. Storing the original volume works. (cherry picked from commit 22177753d2f00d58d19d930f51dcd086097dfd0d)	2020-09-22 20:47:31 -07:00
James R	b655fa496e	Don't let players change their name more than five times per minute ... (ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)	2020-09-22 12:04:28 -07:00
lachwright	9ae2010880	Allow Canarivore gas to interact with players again (oops)	2020-09-22 13:11:56 +09:30
lachwright	5d1a95b9c6	Prevent Canarivore gas from teleporting up walls	2020-09-21 17:23:53 +09:30
Zippy_Zolton	62f379ec41	Add-on clarity from Kart	2020-09-20 13:07:28 -05:00
lachwright	7eb760afca	Only allow explicitly living players to trigger sector specials	2020-09-20 11:49:53 +09:30
Tatsuru	a52afc2baf	Ignore spectators	2020-09-19 23:10:03 -03:00
James R	5edcc72839	Shitty decode listserv	2020-09-19 18:54:04 -07:00
James R	9e31adf22c	Merge branch 'objectplace' into 'next' ... Fix & improve objectplace Closes #232 See merge request STJr/SRB2!1139	2020-09-19 21:40:55 -04:00
James R	9684149ba6	Merge branch 'start-netid-at-1' into 'next' ... Avoid CV_FindNetVar returning a normal cvar (closes #251) Closes #251 See merge request STJr/SRB2!1137	2020-09-19 21:40:45 -04:00
James R	bdb44e6ce1	Don't ifdef CV_LoadDemoVars out if OLD22DEMOCOMPAT defined	2020-09-19 18:34:52 -07:00
kaysrishaq	c3430951be	Update lua_infolib.c	2020-09-18 17:47:38 -04:00
lachwright	a78a0071f2	Save changes made to the bot's skin, and display it properly in save select	2020-09-17 19:00:49 +09:30
lachwright	2bb5b42960	Allow JumpSpin abilities to be used with non-ability shields	2020-09-16 16:50:10 +09:30
Steel Titanium	16569b4e9a	Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened ... Shouldn't break scripts as it stops execution as soon it happens, like it already does.	2020-09-14 22:54:07 -04:00
Tatsuru	013714a26f	Encapsulate userdata checks	2020-09-14 17:33:26 -03:00
Monster Iestyn	0f2e063de0	Added the ability to modify parent, flags, translucency in polyobj_t ... (attempting to edit polyobj.angle just gives you an error message saying to use polyobj:rotate() instead)	2020-09-13 21:38:16 +01:00
Tatsuru	8d65ce81c7	Legacy moment	2020-09-13 14:30:02 -03:00
Tatsuru	454682df70	Use the sector's actual soundorg (how did it even work)	2020-09-13 13:54:43 -03:00
Tatsuru	782e559adf	Check for sector_t userdata as well	2020-09-13 12:33:18 -03:00
SteelT	90302330ed	Merge branch 'make-float-strings-great-again' into 'next' ... Can we just do this please? Thanks. See merge request STJr/SRB2!1142	2020-09-11 11:47:04 -04:00
SteelT	9f09e32520	Merge branch 'remove-bt_use-deprecation' into 'next' ... Remove BT_USE and PF_USEDOWN warning See merge request STJr/SRB2!1138	2020-09-10 16:06:20 -04:00
SteelT	a033f482be	Merge branch 'pictureformats' into 'next' ... PNG conversion refactoring See merge request STJr/SRB2!675	2020-09-10 15:58:18 -04:00
Jaime Passos	0750d273a6	Attempt to use the PNG image's palette, if it is present	2020-09-10 03:16:21 -03:00
Jaime Passos	4e437076c1	Use color look-up table for PNG conversion	2020-09-10 02:10:31 -03:00
Jaime Passos	f24647dc4d	Change method of color look-up table generation	2020-09-10 01:43:46 -03:00
GoldenTails	c61eeb9238	Can we just do this please? Thanks.	2020-09-09 22:19:14 -05:00
Monster Iestyn	097986b1d9	added polyobj_t to userdataType list ... (also added slope_t, vector2_t and vector3_t since they were all missing from here)	2020-09-09 21:24:07 +01:00
Monster Iestyn	78f7998618	Added polyobj.vertices and polyobj.lines to Lua	2020-09-09 21:15:02 +01:00
Monster Iestyn	4ce161f9c3	Added the functions Polyobj_moveXY and Polyobj_rotate to Lua as polyobj.moveXY and polyobj.rotate	2020-09-09 19:38:56 +01:00
Monster Iestyn	f86dad2979	Added new functions as variables of polyobj_t: ... * po.pointInside(po, x, y) as a wrapper for P_PointInsidePolyobj * po.mobjTouching(po, mo) as a wrapper for P_MobjTouchingPolyobj * po.mobjInside(po, mo) as a wrapper for P_MobjInsidePolyobj I can confirm that ":" syntax works with all the above, e.g. po:mobjInside(mo)	2020-09-09 18:09:32 +01:00
Monster Iestyn	5f91833701	lua_maplib.c changes now that polyobj_t is supported: ... * added line.polyobj for line_t * added subsector.polyList iteration function, for iterating polyobjs in a subsector * added seg.polyseg for seg_t, in case we ever reenable support for segs/nodes	2020-09-09 17:31:44 +01:00
Monster Iestyn	89e989d6b1	added "sector" as a Lua-exclusive shortcut to polyobj->lines[0]->backsector in polyobj_t	2020-09-09 17:06:36 +01:00
Monster Iestyn	e6136eb113	lua_blockmaplib.c: added "polyobjs" option to searchBlockmap function ... also updated my copyright years in this file B)	2020-09-09 16:56:48 +01:00
Monster Iestyn	625aeb1560	lua_script.c fixes: ... * make sure polyobj_t userdata is invalidated at level load * add support for syncing polyobj_t Lua variables in netgames	2020-09-09 16:09:08 +01:00
Monster Iestyn	5fc58de94f	* added access to translucency and triggertag in polyobj_t ... * added POF_ flags to INT_CONST in dehacked.c	2020-09-08 22:10:11 +01:00
Monster Iestyn	33c96ab1aa	* added access to id, parent, angle, damage, thrust, flags in polyobj_t ... * #polyobj now returns the index id for the polyobj in PolyObjects * Polyobj_GetForNum is implemented in Lua as PolyObjects.GetForNum()	2020-09-08 21:42:51 +01:00
Monster Iestyn	60b49b5ecd	Fix STJr copyright years, this file was obviously only created today, not 4 years ago!	2020-09-08 18:56:00 +01:00
Monster Iestyn	0bc7eb32e9	make sure to include fastcmp.h, whoops	2020-09-08 18:55:16 +01:00
Monster Iestyn	05fe86ffdc	* started functions for accessing/editing META_POLYOBJ (bare minimum atm) ... * added the "PolyObjects" array as a global var, with index and len functions, as well as its own iterate function	2020-09-08 18:29:10 +01:00
Monster Iestyn	d5beae9738	Begin work on adding access to polyobjects in Lua: ... * create new file lua_polyobjlib.c * made a stub LUA_PolyObjLib function * added META_POLYOBJ to lua_libs.h * updated makefile, CMake and MSVC project files for lua_polyobjlib.c	2020-09-08 18:08:08 +01:00
Bartu İnce	7e9bc0d103	no message	2020-09-08 03:03:48 +03:00
Jaime Passos	dcaad758f4	Improved memory management for patches	2020-09-07 02:23:07 -03:00
lachwright	efc82ffa74	Set additional UDMF parameters on objectplaced mapthings to defaults	2020-09-07 13:08:22 +09:30
lachwright	b805e10058	Let analog control schemes control objectplace like standard control schemes	2020-09-06 19:03:17 +09:30
lachwright	d7ab41a90b	Objectplace improvements: ... - movement speeds are scaled with player scale - spawned objects are scaled with player scale - command accepts argument for thing num to set	2020-09-06 17:28:34 +09:30
James R	ca9cf25423	Fix netid overflow check	2020-09-05 23:23:54 -07:00
GoldenTails	8ae5f3030f	Remove BT_USE and PF_USEDOWN warning ... someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it	2020-09-06 00:30:05 -05:00
James R	30057e9268	Start netid at 1 to avoid CV_FindNetVar returning a regular cvar for netid 0	2020-09-05 22:03:14 -07:00
James R	9a1099ec17	Update SuperPhanto's name with real name per request	2020-09-02 17:59:53 -07:00
James R	7bec06856f	Add SuperPhanto to the art credits	2020-09-01 18:51:47 -07:00
James R	c7c9ae3847	Disable update alert if this is a prerelease	2020-09-01 16:22:29 -07:00
James R	4b7d16283d	Update version to 2.2.7 RC1	2020-09-01 15:38:51 -07:00
James R	72437ae357	Define BETAVERSION as a suffix to the version string	2020-09-01 15:38:27 -07:00
James R	045a5d3dd1	Update patch.pk3 asset hash	2020-09-01 15:26:13 -07:00
Steel Titanium	db6bd42eb1	Allow the game to continue even if the STARTUP lump is somehow missing	2020-09-01 14:46:03 -04:00
Steel Titanium	4509cd3798	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat	2020-09-01 13:54:27 -04:00
GoldenTails	4173b15c8e	Expose V_GetStringColormap to Lua via v.getStringColormap().	2020-09-01 10:47:02 -05:00
James R	b2226e95d6	Merge branch 'master' into next	2020-08-31 16:10:05 -07:00
James R	e593610862	Fix NOHW compiling	2020-08-31 16:09:41 -07:00
James R	6c2370f894	Kill NOHS ... (cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)	2020-08-31 16:06:40 -07:00
James R	2aab765b36	Fix NOGME compiling ... (cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)	2020-08-31 16:04:09 -07:00
James R	679bfa21ed	Fix stupid NONET	2020-08-29 17:51:59 -07:00
James R	a6e59cbb24	Do not do master server things when NOCURL ... (cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)	2020-08-29 17:45:28 -07:00
James R	1f38db4629	C90?	2020-08-29 17:21:54 -07:00
Steel Titanium	b20352141e	Fix compile error	2020-08-29 20:04:11 -04:00
Steel Titanium	0bd71d9980	Attempts to make the intro a bit more shorter ... Make the scene time be 5 seconds long max Use the standard fade which is much shorter in length.	2020-08-29 19:28:16 -04:00
James R	37c647c00e	Merge remote-tracking branch 'origin/master' into next	2020-08-28 19:52:25 -07:00
James R	8d9b16df8c	Merge branch 'makefile-detect-system' into 'master' ... Detect which system the Makefile is running on to compile for See merge request STJr/SRB2!1123	2020-08-28 22:49:34 -04:00
Steel Titanium	3ef8024697	Make the intro shorter as I felt it was a bit too long ... Change the code a bit so less magic numbers.	2020-08-28 20:08:46 -04:00
Steel Titanium	4eaa7e969f	Add new STARTUP lump, for the splash screen	2020-08-28 17:11:38 -04:00
Steel Titanium	a3039a781a	New STJR Intro, replaces the old PURE FAT intro	2020-08-28 17:10:54 -04:00
GoldenTails	ca4ed3b7dd	Make Special Stage map transitions respect nextmapoverride. ... In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars. It's otherwise impossible to do so via Lua.	2020-08-26 23:22:53 -05:00
Tatsuru	48d6ae8e53	Decolorize players as intended	2020-08-24 23:53:21 -03:00
Louis-Antoine	cb06d05692	Fix bonus items sometimes overriding apples in Snake minigame	2020-08-24 00:34:44 +02:00
Hannu Hanhi	dd7d1e40b1	Add tic and ui times to render stats	2020-08-23 20:09:55 +03:00
GoldenTails	d15be1696a	Forgot to check if the file was important, whoops!	2020-08-21 04:00:54 -05:00
GoldenTails	2c5f23bacb	Fix a bug where adding the same mod multiple times counted to the mod limit ... A one line fix. Seriously.	2020-08-21 03:30:22 -05:00
James R	6f51c68c72	Makefile: add WINDOWSHELL=1 for the Windows detect	2020-08-20 20:19:50 -07:00
James R	e340d74e4d	Merge branch 'ringslinger-penalty-snap' into 'next' ... Fix Ringslinger weapon ring penalty missnapment See merge request STJr/SRB2!1120	2020-08-19 18:18:15 -04:00
James R	38d094d3f6	Merge branch 'fix-file-downloading' into 'next' ... Fix bug where SRB2 would check size of disk from current directory instead of srb2home See merge request STJr/SRB2!1121	2020-08-19 18:16:22 -04:00
James R	809ff5c467	Merge branch 'oops-http-mserv' into 'next' ... Fix lingering issues with the http-mserv merge See merge request STJr/SRB2!1117	2020-08-19 18:12:38 -04:00
James R	f92026f98b	Makefile: automatically detect system to compile for, if no system was specified ... This should work for mingw and linux so far.	2020-08-18 18:01:59 -07:00
James R	9495e6354f	Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS	2020-08-18 16:45:00 -07:00
James R	f0bf06aee2	Is it GCC is it gcc, is it???? ... (cherry picked from commit ef2bff6383b16385f9874e1c9c6b66c9df794f5b)	2020-08-18 16:37:19 -07:00
James R	9147474a30	Merge branch 'showjoinaddress-menu' into 'next' ... Add a menu option for showjoinaddress; disable it by default See merge request STJr/SRB2!1115	2020-08-18 19:15:23 -04:00
GoldenTails	0a9c061fea	Fix bug where SRB2 would check size of current directory instead of srb2home ... Hopefully that fixes that one bug with weird filesize issues too	2020-08-18 17:34:32 -05:00
Hannu Hanhi	bda1d1e725	Convince the compiler that I know what I'm doing, I think	2020-08-18 23:21:26 +03:00
James R	300436825d	Cast UINT16 for unlockable_t.height -> alphaKey	2020-08-18 11:19:16 -07:00
Zwip-Zwap Zapony	d87c0eeaf1	Fix Ringslinger weapon ring penalty missnapment	2020-08-18 11:42:35 +02:00
Nev3r	77e438d4bd	Some commenting tweaks.	2020-08-16 11:33:00 +02:00
Jaime Passos	92c4993d67	Introduce Doom patch format into picture formats ... Fixes sprite rotation	2020-08-15 21:52:01 -03:00
Jaime Passos	9b426b474c	Merge branch 'pictureformats' into patch-stuff-again-2	2020-08-15 20:48:28 -03:00
Jaime Passos	8863e13fde	Rename R_CheckIfPatch	2020-08-15 20:14:36 -03:00
Nev3r	b15c760dc2	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag	2020-08-15 13:44:59 +02:00
James R	bcb0854db8	.	2020-08-14 22:38:15 -07:00
James R	0944b5ad6f	Strip a few more instances of SONIC ROBO BLAST 2 KART	2020-08-14 22:18:51 -07:00
James R	58971259ef	Is this SRB2Kart server?	2020-08-14 22:13:28 -07:00
James R	beba43cffc	Add a menu option for showjoinaddress ... I also had to make the "alphaKey" UINT16. Hopefully nothing breaks!	2020-08-14 21:13:15 -07:00
James R	405639bc78	Disable showjoinaddress by default	2020-08-14 21:05:23 -07:00
James R	5ccafe0314	REMOVE THE LAST OF CV_ALLCAPS	2020-08-14 21:01:41 -07:00
Jaime Passos	78cc4a78d0	Refactor renderer switching	2020-08-14 22:27:16 -03:00
Jaime Passos	1751d7afed	Cache the console patch only once in CON_DrawBackpic	2020-08-14 20:48:15 -03:00
Jaime Passos	1950f1c7f7	Fix cv_glshearing 2 in first person	2020-08-14 20:31:30 -03:00
James R	be14b8a564	dumbass doesn't test changes before pushing directly to next	2020-08-14 08:25:12 -07:00
James R	aa19bce4a9	Autocomplete aliases in console	2020-08-14 00:00:45 -07:00
James R	f0a79df2b8	Use AsciiChar to get the input from windows console window	2020-08-13 21:57:36 -07:00
James R	4734b9d728	Stop treating apostrophes, parenthesis and curly braces as separate arguments	2020-08-13 21:11:45 -07:00
Louis-Antoine	9dd5c11322	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate ... # Conflicts: # src/d_clisrv.c # src/d_clisrv.h # src/d_net.c # src/p_saveg.c # src/p_saveg.h	2020-08-13 13:53:10 +02:00
James R	3e02f5d0cb	Add http-mserv to fuck ... (cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)	2020-08-09 23:34:16 -07:00
Steel Titanium	3d1110a0c2	Fix cmake using wrong libs if internal libs is turned on ... Use '\0' instead, just in case (cherry picked from commit 9293c6cb32109b5b003114ab441e312df76f263c)	2020-08-09 20:28:33 -07:00
James R	0af38bc5eb	Bump MAXNETNODES to 127 ... (cherry picked from commit 9d9f8fd8a337a1786efa0d348c89e05b26ce8571)	2020-08-09 18:32:05 -07:00
James R	e9748e5317	Merge branch 'clipboard-crash-fix-2' into 'next' ... Fix buffer overrun in I_ClipboardPaste (resolves #205) Closes #205 See merge request STJr/SRB2!1105	2020-08-09 21:06:18 -04:00
James R	3e8cf5ab06	Merge branch 'bt_spin' into 'next' ... Replace all occurances of BT_USE with BT_SPIN (2.2!) See merge request STJr/SRB2!982	2020-08-09 21:03:17 -04:00
James R	85d0199661	Merge branch 'audio-cleanup' into 'next' ... Audio cleanup See merge request STJr/SRB2!1101	2020-08-09 20:49:28 -04:00
James R	a808294c0c	Merge branch 'kill-cd-support' into 'next' ... Kill CD support See merge request STJr/SRB2!1102	2020-08-09 20:48:25 -04:00
James R	8301e4f93c	Merge branch 'word-delet' into 'next' ... Word delete and backspace in console See merge request STJr/SRB2!1092	2020-08-09 20:46:37 -04:00
James R	8394bf6055	Merge branch 'opengl-skydome-fixes' into 'next' ... Move the sky dome code out of r_opengl.c, fix issues with shaders See merge request STJr/SRB2!1071	2020-08-09 20:45:01 -04:00
James R	23f218117c	Merge branch 'http-mserv' into 'next' ... HTTP Based Master Server + Multithreading See merge request STJr/SRB2!940	2020-08-09 20:24:26 -04:00
James R	46a4bd2d08	Merge branch 'lmaogalog' into 'next' ... Make old analog functional again See merge request STJr/SRB2!1098	2020-08-09 20:13:04 -04:00
GoldenTails	23edfd6d09	Fix string drawing functions so they account for V_NOSCALEPATCH effectively multiplying the width of the screen	2020-08-09 11:03:02 -05:00
James R	5153338bf5	Merge branch 'kill-dos' into 'next' ... Remove support for DOS See merge request STJr/SRB2!1090	2020-08-08 21:26:18 -04:00
James R	cd30f0e933	Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES ... Each server in the server list requires a node. It's also MAXNETNODES-1 because the first node is yourself. (cherry picked from commit 1484f0484f6c22382b2cae955a93c01f83d54655)	2020-08-08 15:13:21 -07:00
James R	54e446199d	Merge remote-tracking branch 'origin/next' into http-mserv	2020-08-08 15:05:03 -07:00
Jaime Passos	9772bbeda1	Fix buffer overrun in I_ClipboardPaste	2020-08-08 15:36:01 -03:00
Jaime Passos	2a0e47e28f	Remove LUA_PATCH_SAFETY	2020-08-08 14:56:04 -03:00
Jaime Passos	91ed56ef40	Refactor patch loading	2020-08-08 05:16:47 -03:00
Jaime Passos	74dfa9f700	Shader code cleanup	2020-08-07 18:17:05 -03:00
Steel Titanium	dff0e87e03	Kill CD support	2020-08-07 17:06:19 -04:00
Steel Titanium	2d39af8604	Remove all this unused playlist related code	2020-08-07 16:44:16 -04:00
Steel Titanium	5c53157192	Remove every musserv and sndserv def'd code	2020-08-07 16:40:46 -04:00
James R	cc677d2d50	Merge branch 'com-buf-insert-text-optional-player' into 'next' ... Make the player optional for COM_BufInsertText and COM_BufAddText. See merge request STJr/SRB2!1093	2020-08-05 19:53:28 -04:00
James R	cc508d0ba3	Merge branch 'ogl-model-lighting-shader' into 'next' ... Add capability to use model lighting with shaders enabled See merge request STJr/SRB2!1073	2020-08-05 19:50:31 -04:00
James R	1c9633504d	Merge branch 'hide-followmobj' into 'next' ... Hide Metal Sonic's jet fume in first person Closes #204 See merge request STJr/SRB2!1099	2020-08-05 19:47:13 -04:00
James R	a31c8d12b4	Merge branch 'udmf-fixmapthingheight' into 'next' ... UDMF: Fix mapthing spawn height scaling improperly with the object scale; only special… See merge request STJr/SRB2!1096	2020-08-05 19:46:48 -04:00
James R	d8834143cb	Merge branch 'ogl-sector-alignment-fix' into 'next' ... Fix sector flat alignment issues in OpenGL See merge request STJr/SRB2!1094	2020-08-03 12:47:29 -04:00
James R	f5d9029d2a	Merge branch 'ogl-big-room-fix' into 'next' ... Big room fix for OpenGL See merge request STJr/SRB2!1089	2020-08-03 12:44:09 -04:00
lachwright	3a96142c8b	Hide Metal Sonic's jet fume in first person	2020-08-03 20:09:35 +08:00
Nev3r	ba5d09eb2e	Fix smooth brain bruhments.	2020-07-31 22:38:37 +02:00
Nev3r	0520725069	Fix the OpenGL FOF issue with a different approach. Not fond of it either but at least it works.	2020-07-31 14:55:26 +02:00
Zachary McAlpin	e5b6d19f57	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port	2020-07-30 15:37:41 -05:00
lachwright	837c9bbec3	Make old analog functional again	2020-07-30 18:22:15 +08:00
Nev3r	b99385e159	Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now.	2020-07-30 09:45:58 +02:00
James R	40dc532ea2	Merge branch 'clarify-md5-mismatch' into 'next' ... Include "is old" in the list of possible causes for a MD5 mismatch. See merge request STJr/SRB2!1095	2020-07-29 21:19:23 -04:00
Nev3r	c914ac99b4	Bring back P_FindSpecialLineFromTag() for backwards compatibility reasons; emulate the old taglist behavior for this function.	2020-07-29 17:26:43 +02:00
Nev3r	729c8b2ec6	Fix FOF intersections with multitags for the OpenGL in a kind of hacky way.	2020-07-29 14:53:27 +02:00
Nev3r	3b55c9e940	Fix FOF intersections in multitagging for the software renderer.	2020-07-29 14:52:21 +02:00
Nev3r	c65ada7dd7	Merge branch 'next' into udmf-multitag ... # Conflicts: # src/hardware/hw_main.c	2020-07-29 13:55:14 +02:00
Nev3r	f791c1b4ec	Fix gl_linedef renaming which went off radars on the udmf branch	2020-07-28 20:39:11 +02:00
Nev3r	6dfe236602	Merge branch 'udmf-next' into 'next' ... Merge udmf-next into next See merge request STJr/SRB2!1075	2020-07-28 14:03:59 -04:00
GoldenTails	55d137215f	Include "is old" in the list of possible causes for a MD5 mismatch.	2020-07-28 03:53:25 -05:00
James R	fb6bac46ec	Merge branch 'extras-credits-unskippable' into 'next' ... Fix Credits sequence from Extras being unskippable See merge request STJr/SRB2!1091	2020-07-27 19:35:14 -04:00
Hannu Hanhi	85f5cb20e6	Fix sector flat alignment issues in OpenGL	2020-07-26 21:25:11 +03:00
GoldenTails	03b7a1c368	Make the player optional for COM_BufInsertText and COM_BufAddText. ... When no player is supplied, the command will run for all players.	2020-07-26 12:08:33 -05:00
Zachary McAlpin	cbba71051d	Allow cmd to be modified using the PlayerCmd hook	2020-07-25 20:08:41 -05:00
Zachary McAlpin	117943012a	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port	2020-07-25 20:06:12 -05:00
James R	2aa2eaf939	Merge remote-tracking branch 'origin/master' into next	2020-07-25 17:45:20 -07:00
James R	1bdcb8d92f	Merge branch 'titlecard-clowning' into 'next' ... Stretch the fallback titlecard to the screen See merge request STJr/SRB2!1019	2020-07-25 20:21:08 -04:00
James R	63b15f784f	Merge branch 'musicpref-var' into 'next' ... Console variable to select music preference See merge request STJr/SRB2!939	2020-07-25 20:14:22 -04:00
James R	005e7ce793	Merge branch 'g_findmap-lua' into 'next' ... G_FindMap and G_FindMapByNameOrCode for Lua See merge request STJr/SRB2!693	2020-07-25 20:06:44 -04:00
Steel Titanium	492ca3cea3	Remove some more DOS related stuff	2020-07-25 19:15:54 -04:00
Steel Titanium	0d48d4c833	WIP: Remove support for DOS ... WIP because I don't know if this wording is right for the error.	2020-07-25 18:55:51 -04:00
Hannu Hanhi	24b828b362	Use 64-bit R_PointToAngle in OpenGL culling to fix some big room issues	2020-07-25 21:50:24 +03:00
James R	a9a68474f7	Ctrl + Backspace/Delete in Console	2020-07-24 04:06:04 -07:00
James R	d90fe93982	Fix Credits sequence from Extras being unskippable ... This is because a server is not started before going to the credits. I'm way too stupid/lazy to try starting a server, so have a special case!	2020-07-24 03:58:38 -07:00
James R	e47fbe7dd9	Compiler error :V	2020-07-24 02:58:05 -07:00
James R	4059c6a654	Update LATEST_GCC_VERSION too	2020-07-24 02:33:39 -07:00
James R	00943e9e82	Add missing GCC version flags to the Makefile	2020-07-24 02:32:10 -07:00
James R	6fd9e25b11	Merge remote-tracking branch 'origin/next' into g_findmap-lua	2020-07-24 02:14:03 -07:00
James R	28931b90dc	Merge branch 'ogl-polyobject-tex-fix' into 'next' ... Fix OpenGL polyobject texture distortion See merge request STJr/SRB2!1086	2020-07-24 04:49:25 -04:00
James R	932bf9b20e	Merge branch 'ogl-shader-light-clamp' into 'next' ... Clamp light level for shaders. Fixes #194. Closes #194 See merge request STJr/SRB2!1085	2020-07-24 04:47:57 -04:00
James R	b45bd6990e	Merge branch 'ogl-fog-block-fix' into 'next' ... Don't discard zero alpha fog block fragments. Fixes #198. Closes #198 See merge request STJr/SRB2!1084	2020-07-24 04:45:50 -04:00
James R	47581607ef	Merge branch 'netticbuffer-port' into 'next' ... Port netticbuffer from Kart See merge request STJr/SRB2!1077	2020-07-24 04:45:08 -04:00
Hannu Hanhi	e331c9d18e	Fix OpenGL polyobject texture distortion	2020-07-23 20:51:05 +03:00
Hannu Hanhi	e4d6e92f37	Clamp light level for shaders. Fixes #194.	2020-07-23 19:05:17 +03:00
Hannu Hanhi	80172ee932	Don't discard zero alpha fog block fragments. Fixes #198.	2020-07-23 18:24:41 +03:00
James R	c944d3adf4	Merge branch 'fix-nights-fullbright' into 'next' ... NiGHTS fullbright fixes See merge request STJr/SRB2!1080	2020-07-22 22:15:07 -04:00
James R	4d16f16dab	Merge branch 'fix-superfloat' into 'next' ... Fix Super Sonic exploiting CA_FLOAT abilities See merge request STJr/SRB2!1081	2020-07-22 22:13:51 -04:00
James R	8d60579e6c	Merge branch 'demo-quit-crash-fix' into 'next' ... Fix crash if you start recording a replay and immediately close the game See merge request STJr/SRB2!1082	2020-07-22 22:11:03 -04:00
Jaime Passos	ca060a4372	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-21 22:25:00 -03:00
James R	196beead7d	Parenthesis	2020-07-21 16:16:03 -07:00
James R	735942a437	Merge branch 'next-lc-uint16' into 'next' ... Allow modification of built-in skincolors See merge request STJr/SRB2!1078	2020-07-21 17:56:12 -04:00
Steel Titanium	76702d6712	Fix crash if you start recording a replay and immediately close the game	2020-07-20 22:19:44 -04:00
lachwright	242e128aa0	Fix Super Sonic exploiting CA_FLOAT abilities	2020-07-21 03:50:26 +08:00
SwitchKaze	5332fff540	Deny standard color accessibility changes	2020-07-20 12:06:57 -05:00
lachwright	cea3f64c88	Fix default NiGHTS skin brightness for non-super characters	2020-07-20 22:24:16 +08:00
SwitchKaze	ee9c146b5d	Re-enable built-in color modification	2020-07-19 17:23:08 -05:00
Steel Titanium	e9a03401cb	Port netticbuffer from Kart	2020-07-19 15:24:27 -04:00
Steel Titanium	05ac0fc7ea	Fix muspostbossname sometimes returning garbage.	2020-07-19 13:47:33 -04:00
Hannu Hanhi	b03e7f63c5	Fix shader comment	2020-07-19 16:07:53 +03:00
Hannu Hanhi	92ebbdfc10	Don't override custom shaders with model lighting shader	2020-07-18 15:48:37 +03:00
Hannu Hanhi	c1cf41fb0c	Add capability to use model lighting with shaders enabled	2020-07-18 15:08:59 +03:00
Jaime Passos	48a6652973	Move the sky dome code out of r_opengl.c, fix issues with shaders	2020-07-17 02:48:05 -03:00
Zachary McAlpin	c42e06221d	Bruh I screwed up	2020-07-17 00:33:07 -05:00
Zachary McAlpin	d26c7654ff	Ported Lat's PlayerCmd hook to vanilla SRB2	2020-07-17 00:08:38 -05:00
James R	7c2f81e4ed	Merge branch 'next-lc-uint16' into 'next' ... Fix skincolor-related memory leak See merge request STJr/SRB2!1066	2020-07-16 22:01:07 -04:00
James R	fa90ff6bae	Merge remote-tracking branch 'origin/master' into next	2020-07-16 19:00:21 -07:00
Hannu Hanhi	0e5631fe66	More work on sprite-texture model uv adjustment 2	2020-07-16 22:39:44 +03:00
Hannu Hanhi	afd0858b4d	More work on sprite-texture model uv adjustment	2020-07-16 22:11:36 +03:00
James R	d6b831053f	Merge branch 'fix-lib_freeslot' into 'next' ... Fix lib_freeslot See merge request STJr/SRB2!1064	2020-07-14 18:32:10 -04:00
SwitchKaze	734033250d	Fix skincolor-related memory leak	2020-07-14 17:09:31 -05:00
Hannu Hanhi	893ff0fa19	Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust	2020-07-14 20:30:56 +03:00
kaysrishaq	7f9175033d	minor lua fixes ... minor lua fixes	2020-07-14 01:34:57 -04:00
kaysrishaq	29a116ba81	Fix lib_freeslot	2020-07-13 18:56:07 -04:00
James R	34bd0d9fe7	Merge branch 'various-color-fixes' into 'next' ... Various color fixes See merge request STJr/SRB2!1060	2020-07-13 18:24:55 -04:00
kaysrishaq	f541c37ebc	Fix formatting ... PREFAVAILABLE -> S_PrefAvailable move declarations to top of blocks	2020-07-13 15:16:49 -04:00
James R	f5c5ec000d	Use SRB2VERSION here...	2020-07-13 08:59:41 -07:00
James R	93615b07be	Merge remote-tracking branch 'origin/next' into http-mserv	2020-07-13 08:58:43 -07:00
James R	00ceca8cc6	Merge remote-tracking branch 'origin/master' into next	2020-07-12 17:11:22 -07:00
James R	4985d94386	Merge remote-tracking branch 'origin/master' into cmake-adjustments	2020-07-12 16:24:24 -07:00
James R	42b0ab1851	Merge branch 'p-xymovement-lua-exposure' into 'next' ... Expose several movement-related functions to Lua. See merge request STJr/SRB2!884	2020-07-12 19:11:47 -04:00
James R	839f086216	A few more instances of "gr" to purge	2020-07-12 16:09:43 -07:00
Kays Ishaq	e849c9898e	move dupenum declaration to beginning of block	2020-07-12 19:05:27 -04:00
James R	b9a24001d8	Merge remote-tracking branch 'origin/next' into remove-glide-2	2020-07-12 16:05:15 -07:00
GoldenTails	ada06910dc	Expose P_MovePlayer to Lua.	2020-07-12 18:02:50 -05:00
GoldenTails	4b3d6f04f8	Expose P_PlayerZMovement to Lua. ... Finishing off these changes; how a player moves vertically.	2020-07-12 18:02:50 -05:00
GoldenTails	df1fd0c456	Expose P_SceneryZMovement to Lua. ... Still more complex than P_RingZMovement.	2020-07-12 18:02:50 -05:00
GoldenTails	4710e4f07c	Expose P_RingZMovement to Lua. ... Ever wanted to move like a ring vertically?	2020-07-12 18:02:50 -05:00
GoldenTails	6d3a2919a2	Expose P_ZMovement to Lua. ... Because P_XYMovement wasn't enough.	2020-07-12 18:02:50 -05:00
GoldenTails	27c25bfa1e	Expose P_SceneryXYMovement to Lua. ... Ironically this seems slightly more advanced than P_RingXYMovement...	2020-07-12 18:02:50 -05:00
GoldenTails	6ac3d62321	Expose P_RingXYMovement to Lua. ... Ever wanted to move like a ring horizontally?	2020-07-12 18:02:50 -05:00
GoldenTails	fe67781d68	Expose P_XYMovement to Lua. ... It was so easy; it took a grand total of one compile to implement! Why wasn't this done before...	2020-07-12 18:02:49 -05:00
James R	bc2f83ec05	Merge branch 'p-rail-thinker-lua-exposure' into 'next' ... Expose P_RailThinker to Lua. See merge request STJr/SRB2!1059	2020-07-12 18:54:28 -04:00
James R	6c875a8097	Merge branch 'marathoninfo2' into 'next' ... Marathon Run fixes (Resolves #184) Closes #184 See merge request STJr/SRB2!1061	2020-07-12 18:47:38 -04:00
James R	6f8dfb6fca	Merge branch 'version-prep-is-a-stinky-butt-head' into 'master' ... Automate some of the version numbers nonsense See merge request STJr/SRB2!1054	2020-07-12 18:45:51 -04:00
James R	f1a5f5952b	Merge branch 'fix-required-flat' into 'next' ... Comment out unused border patch variables. See merge request STJr/SRB2!1055	2020-07-12 18:42:42 -04:00
Monster Iestyn	ed70675df3	added some helpful comments, remove duplicate code	2020-07-12 22:37:36 +01:00
Monster Iestyn	b8a794e37f	socklen_t isn't actually needed in either i_tcp.c or mserv.c if NONET is on! ... (also added some more tabbing)	2020-07-12 22:29:15 +01:00
Monster Iestyn	0f4487eb68	* i_tcp.c: merge these three ifndef USE_WINSOCK blocks together ... * mserv.c: added i_tcp.c's USE_WINSOCK macros so socklen_t isn't redundantly defined if Winsock 2 is used	2020-07-12 22:24:10 +01:00
Monster Iestyn	e133d8ec37	i_tcp.c: SCOUW2 and SCOUW7 haven't been defined since we got rid of Doom Legacy's makefiles for UnixWare 2/7 (which are ANCIENT), so get rid of them!	2020-07-12 22:08:35 +01:00
Monster Iestyn	43e53368b5	added tabbing to some of the preprocessor code in i_tcp.c and mserv.c to make it easier to read them (and to allow me to understand what I need to do for the next commit)	2020-07-12 21:31:25 +01:00
Monster Iestyn	8a032256bf	don't define __USE_MINGW_ANSI_STDIO in makefiles ... (according to modern MinGW versions, defining this macro directly is deprecated)	2020-07-12 21:02:24 +01:00
Hannu Hanhi	3a488c243f	Fix translucency comparison from previous commit	2020-07-12 22:23:15 +03:00
Hannu Hanhi	9909746718	Fix crash by handling precip mobjs correctly in ogl sprite sorting	2020-07-12 21:50:00 +03:00
toaster	0a625d3e19	Fix live event backups being created at run start; there's no meaningful progress in GFZ1 to recover from.	2020-07-12 19:00:58 +01:00
kaysrishaq	a73f468ea4	Don't check empty string for duplicate name	2020-07-12 12:02:49 -04:00
Kays Ishaq	6e4b14588c	Update lua_infolib.c	2020-07-12 11:12:16 -04:00
Hannu Hanhi	ec13272d8c	Adjust model uvs when used sprite texture changes	2020-07-12 18:04:56 +03:00
kaysrishaq	a734129eae	lua_isboolean -> lua_toboolean ... solves bugged set field accessible	2020-07-12 10:07:32 -04:00
Nev3r	2cdfb8ffc6	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-12 14:59:38 +02:00
toaster	e1a217dc10	Two minor fixes for Marathon Mode. ... * Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184) * Snap the character name and timer mode text to the bottom of the screen, just above the bar.	2020-07-12 13:00:08 +01:00
kaysrishaq	74cfeaff30	A bit of cleaning	2020-07-12 07:56:25 -04:00
kaysrishaq	0f9e3554e2	various color fixes	2020-07-12 07:39:52 -04:00
GoldenTails	7015e656ce	Expose P_RailThinker to Lua.	2020-07-12 00:36:22 -05:00
GoldenTails	572bafa0f9	Use kinda counter-intuitive ternary operator to hack in a check for "use" for 2.2 compatibility	2020-07-11 21:59:54 -05:00
GoldenTails	da3ab1a14c	Ok fiiineee, I'll support 2.2	2020-07-11 21:59:54 -05:00
GoldenTails	a2635b2b86	The only "use" that I had to change to "spin" after a manual half hour search	2020-07-11 21:59:54 -05:00
GoldenTails	1f1589384a	Replace PF_USEDOWN with PF_SPINDOWN	2020-07-11 21:59:54 -05:00
GoldenTails	999d8018ca	Oops! Missed a couple...	2020-07-11 21:59:54 -05:00
GoldenTails	8b140b1831	Replace 'use' with 'spin' in game control constants	2020-07-11 21:59:54 -05:00
GoldenTails	8616823d7d	Remove another unneeded comment	2020-07-11 21:59:54 -05:00
GoldenTails	7b4dee87e6	Remove unneeded comment	2020-07-11 21:59:54 -05:00
GoldenTails	457714e480	Remove 2 characters of whitespace ... This is what I get for using find+replace I guess lol	2020-07-11 21:59:54 -05:00
GoldenTails	465ad1a7bc	Replace all occurances of BT_USE with BT_SPIN (2.3?) ... I'd use `next-major` but it doesn't exist lol	2020-07-11 21:59:54 -05:00
James R	84373b1726	Merge branch 'opengl-blending-fix' into 'next' ... Fix ASTBlendPixel outputting empty pixels sometimes See merge request STJr/SRB2!945	2020-07-11 20:57:30 -04:00
James R	6c3663812b	Merge branch 'ogl-linkdraw' into 'next' ... MF2_LINKDRAW support for OpenGL See merge request STJr/SRB2!1031	2020-07-11 20:52:11 -04:00
James R	479bbeacbe	Merge remote-tracking branch 'origin/next' into http-mserv	2020-07-11 17:41:46 -07:00
James R	2f30e81fdd	ADD to the buffer size ... (cherry picked from commit bae37aea2c1b1ffab22f79e27415914f7e25fc89)	2020-07-11 17:41:09 -07:00
James R	ab3878e282	masterserver_token is back ... (cherry picked from commit e7d949aeb2b9ef2297287ba35f9296684078f184)	2020-07-11 17:41:09 -07:00
James R	0b5062d31c	Set timeout on HMS connections ... (cherry picked from commit fcbe4e668f1ac79811d1ab2fb9cfd44729e56e93)	2020-07-11 17:41:09 -07:00
James R	f32d91cc57	Resize response body buffer as needed ... (cherry picked from commit 85fef2655cc78c9453aed423f5a1df6011ce3262)	2020-07-11 17:41:09 -07:00
James R	4e1d54c332	It's not always GCC, but it probably is gcc (I hope)	2020-07-11 12:45:35 -07:00
sphere	e95265a7fa	Comment out unused border patch variables, so GFZFLR01 isn't required anymore.	2020-07-11 12:11:26 +02:00
Nev3r	9f06903d72	What the fuck was I thinking? ... Fixed really stupid brainless code piece involving polyobject spawnpoint tagging.	2020-07-11 11:01:05 +02:00
Nev3r	4013c0e0a1	Merge branch 'udmf-next' into udmf-multitag	2020-07-11 08:47:58 +02:00
Nev3r	a9dbf6daf6	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-11 08:47:32 +02:00
James R	6a54e5f4a6	Merge remote-tracking branch 'origin/master' into next	2020-07-10 23:04:50 -07:00
James R	8bcc2662d1	Merge branch 'netid-take-2' into 'next' ... Use ordered id for netvars instead of shitty hash See merge request STJr/SRB2!1010	2020-07-11 02:00:06 -04:00
James R	df98601b12	Merge branch 'bubbleshieldoverhaul' into 'next' ... Bubble Shield overhaul See merge request STJr/SRB2!1046	2020-07-11 01:56:53 -04:00
James R	f336b1e979	Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master' ... Adds the branch name into the version command printout when outside of DEVELOP mode. See merge request STJr/SRB2!981	2020-07-11 01:48:38 -04:00
James R	5cebf5c7bf	Merge branch 'makefile-detect-version' into 'master' ... Detect GCC version in Makefile See merge request STJr/SRB2!1002	2020-07-11 01:47:50 -04:00
James R	99e0c48f7b	Fix a lot of stuff related to the version automation	2020-07-10 22:39:46 -07:00
James R	1757002ddb	Automate VERSION/SUBVERSION; move version related definitions to version.h ... CMake support. Srb2win.rc still needs touchy, whatever.	2020-07-10 22:20:33 -07:00
Steel Titanium	e22964ee0a	I screwed up	2020-07-10 23:16:18 -04:00
Steel Titanium	db6fc75b4f	Update player.dta hash	2020-07-10 20:53:42 -04:00
Steel Titanium	778089458c	Merge branch 'next' into 226-prep	2020-07-10 20:06:16 -04:00
Louis-Antoine	f8aefc2fd3	Revert "Fix computation of very high pings" ... This reverts commit 82dbe95e22.	2020-07-11 01:55:40 +02:00
Steel Titanium	d9483dabfd	Merge branch 'next' into 226-prep	2020-07-10 19:11:28 -04:00
Steel Titanium	759f9171a2	Update patch.pk3 hash again	2020-07-10 19:09:49 -04:00
Jaime Passos	d87c874559	Fix GL y-shearing ignoring a Y-flipped transform	2020-07-10 19:19:51 -03:00
Steel Titanium	dcd56a7fe3	Update patch.pk3 hash and Srb2win.rc	2020-07-10 18:13:01 -04:00
toaster	958d397cdb	Merge branch 'marathoninfo' into 'next' ... Marathon Run adjustments See merge request STJr/SRB2!1048	2020-07-10 17:54:51 -04:00
Steel Titanium	307125e84e	Update version number	2020-07-10 17:29:03 -04:00
Nev3r	6c6f16e158	Merge branch 'ogl-model-spr-uv-fix' into 'next' ... Fix models that use sprite textures See merge request STJr/SRB2!1049	2020-07-10 17:17:52 -04:00
toaster	217ac14ac5	Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this.	2020-07-10 21:36:37 +01:00
toaster	4c9cdcca0d	Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't.	2020-07-10 21:27:34 +01:00
toaster	1956e9e670	Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.	2020-07-10 21:24:25 +01:00
toaster	8a5069156f	Add a small amount of extra info to the Evaluation screen for Marathon Mode, on request from multiple runners.	2020-07-10 21:16:28 +01:00
Hannu Hanhi	ad57426713	Adjust model uvs to power of two texture if sprite texture is used	2020-07-10 23:05:21 +03:00
toaster	205d4c8d20	Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup.	2020-07-10 20:30:16 +01:00
Hannu Hanhi	5fdc4578db	Merge remote-tracking branch 'upstream/next' into ogl-linkdraw	2020-07-10 21:14:57 +03:00
Nev3r	ad55f5f872	Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag ... # Conflicts: # src/hardware/hw_main.c # src/p_ceilng.c # src/p_floor.c # src/p_mobj.c # src/p_mobj.h # src/p_polyobj.c # src/p_saveg.c # src/p_setup.c # src/p_spec.c # src/p_spec.h # src/p_user.c # src/r_bsp.c # src/r_defs.h	2020-07-10 18:18:07 +02:00
Snu	be8f0853ef	Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul ... Updated to 2.2.5	2020-07-10 17:08:53 +01:00
Nev3r	710097a0ca	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-10 11:47:16 +02:00
Snu	d392c59935	Changed Bubble Shield functionality	2020-07-10 05:59:10 +01:00
Lachlan Wright	12ea5398c8	Merge branch 'restore-supergold' into 'next' ... Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3 See merge request STJr/SRB2!1042	2020-07-09 12:37:31 -04:00
Lachlan Wright	867728ca16	Merge branch 'custom-color-fixes' into 'next' ... Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades Closes #179 and #182 See merge request STJr/SRB2!1043	2020-07-09 12:37:16 -04:00
GoldenTails	59bd6d45a3	Whose idea was it to make the aPNG speed 1/2x by default?!	2020-07-08 18:14:11 -05:00
lachwright	3226a5d699	Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades	2020-07-09 05:56:11 +08:00
lachwright	c28ed25628	Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3	2020-07-09 00:00:21 +08:00
SteelT	31364d2120	Merge branch '225-prep' into 'next' ... 2.2.5 preparation See merge request STJr/SRB2!1039	2020-07-07 14:55:06 -04:00
Lachlan Wright	337ec7bf6c	Merge branch 'remove-tricks' into 'next' ... Remove Software tricks See merge request STJr/SRB2!1036	2020-07-07 13:47:33 -04:00
Lachlan Wright	b9a088b16f	Merge branch 'fix-autoexec-netvars' into 'next' ... Fix autoexec file trying to set netvars when joining from command-line See merge request STJr/SRB2!1040	2020-07-07 13:47:13 -04:00
lachwright	994bf78fe2	Update Srb2win.rc	2020-07-08 00:48:01 +08:00
lachwright	129fd2e27b	Update patch.pk3 hash	2020-07-08 00:42:31 +08:00
toaster	274f649a02	M_RATHON header text.	2020-07-07 17:30:20 +01:00
Louis-Antoine	0858c2f6ed	Fix autoexec file trying to set netvars when joining from command-line	2020-07-07 16:19:25 +02:00
lachwright	706b3c509d	Make A_FlickyCenter usable in SOC/Lua	2020-07-07 20:42:00 +08:00
James R	d31c6ac5b5	Contact the master server admims	2020-07-06 19:15:40 -07:00
Steel Titanium	7d75c72263	Update the version number	2020-07-06 21:29:02 -04:00
Steel Titanium	ded902678c	Update md5 hash for player.dta and patch.pk3	2020-07-06 21:22:57 -04:00
Louis-Antoine	78f8a44c25	Fix timeout	2020-07-07 02:06:26 +02:00
Jaime Passos	3a4ce6aea3	Merge remote-tracking branch 'origin/next' into opengl-blending-fix	2020-07-06 19:48:13 -03:00
Jaime Passos	7911deebf8	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats	2020-07-06 19:29:14 -03:00
Steel Titanium	7d00255dc4	Merge branch 'master' into next	2020-07-06 12:13:00 -04:00
Nev3r	42d92eab2c	Fix erroneous merge conflict resolution.	2020-07-06 11:54:55 +02:00
Nev3r	fd5b05cafc	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next	2020-07-06 11:13:27 +02:00
Jaime Passos	4f6420274f	Remove Software tricks	2020-07-06 01:26:56 -03:00
Jaime Passos	5c5d907251	gr_ -> gl_	2020-07-06 01:15:08 -03:00
Jaime Passos	a739cb0da9	Remove unused texture formats	2020-07-06 00:58:09 -03:00
Jaime Passos	3d50bef0e5	Rename structs, turn GrTextureFormat_t into an enum	2020-07-06 00:52:10 -03:00
Jaime Passos	ac04853f8c	Remove GrTexInfo	2020-07-06 00:35:48 -03:00
Jaime Passos	abeedc4b65	Delete hw_glide.h	2020-07-06 00:27:34 -03:00
Hannu Hanhi	b4aa5cecc1	Merge remote-tracking branch 'upstream/next' into ogl-linkdraw	2020-07-05 13:27:51 +03:00
James R	de8019f163	Merge branch 'hahaha-credits' into 'next' ... The credit See merge request STJr/SRB2!1033	2020-07-04 18:00:49 -04:00
LJ Sonic	9c1bee694b	Merge branch 'knuxtweaks' into 'next' ... Knuckles tweaks See merge request STJr/SRB2!1030	2020-07-04 16:37:35 -04:00
LJ Sonic	9f69396054	Merge branch 'fix-gif-delay' into 'next' ... Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with See merge request STJr/SRB2!1023	2020-07-04 16:28:59 -04:00
LJ Sonic	6c61baa818	Merge branch 'fix-oldbrak-missiles2' into 'next' ... Take 2: Fix Old Brak missiles + add pw_ignorelatch See merge request STJr/SRB2!1006	2020-07-04 16:28:48 -04:00
James R	96bccd5f9f	Credit Oni for CODE	2020-07-04 12:59:56 -07:00
James R	d9005203c7	Fuck you macro	2020-07-04 12:52:01 -07:00
James R	e741a7b3c7	Actually save the cvar name in demos	2020-07-04 12:51:07 -07:00
LJ Sonic	17616967d3	Merge branch 'levelflat_name' into 'next' ... Use levelflat->name instead of flatname See merge request STJr/SRB2!1024	2020-07-04 08:46:04 -04:00
LJ Sonic	77e39a0fd5	Merge branch 'make-linedef-422-smarter' into 'next' ... Make Linedef type 422 smarter See merge request STJr/SRB2!1014	2020-07-04 08:35:42 -04:00
lachwright	17daf2faa2	Reduce speed cut when gliding underwater	2020-07-04 19:17:38 +08:00
LJ Sonic	cf4087a014	Merge branch 'jetjawsound' into 'next' ... Jet Jaw Sounds See merge request STJr/SRB2!1018	2020-07-04 07:09:43 -04:00
LJ Sonic	804ba6da9e	Merge branch 'more-platform-fixes' into 'next' ... More platform fixes See merge request STJr/SRB2!999	2020-07-04 07:07:17 -04:00
LJ Sonic	8d511ed565	Merge branch 'cez3debris' into 'next' ... New Debris for CEZ3 See merge request STJr/SRB2!1012	2020-07-04 07:00:20 -04:00
lachwright	f03addc5a7	Merge remote-tracking branch 'origin/next' into knuxtweaks	2020-07-04 18:53:26 +08:00
LJ Sonic	98c657e703	Merge branch 'sf_nosupersprites' into 'next' ... Add SF_NOSUPERSPRITES See merge request STJr/SRB2!1000	2020-07-04 06:51:11 -04:00
LJ Sonic	5ee94c8ce7	Merge branch 'patch-1' into 'next' ... Rename "Legacy" control scheme See merge request STJr/SRB2!1029	2020-07-04 06:50:15 -04:00
lachwright	527e682931	Add sightcheck boolean to P_RadiusAttack ... Also now destroys Egg Guard shields, and circumstantially Minuses	2020-07-04 18:27:06 +08:00
Lachlan	e2bdb56f97	Merge remote-tracking branch 'origin/next' into more-platform-fixes	2020-07-04 05:25:38 +08:00
Lachlan	cdb247d08f	Fix compiler warning	2020-07-04 05:25:34 +08:00
LJ Sonic	3679df07aa	Merge branch 'dragonbomber-height' into 'next' ... Fix Dragonbomber z positioning See merge request STJr/SRB2!1004	2020-07-03 17:05:10 -04:00
LJ Sonic	07bbebd9b0	Merge branch 'shift-when-hiding-in-1p-menu' into 'next' ... Tweak display of hidden items in "1 Player" menu See merge request STJr/SRB2!1013	2020-07-03 17:04:42 -04:00
LJ Sonic	6e7446dea3	Merge branch 'ff_horizontalflip' into 'next' ... FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) See merge request STJr/SRB2!987	2020-07-03 16:56:32 -04:00
Lachlan	e44d93f76b	Fix skiddust positional scaling	2020-07-04 04:30:57 +08:00
Lachlan	84000a0add	P_Earthquake: Use P_RadiusAttack in favor of thinker iteration	2020-07-04 04:00:28 +08:00
Lachlan	7e72009a87	Fix buildbot warning	2020-07-04 03:21:48 +08:00
SteelT	186335c2ac	Merge branch 'na-char-replays' into 'next' ... Add support for saving/loading per-skin NiGHTS replays See merge request STJr/SRB2!1025	2020-07-03 14:51:05 -04:00
lachwright	8652bbc1a5	Knuckles changes: ... - Buffed crouch landing; lasts slightly shorter and cuts speed less - Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater - Improved glide controls in 2D mode - Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies - Refactored skid dust - Made super sparks use FF_FULLBRIGHT - Added P_SpawnSkidDust and P_Earthquake to Lua	2020-07-04 01:54:00 +08:00
colette	1cc2ab120d	"Legacy controls" was a mistake of a name	2020-07-02 23:17:33 -04:00
Hannu Hanhi	b29873ce1c	Better MF2_LINKDRAW support for OpenGL	2020-07-03 00:28:52 +03:00
lachwright	3ebc17ac3a	Merge branch 'next' into knuxtweaks	2020-07-02 13:08:04 +08:00
Zippy_Zolton	29dfa5f605	sound caption	2020-07-01 23:18:20 -05:00
James R	9eb58a8e42	Merge branch 'cheese' into 'next' ... Cheese See merge request STJr/SRB2!1028	2020-07-01 23:28:08 -04:00
James R	7a17c74893	Merge branch 'credits-225' into 'next' ... More credits changes See merge request STJr/SRB2!1027	2020-07-01 23:27:59 -04:00
James R	2cbf7ac27d	Cheese mode activate!	2020-07-01 16:37:36 -07:00
James R	e1996a437d	Add "Discord Community Testers" to the Testing section	2020-07-01 16:29:26 -07:00
James R	99a9c935f9	Credits: add back fickle, add Chrispy and Hannu	2020-07-01 16:23:26 -07:00
James R	fae583915a	Remove Producer role from the credits	2020-07-01 16:04:46 -07:00
Nev3r	ff8759e507	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next ... # Conflicts: # src/hardware/hw_main.c	2020-06-30 20:29:48 +02:00
Louis-Antoine	40e98e5712	Fix crash when a polyobject rotates a non-player mobj	2020-06-30 18:37:21 +02:00
Steel Titanium	612386aef0	Correct comment	2020-06-29 23:57:39 -04:00
Steel Titanium	e641895268	Address compat with old-style names	2020-06-29 23:54:45 -04:00
James R	696f9707fc	Merge branch 'special_save' into 'next' ... Special saves! (Resolves #162) Closes #162 See merge request STJr/SRB2!1016	2020-06-29 19:18:30 -04:00
James R	84391f558b	Merge branch 'titlecard-double-clown-town' into 'next' ... ACTUALLY fix #172 Closes #172 See merge request STJr/SRB2!1020	2020-06-28 18:41:22 -04:00
James R	e56fc08757	Merge branch 'delete-connection-screen-and-midgame-joins' into 'next' ... Delete connection screen and midgame joins See merge request STJr/SRB2!1021	2020-06-28 18:41:07 -04:00
Steel Titanium	3f3ff0688b	Add support for saving/loading per-skin NiGHTS replays	2020-06-28 16:59:36 -04:00
James R	335fc0b327	Use levelflat->name instead of flatname	2020-06-27 14:30:41 -07:00
SteelT	22459df1f1	Merge branch 'increase-input-buffer-more' into 'next' ... Increase the length of the player input buffer even more See merge request STJr/SRB2!951	2020-06-27 13:32:19 -04:00
GoldenTails	fef15be0af	Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with	2020-06-27 10:56:15 -05:00
Louis-Antoine	93cc48054a	Expose "server" and "dedicated" to Lua scripts ... Careful! Both are local variables and are always false for clients, and therefore should obviously not be used in anything gamelogic-related.	2020-06-27 15:30:23 +02:00
Louis-Antoine	c96e07b61c	Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines	2020-06-27 02:01:16 +02:00
Louis-Antoine	82dbe95e22	Fix computation of very high pings	2020-06-26 15:34:26 +02:00
James R	fbbfe3b3b1	Add back the int_none check ... It got removed by 864e703355 but he forget how it was before the hook was there. :(	2020-06-25 13:43:07 -07:00
James R	607a4dbee7	Remove caching of INTERSCW	2020-06-25 13:09:00 -07:00
James R	78e6bcc8ff	Just stretch the fallback card to the screen resolution	2020-06-25 13:08:00 -07:00
James R	864e703355	Only fill the intermission with blapck if we can't draw patches ... This fixes an issue where patches cease to be drawn due to Y_UnloadData, but the screen is still overwritten, causing the next wipe to start from void.	2020-06-25 13:04:03 -07:00
Zachary McAlpin	b973b43271	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-25 10:31:55 -05:00
toaster	f258131e55	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save ... # Conflicts: # src/g_game.c	2020-06-25 10:48:36 +01:00
Zippy_Zolton	dc2f689957	Jet Jaw Sounds	2020-06-25 00:38:07 -05:00
James R	7317bbb692	Merge branch 'ogl-sprite-qsort' into 'next' ... Faster OGL sprite sorting algorithm See merge request STJr/SRB2!1008	2020-06-24 23:22:06 -04:00
James R	067d9b9a63	Merge remote-tracking branch 'origin/next' into gtr-fixes	2020-06-24 19:31:19 -07:00
Zachary McAlpin	b14f18c1a9	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-24 20:55:08 -05:00
James R	207d8aee4b	Merge branch 'acz3-softlock-fix' into 'next' ... ACZ3 softlock fix See merge request STJr/SRB2!1015	2020-06-24 21:43:42 -04:00
James R	95cc10d735	Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next' ... Don't repeatedly look for model texture files See merge request STJr/SRB2!1009	2020-06-24 21:42:40 -04:00
James R	9eb8fd8ac8	Merge branch 'fixeggsign' into 'next' ... Fix the Eggman signpost's background color See merge request STJr/SRB2!1007	2020-06-24 21:42:12 -04:00
James R	2e827705b4	Merge branch 'ogl-drawnode-fix' into 'next' ... Faster and more correct OGL transparent surface sorting See merge request STJr/SRB2!1005	2020-06-24 21:42:01 -04:00
James R	ac71bb76b6	Merge branch 'gme-cleanup-fixes' into 'next' ... GME cleanup and fixes See merge request STJr/SRB2!1001	2020-06-24 21:41:49 -04:00
Zachary McAlpin	5ef8c95cdb	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-24 19:47:52 -05:00
Monster Iestyn	7d2de8394f	Merge branch 'lua-side-enum-bruh' into 'next' ... Fix missing bruh string in Lua side string options. See merge request STJr/SRB2!1017	2020-06-22 15:23:34 -04:00
Latapostrophe	80e0d35391	Fix missing bruh string in lua side options. This is stupid.	2020-06-22 21:11:33 +02:00
toaster	4502604007	Special saves! ... All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts. Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear... One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.	2020-06-22 19:00:47 +01:00
GoldenTails	f0787077e3	More people ought to know what modulo is... ... Or modulous if your prefer.	2020-06-22 04:14:42 -05:00
GoldenTails	6fe0874606	Stop resetting cusval cause that's annoying	2020-06-21 23:21:42 -05:00
GoldenTails	d609cfc9e3	Make it so Linedef type 422 instead sets cusval when the titlemap is in action. ... I have no idea why it wasn't like this before, but oh well.	2020-06-21 22:20:06 -05:00
Zwip-Zwap Zapony	ae474b6945	Fix re-opening 1 Player menu re-lowering options ... If an add-on disabled an option, re-opening the 1 Player menu multiple times would lower the above options multiple times Also fix Marathon Run and Tutorial being "perma-(un)lock"-able	2020-06-21 16:16:12 +02:00
sphere	e9e9cd6133	Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.	2020-06-21 16:01:24 +02:00
Zwip-Zwap Zapony	5655db11ab	Tweak display of hidden items in "1 Player" menu ... If an option in the "1 Player" menu is unavailable in an add-on, lower the above options to close the gap from the invisible option Also make Marathon Run display as question marks if locked And also change "sploadgame" to "spstartgame"	2020-06-21 09:30:55 +02:00
Louis-Antoine	65054bd0aa	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into increase-input-buffer-more	2020-06-21 01:20:39 +02:00
Zippy_Zolton	ca7fc22388	t_lspr	2020-06-20 14:16:22 -05:00
James R	7ec0b6c792	I meant consvar_number_of_netids to be exclusive :V	2020-06-20 00:53:51 -07:00
Zippy_Zolton	fc68134938	Thanks for the feedback, I have fixed your issues.	2020-06-20 02:04:18 -05:00
Zippy_Zolton	bfa1382736	New Debris for CEZ3	2020-06-20 02:02:13 -05:00
James R	3e52764935	Actually print a warning if the old demo id collides	2020-06-19 19:59:14 -07:00
James R	db34d70faa	Cvar compatibility with older demos	2020-06-19 18:04:20 -07:00
James R	32134a01fe	Save cvar names in demos; refactor cvar loading	2020-06-19 17:58:42 -07:00
James R	32773b71e0	Use ordered ids instead of hashes for cvar netid ... Originally 6acd99c0a4	2020-06-19 16:36:36 -07:00
kaysrishaq	c74a607c54	Whoops, switched these for no reason	2020-06-19 11:11:19 -04:00
kaysrishaq	cad1f57b1e	FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)	2020-06-19 11:11:18 -04:00
Hannu Hanhi	f3212746d2	Don't repeatedly look for model texture files	2020-06-19 16:18:04 +03:00
Hannu Hanhi	6f9b9aacf4	Faster OGL sprite sorting algorithm	2020-06-19 14:32:34 +03:00
lachwright	cab87b4632	lol should have tested before pushing	2020-06-19 15:59:09 +08:00
lachwright	47d9d87654	Fix the Eggman signpost's background color	2020-06-19 15:49:24 +08:00
kaysrishaq	682791a024	brak missile fix, pw_ignorelatch, small Recycler fix	2020-06-18 17:09:29 -04:00
Hannu Hanhi	ffaffdf3e1	Faster and more correct OGL transparent surface sorting	2020-06-18 20:27:19 +03:00
lachwright	7b2e54b426	Fix Dragonbomber z positioning	2020-06-19 00:52:24 +08:00
Hannu Hanhi	9477d372b9	Backwards compatibility for shaderless hardware	2020-06-18 17:39:34 +03:00
James R	193c45aa2f	Forgot a comma	2020-06-17 22:58:11 -07:00
James R	489bb81d00	Makefile: Move the PREFIX stuff up so version detection can take advantage of	2020-06-17 22:52:19 -07:00
James R	bf90fbb91f	Detect the compiler version and set the correct GCC flag ... If the version is not supported by the Makefile, the flag for the latest version supported is set instead.	2020-06-17 22:49:12 -07:00
SteelT	bff6b19056	Merge branch 'marathonmode' into 'next' ... MARATHON RUN See merge request STJr/SRB2!941	2020-06-17 19:36:10 -04:00
Steel Titanium	8365d975d3	A even more better fix for this	2020-06-17 18:40:56 -04:00
Steel Titanium	1e655fb2c1	Better fix for may be used uninitialized, maybe fixes GCC 4.x	2020-06-17 18:23:54 -04:00
Steel Titanium	3946309ece	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport ... # Conflicts: # src/hardware/r_opengl/r_opengl.c	2020-06-17 18:15:07 -04:00
Steel Titanium	5708325d2b	Use SAMPLERATE for consistency with the rest of the code	2020-06-17 14:50:22 -04:00
Steel Titanium	f626b9f4d9	Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong	2020-06-17 14:31:49 -04:00
Steel Titanium	a34be0e370	Reduce code duplication by creating get_zlib_error function ... Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong Return false if it fails to decompress VGZ data in some form.	2020-06-17 14:19:19 -04:00
Steel Titanium	d3d5496a78	Fix facecolor may be used uninitialized.	2020-06-17 14:09:49 -04:00
lachwright	7d92631d97	Whoops, forgot hu_stuff.c	2020-06-17 05:27:42 +08:00
lachwright	edfd64877c	Add SF_NOSUPERSPRITES	2020-06-17 04:53:42 +08:00
lachwright	e403de7459	Merge branch 'next' into more-platform-fixes	2020-06-17 01:53:19 +08:00
lachwright	29738fcdd0	Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain	2020-06-17 01:46:36 +08:00
lachwright	38e2c999c5	Platform fixes	2020-06-14 12:17:30 +08:00
Zachary McAlpin	6eccc7030d	I forgot to pop the error handler	2020-06-12 07:50:57 -05:00
Zachary McAlpin	965d42f974	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-12 07:32:44 -05:00
Nev3r	2322644488	Merge branch 'dofile' into 'next' ... Add dofile() to Lua See merge request STJr/SRB2!969	2020-06-12 02:32:16 -04:00
Steel Titanium	b056bf1d6c	Merge branch 'master' into next	2020-06-11 20:11:26 -04:00
SteelT	c810ea3945	Merge branch 'next-lc-uint16' into 'next' ... Custom skincolor bugfixes See merge request STJr/SRB2!971	2020-06-11 20:08:50 -04:00
Zachary McAlpin	0d70e16b0b	Updated LUAh_GameQuit to use new error handler	2020-06-11 15:11:01 -05:00
Zachary McAlpin	08e9efee76	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-11 15:02:31 -05:00
lachwright	fad82265e0	Allow macOS builds to be launched through Steam	2020-06-12 01:19:06 +08:00
mazmazz	8fc414536f	CMAKE: Move launch-c into more sensible location	2020-06-10 15:08:09 -04:00
LJ Sonic	7ffee074d8	Merge branch 'next' into 'better-download' ... # Conflicts: # src/d_clisrv.c	2020-06-10 07:57:49 -04:00
LJ Sonic	bc2edb2ae4	Merge branch 'snake' into 'next' ... Add a Snake minigame to the file transfer screen See merge request STJr/SRB2!903	2020-06-10 07:38:37 -04:00
Zachary McAlpin	291479e3e8	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-09 19:54:47 -05:00
mazmazz	46b383acda	CMAKE: Fix toggle fullscreen breakage due to missing define ... This is lazy. The correct solution is to eliminate the define in the program code	2020-06-09 17:32:14 -04:00
MascaraSnake	a76c8af60c	Compiling fix	2020-06-09 22:10:02 +02:00
mazmazz	36e17006b7	CMAKE: Fix OS X ccache scripts	2020-06-09 11:12:52 -04:00
MascaraSnake	d07c376f6d	Adapt POF_SPLAT to UDMF setup	2020-06-09 09:44:49 +02:00
MascaraSnake	4a0206b38d	Merge branch 'next' into udmf-next ... # Conflicts: # src/p_mobj.c # src/p_polyobj.c	2020-06-09 09:38:01 +02:00
Steel Titanium	2abdc86537	Fix these "may be used uninitialized in this function" errors with batching	2020-06-08 20:18:32 -04:00
Steel Titanium	3dd89f67fa	Fix no previous prototype for TimeFunction	2020-06-08 19:56:24 -04:00
Steel Titanium	62d73968e2	Merge branch 'next' into sal-oglshaderport	2020-06-08 19:36:23 -04:00
mazmazz	01ff46326f	Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments	2020-06-08 11:57:57 -04:00
Digiku	70eb5ba634	Merge branch 'buffer-offset-fix' into 'master' ... Strike null-pointer-arithmetic error in BUFFER_OFFSET See merge request STJr/SRB2!989	2020-06-08 11:56:48 -04:00
Lachlan Wright	191e2e094d	Merge branch 'fix-spawn-desynch' into 'next' ... Fix desynch when a player spawns See merge request STJr/SRB2!977	2020-06-08 05:25:41 -04:00
Lachlan Wright	614a98bd9d	Merge branch 'dashmode-fixes' into 'next' ... Dashmode fixes See merge request STJr/SRB2!909	2020-06-08 05:25:30 -04:00
Lachlan Wright	590dfca582	Merge branch 'fix-continuing-mouse' into 'next' ... Fix mouse being grabbed in continue screen See merge request STJr/SRB2!983	2020-06-08 05:25:24 -04:00
mazmazz	f3c1db0650	CMAKE: Fix OSX CCache error	2020-06-08 03:08:58 -04:00
mazmazz	efba50c83c	CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package	2020-06-08 00:38:13 -04:00
mazmazz	aef9a1b522	CMAKE: Add CCACHE support	2020-06-08 00:35:31 -04:00
mazmazz	a5f7f9a534	Fix OPENMPT deprecation error, openmpt_module_ctl_set	2020-06-08 00:09:29 -04:00
mazmazz	2cefe82950	Fix OSX null-pointer-arithmetic error	2020-06-08 00:08:07 -04:00
mazmazz	ded6285249	CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo	2020-06-08 00:01:15 -04:00
mazmazz	a449fa4a1d	Added SDL Mixer X to CMAKE (Windows only)	2020-06-08 00:01:15 -04:00
Zachary McAlpin	78014cfd4c	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-07 22:42:43 -05:00
Hannu Hanhi	0e521922c6	Change some unsigned ints to UINT32	2020-06-07 21:32:52 +03:00
Hannu Hanhi	abe13651d0	OpenGL draw call batching system	2020-06-07 21:20:52 +03:00
MascaraSnake	de7a806ec3	Merge branch 'nospinmovecut' into 'next' ... Don't cut momentum if landing in a roll See merge request STJr/SRB2!972	2020-06-07 13:24:19 -04:00
Hannu Hanhi	da98ea242e	Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge	2020-06-07 20:01:05 +03:00
SteelT	db32b01222	Merge branch 'renderstats' into 'sal-oglshaderport' ... Render stats See merge request STJr/SRB2!914	2020-06-07 12:29:58 -04:00
sphere	82200d80a9	Fix mouse being grabbed in the continue screen.	2020-06-07 00:40:33 +02:00
Monster Iestyn	28550b221a	Merge branch 'master' into next	2020-06-06 20:50:12 +01:00
Monster Iestyn	d2fefb6b9a	use void rather than VOID, because the logging init code isn't exclusively Win32, whoops	2020-06-06 20:49:12 +01:00
Monster Iestyn	7e562a3ca5	Merge branch 'master' into next	2020-06-06 20:35:48 +01:00
Monster Iestyn	982d1db5d8	Merge branch 'cppcheck-fixes' into 'master' ... Cppcheck fixes See merge request STJr/SRB2!967	2020-06-06 15:28:48 -04:00
lachwright	f68a95016e	Merge branch 'next' into nospinmovecut	2020-06-07 02:45:26 +08:00
Monster Iestyn	a4d7ff3c6d	Merge branch 'master' into next	2020-06-06 17:39:43 +01:00
Monster Iestyn	56b8ea3587	added liolib.c to the VC10 project files, since it was missing from them	2020-06-06 17:38:35 +01:00
GoldenTails	9aa68f524e	Adds the branch name into the version command printout when outside of DEVELOP mode. ... Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...	2020-06-06 04:12:27 -05:00
MascaraSnake	50b47a1b25	Merge branch 'translucent-splat-planes' into 'next' ... Allow transparent parts in translucent FOF and PolyObject planes See merge request STJr/SRB2!978	2020-06-06 04:35:06 -04:00
Zachary McAlpin	ca66c5e7ee	Updated LUAh_GameQuit	2020-06-05 13:18:22 -05:00
Zachary McAlpin	7b779fa89b	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-06-05 12:59:41 -05:00
Monster Iestyn	9e4ed738b7	Sync turnobjs for polyrotate_t thinkers in netgames	2020-06-04 21:31:26 +01:00
Monster Iestyn	cb7423b97e	sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean	2020-06-03 20:47:49 +01:00
Monster Iestyn	b11d58aef5	clean up BUGTRAP code in win32/win_main.c to avoid unmatched } ... (though that said we don't officially care about the win32 folder files anymore)	2020-06-03 20:47:49 +01:00
Monster Iestyn	5349a0bf62	V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?)	2020-06-03 20:47:49 +01:00
Monster Iestyn	bb1a2dbba7	sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code	2020-06-03 20:47:49 +01:00
Monster Iestyn	8092d30376	Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t	2020-06-03 20:47:49 +01:00
Monster Iestyn	7340442839	P_XYMovement: initialise slopemom to all zeros	2020-06-03 20:47:49 +01:00
Monster Iestyn	adb11eec1b	dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large	2020-06-03 20:47:49 +01:00
Monster Iestyn	d11ba67288	G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order	2020-06-03 20:47:49 +01:00
Monster Iestyn	879a2bd20a	G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1 ... This way, if for some reason the ghost has no skin, nothing should spawn at all	2020-06-03 20:47:49 +01:00
MascaraSnake	33ed36cf4b	Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent)	2020-06-03 19:41:47 +02:00
Louis-Antoine	9be188ff02	Minor edit	2020-06-02 10:31:56 +02:00
Louis-Antoine	286b316cf9	Fix dofile() return incorrect values	2020-06-01 15:43:14 +02:00
LJ Sonic	6895d7df92	Merge branch 'next' into 'dofile' ... # Conflicts: # src/lua_script.c # src/lua_script.h	2020-06-01 09:28:56 -04:00
Louis-Antoine	e6ffedbce8	Fix food occasionally spawning inside the snake	2020-06-01 15:21:16 +02:00
LJ Sonic	04c7eeb6ae	Merge branch 'deprecate-fixedrem' into 'next' ... Deprecate FixedRem. See merge request STJr/SRB2!952	2020-06-01 08:30:44 -04:00
LJ Sonic	715cb857f5	Merge branch 'next' into 'better-download' ... # Conflicts: # src/sdl/i_system.c # src/win32/win_sys.c	2020-06-01 08:16:53 -04:00
LJ Sonic	e2b860dc28	Merge branch 'next' into 'fix-spawn-desynch' ... # Conflicts: # src/p_map.c	2020-06-01 08:15:02 -04:00
MascaraSnake	11493e61d2	Merge branch 'executordelay' into 'udmf-next' ... UDMF linedef executor delay See merge request STJr/SRB2!918	2020-06-01 07:57:23 -04:00
MascaraSnake	b13f29852f	Merge branch 'gravflip-shadows' into 'next' ... Move drop shadows to the ceiling for objects in reverse gravity See merge request STJr/SRB2!973	2020-06-01 07:23:29 -04:00
MascaraSnake	8d7f4e3265	Merge branch 'movement-refactor' into 'next' ... Clean up some movement code See merge request STJr/SRB2!912	2020-06-01 07:21:41 -04:00
Louis-Antoine	3c3a60d189	Fix "downloads" command reporting incorrect progress	2020-06-01 10:37:05 +02:00
LJ Sonic	dd18915570	Merge branch 'traceback' into 'next' ... Traceback See merge request STJr/SRB2!974	2020-06-01 04:17:30 -04:00
MascaraSnake	508160ed42	Use 0 instead of 0xffff as dummy mobjnum	2020-05-31 22:58:14 +02:00
MascaraSnake	3a4502fa87	Netsync waypoint sequences	2020-05-31 22:44:25 +02:00
SwitchKaze	5a18bdf20b	Fix SOC color name reading	2020-05-30 16:52:44 -05:00
Louis-Antoine	d31346822d	Refactor hook library a little	2020-05-30 20:28:45 +02:00
Louis-Antoine	1bacaedde2	Show the traceback when a Lua script error happens	2020-05-30 20:24:33 +02:00
lachwright	f32d29f700	Oops, forgot to #undef	2020-05-31 01:26:23 +08:00
lachwright	a7f73bfa85	Move drop shadows to the ceiling for objects in reverse gravity	2020-05-31 01:21:26 +08:00
lachwright	5136a4d41d	Don't cut momentum if landing in a roll	2020-05-30 19:07:16 +08:00
lachwright	b874da5229	Ensure followmobj ghost exists before applying fuse	2020-05-30 18:26:11 +08:00
lachwright	51b640ad5a	Feedback so far indicates the old booster effect is preferred	2020-05-30 18:21:39 +08:00
lachwright	ae5d5b9546	Merge branch 'next' into dashmode-fixes	2020-05-30 18:13:21 +08:00
SwitchKaze	d589e6bc95	Fix signpost shade.	2020-05-29 21:41:20 -05:00
Zachary McAlpin	7bdea21435	Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook	2020-05-29 15:32:59 -05:00
Louis-Antoine	1dbb755743	Add dofile() to Lua	2020-05-29 17:35:07 +02:00
LJ Sonic	b7c5163419	Merge branch 'luacolors-gcc10-fix' into 'next' ... Fix the "Custom skincolors" branch not compiling with GCC 10. See merge request STJr/SRB2!966	2020-05-29 11:23:54 -04:00
sphere	71cf31fcaf	Fix the "Custom skincolors" branch not compiling with GCC 10.	2020-05-28 18:43:04 +02:00