8000 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
lachwright	00697caa6e	Initial commit	2019-10-03 12:49:46 +08:00
Jaime Passos	1750ed5383	nights attack	2019-10-02 22:02:13 -03:00
Jaime Passos	a7dcf534ca	character select	2019-10-02 21:57:04 -03:00
Jaime Passos	a0e9fbfffe	test	2019-10-02 21:28:02 -03:00
Jaime Passos	6a8539c8f1	test	2019-10-02 20:00:43 -03:00
lachwright	27c9fe5047	Fix false comment	2019-10-03 02:31:32 +08:00
Steel Titanium	625de1f4f6	Some changes. ... Restore the menu headers for record attack and character select menu. Attempt to optimize the NiGHTS mode menu. (Help getting the scrolling to work in an efficient way would be nice).	2019-10-01 23:40:59 -04:00
Steel Titanium	6b10ffb88f	Merge branch 'master' into newmenus	2019-10-01 16:52:31 -04:00
MascaraSnake	5c1fabfaae	Lava is now either completely solid or completely intangible. No more half-assing	2019-10-01 21:58:18 +02:00
MascaraSnake	24e80c9b23	Made solid lava walls damaging	2019-10-01 21:17:33 +02:00
toaster	f224e03e1d	Amy cameo for Frozen Hillside. Wait for the MR, I'll make a fuller pitch there...	2019-10-01 18:19:37 +01:00
Monster Iestyn	b72609f7f7	Merge branch 'master' into mi-tinkers-with-lua-again	2019-09-30 20:51:29 +01:00
MascaraSnake	5460e0e1f9	Merge branch 'master' into acz-fixes	2019-09-30 20:50:33 +02:00
MascaraSnake	e75dee7747	Fix various minus carrying bugs	2019-09-30 20:35:47 +02:00
lachwright	5bbd56b6fa	Improve glide bounces	2019-09-30 16:35:05 +08:00
lachwright	7d57d53d45	Allow camera movement while climbing; allow sliding while landing from a glide	2019-09-30 14:38:58 +08:00
Steel Titanium	ebe99dad7a	Make comment more clear	2019-09-30 01:29:57 -04:00
Steel Titanium	592a98a3e8	Fix the sky on the intro cutscene not scrolling.	2019-09-30 01:25:21 -04:00
lachwright	c72b5d8a49	Allow retention of momentum when climbing off surfaces	2019-09-30 10:55:57 +08:00
lachwright	906a2b1f59	Merge branch 'master' into knuxstuff ... Update to master (necessary for climbing changes)	2019-09-30 09:56:04 +08:00
Jaime Passos	d67804cb9c	png fix yes so cool	2019-09-29 19:10:49 -03:00
Jaime Passos	7eb5155240	sprite2info soc yummy yummy yes	2019-09-29 19:03:10 -03:00
MascaraSnake	d301d2bba4	Fixed a bug with the ring lava melting	2019-09-29 23:22:38 +02:00
MascaraSnake	4375ea8089	Lava now melts rings!	2019-09-29 23:11:21 +02:00
MascaraSnake	3d985c1b9e	Pterabytes can now swoop you off a rollout rock	2019-09-29 22:13:10 +02:00
lachwright	6c0e4a154d	Resolve merge conflicts	2019-09-30 03:07:03 +08:00
lachwright	e57b0f7126	(Hopefully) cover all cases for resetting rock usability	2019-09-30 03:05:08 +08:00
Jaime Passos	b2ac64f24c	better soc	2019-09-29 15:53:04 -03:00
MascaraSnake	cd45bca848	Pterabyte: Don't drop off player in the first ten tics after grabbing	2019-09-29 19:51:27 +02:00
MascaraSnake	c00144a4f8	Pterabyte: Don't target players who are invincible after being hurt	2019-09-29 19:29:34 +02:00
Jaime Passos	318fde6ae7	Giant mistake	2019-09-29 14:12:53 -03:00
MascaraSnake	9431497f7d	Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode ... # Conflicts: # src/d_player.h # src/dehacked.c # src/p_map.c # src/p_user.c	2019-09-29 18:49:53 +02:00
MascaraSnake	26ecab14d7	Implemented the Pterabyte grabbing mechanic	2019-09-29 18:42:17 +02:00
Jaime Passos	4a0848acd7	I want to be able to stack skins in a sprite2 block	2019-09-29 12:41:15 -03:00
Jaime Passos	82be346091	change comment and error message	2019-09-29 12:16:38 -03:00
Jaime Passos	c268743220	hehee	2019-09-29 12:13:51 -03:00
lachwright	60cbc2e6b4	Remove unused locals	2019-09-29 21:29:37 +08:00
lachwright	71603006dc	Resolve merge conflicts	2019-09-29 20:29:49 +08:00
lachwright	8abb6129c1	Hardcode pumice ball ... Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly	2019-09-29 20:18:40 +08:00
MascaraSnake	22e3c37e5d	Don't make the Pterabyte radius adjustable (doesn't work correctly right now)	2019-09-29 11:58:33 +02:00
MascaraSnake	598047ae8b	Hardcoded the Pterabyte (without the grabbing mechanic)	2019-09-29 10:39:09 +02:00
sphere	bea7224ebf	Use zones.pk3 instead of zones.dta.	2019-09-29 05:31:50 +02:00
Jaime Passos	73e4e67595	JIMITA DO THE SOC	2019-09-28 19:13:51 -03:00
Jaime Passos	b74cfca3e2	JIMITA DO TH EROTSPRITE	2019-09-28 17:56:27 -03:00
Monster Iestyn	52562c4125	whoops, didn't mean to include this	2019-09-28 20:45:44 +01:00
Jaime Passos	8aefc03409	quick maths	2019-09-28 13:40:40 -03:00
Jaime Passos	6574e1a7d3	memory management	2019-09-28 12:50:07 -03:00
Jaime Passos	5118f8589d	Merge remote-tracking branch 'origin/master' into rotsprite_i	2019-09-28 12:14:55 -03:00
Steel Titanium	cf852e7d39	Fix crash if speed is too high ... Also update libopenmpt	2019-09-27 23:53:19 -04:00
Jaime Passos	0aba0aa4b9	Merge remote-tracking branch 'origin/master' into openglskydome2	2019-09-27 22:47:10 -03:00