170 commits

Author	SHA1	Message	Date
Lactozilla	ee6ce2a1fb	Revert "Merge branch 'superbutton' into 'next'" ... This reverts commit 4706e80df1, reversing changes made to 5f98f7696e.	2025-01-22 21:01:45 -03:00
Lactozilla	a6a5767335	Revert "Merge branch 'shield-button-touchups' into 'next'" ... This reverts commit 89620dbd9e, reversing changes made to 55a7afde52.	2025-01-22 20:53:37 -03:00
Alam Ed Arias	1e1a5c23bd	Merge branch 'public_next' into 2215	2025-01-22 00:51:16 -05:00
Alam Ed Arias	05bef7f7b0	Merge branch 'master' into next	2025-01-22 00:41:00 -05:00
Alam Ed Arias	4258e898ff	whitespace cleanup	2025-01-21 23:26:47 -05:00
Krabs	f86a7382a6	Use SPR_PLAY for all npc player boss/cameo objects	2025-01-19 02:26:15 -03:00
Eidolon	7062fe394c	Revert "Most Pipe Towers stuff, I'm tired" ... This reverts commit db5d9053f2.	2025-01-18 13:55:53 -06:00
Eidolon	5cc68e23d5	Revert "Trampolines!" ... This reverts commit ae0886e279.	2025-01-18 13:54:31 -06:00
Eidolon	6a453d11fd	Revert "Mario power up hardcoding" ... This reverts commit fd60588262.	2025-01-18 13:54:20 -06:00
Radicalicious	b22c89ed22	Fix freeslots + add DeltaSanic to the credits	2025-01-17 20:32:00 -06:00
Radicalicious	2fcc7e6a5d	Pristine Shores and Crystalline Heights	2024-12-22 17:55:13 -06:00
Radicalicious	fd60588262	Mario power up hardcoding	2024-12-22 02:29:48 -06:00
Radicalicious	41a8bb2d24	Silver Shiver trees	2024-12-21 22:23:35 -06:00
Radicalicious	ae0886e279	Trampolines!	2024-12-21 19:38:40 -06:00
Radicalicious	db5d9053f2	Most Pipe Towers stuff, I'm tired ... Added Linedef type 430: Bounce Player, bouncy FOFs suck ass Revamped a few existing PTZ assets Added most new PTZ decorations, only missing shield mushrooms and trampolines (but I'll probably replace the latter with springs idk) also Dave goes by Skydusk now	2024-12-19 21:49:52 -06:00
Lactozilla	e7b4beba20	Update dates in copyright notices of all files modified in 2024	2024-09-21 21:35:01 -03:00
sphere	40ac2124f9	Merge branch 'add-shielddown-player-flag' into 'next' ... Expose PF_SHIELDDOWN to Lua See merge request STJr/SRB2!2299	2024-06-24 21:16:55 +00:00
Hanicef	1a02c7fd73	Expose BASEVIDWIDTH and BASEVIDHEIGHT to Lua and SOC	2024-06-03 12:56:44 +00:00
LJ Sonic	45d54c38f7	Use bitarray_t for used_spr	2024-03-16 16:26:33 +01:00
sphere	ee96ed12a4	Merge branch 'more-sprite2' into 'next' ... Add 'sprite2' field to states See merge request STJr/SRB2!2211	2024-03-07 12:06:48 +00:00
Logan Aerl Arias	ba35849b5a	Merge branch SRB2:next into shield-button-touchups	2024-03-03 16:17:08 +00:00
spherallic	dbc1fe8c0e	Merge branch 'next' into more-sprite2	2024-02-27 12:23:14 +01:00
Zwip-Zwap Zapony	34afebfc06	Revert P_SuperReady to a boolean transform type	2024-02-24 15:41:51 +01:00
Zwip-Zwap Zapony	90958614f3	Shield button touchups	2024-02-24 15:41:36 +01:00
Hanicef	75c270d546	Expose PF_SHIELDDOWN to Lua	2024-02-10 18:55:10 +01:00
spherallic	7fc554bd4e	Merge branch 'showinput' of git.do.srb2.org:STJr/SRB2 into showinput	2024-02-08 23:12:03 +01:00
Logan Aerl Arias	a3b79056e9	Merge branch 'translations' into 'next' ... ZDoom translations See merge request STJr/SRB2!2190	2024-01-17 03:24:54 +00:00
Lactozilla	0ffcf89c85	Merge branch 'next' into more-sprite2	2024-01-08 02:55:19 -03:00
Logan Aerl Arias	845df8f1df	Merge branch 'sector-portals' into 'next' ... Sector portals See merge request STJr/SRB2!2139	2024-01-08 03:28:43 +00:00
Logan Aerl Arias	3992e83e8f	Revert "Merge branch 'thokking-hell' into 'next'" ... This reverts merge request !1551	2024-01-03 03:46:26 +00:00
Lactozilla	7fbd8f7025	Merge branch 'next' into more-sprite2	2024-01-02 22:09:17 -03:00
Lactozilla	b6e4771085	Merge branch 'next' into translations	2024-01-02 22:06:14 -03:00
Logan Aerl Arias	07b0df0fba	Merge branch 'next' into sector-portals	2023-12-31 11:56:34 -05:00
Logan Aerl Arias	6d7549476b	Merge branch 'next' into showinput	2023-12-31 11:47:14 -05:00
Logan Aerl Arias	091a874514	Merge branch 'thokking-hell' into 'next' ... New CA_THOK effect See merge request STJr/SRB2!1551	2023-12-31 14:16:27 +00:00
Lactozilla	8e331f86bd	Merge branch 'next' into sector-portals	2023-11-30 19:01:54 -03:00
Lactozilla	5f21befb09	Merge branch 'next' into translations	2023-11-30 18:54:36 -03:00
Lactozilla	badc122286	Merge branch 'next' into more-sprite2	2023-11-26 22:36:01 -03:00
SMS Alfredo	e50993861e	Dedicated Shield / Super Transformation Button	2023-11-26 20:38:49 +00:00
Lactozilla	962150c252	Add SPR2F_ enum to INT_CONST	2023-11-13 12:02:36 -03:00
Lactozilla	879ac8dcd5	Merge remote-tracking branch 'stjr/next' into translations	2023-11-06 22:58:25 -03:00
Lactozilla	0731272fab	Add A_SetTranslation and load TRNSLATE before SOC and Lua scripts	2023-10-30 20:52:28 -03:00
Alam Ed Arias	f5859c3480	Merge branch SRB2:next into blue-spring-balls	2023-10-25 19:41:36 +00:00
Alam Ed Arias	d0cb7707e3	Merge branch SRB2:next into thokking-hell	2023-10-25 19:40:02 +00:00
Alam Ed Arias	1403f93176	Merge branch 'next' into showinput	2023-10-25 14:24:17 -04:00
Alam Ed Arias	0fb1c64338	Merge branch 'next' into sector-portals	2023-10-25 14:11:58 -04:00
LJ Sonic	2a896538d9	Merge branch 'netcode-rerefactor' into 'next' ... Re-delete netcode See merge request STJr/SRB2!2083	2023-09-18 16:47:28 +00:00
Lactozilla	0377d9e881	Merge remote-tracking branch 'stjr/next' into sector-portals	2023-09-08 14:09:54 -03:00
spherallic	6c416c61b1	Final 2.2.12 skincolor changes: ... - Replaced Mercury & Pumpkin with Ocean & Tangerine - Renamed Crystal to Siberite & Meteorite to Moonstone - Tiny tweaks to color ordering and NiGHTS link colors	2023-08-24 13:33:38 +02:00
Lactozilla	5b387ec94a	Make linedef type 6 closer to ZDoom's Sector_SetPortal	2023-08-23 15:04:50 -03:00