Monster Iestyn
31c5917347
Remove references to old console ports that slipped in from the 2.1 source code a while back
2019-08-20 14:13:38 +01:00
Monster Iestyn
0b6a463cff
Merge branch 'public_next'
...
# Conflicts:
# src/config.h.in
# src/d_clisrv.c
# src/d_netcmd.c
# src/doomdef.h
# src/p_map.c
# src/p_maputl.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
Steel Titanium
997b6bb9d3
Draw record attack foreground even if a message is currently on-screen.
2019-08-20 00:15:35 -04:00
Jaime Passos
2460f670f7
Unlock all cached patches, fix accidental merge conflict.
2019-08-20 00:41:06 -03:00
Jaime Passos
3da02a2056
Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus
2019-08-20 00:21:28 -03:00
Jaime Passos
4b13ba15c9
Remove new character select screen transitions.
...
I should not have implemented it in the first place.
2019-08-20 00:18:34 -03:00
Jaime Passos
fb889d3d1a
New Record Attack menu.
2019-08-20 00:12:22 -03:00
Steel Titanium
1491d68122
Fix record attack foreground not appearing.
...
I'm not sure why it suddenly broke when the same condition worked before.
2019-08-19 22:10:52 -04:00
Jaime Passos
a37caff23e
Fix character description text rendering.
2019-08-19 18:49:23 -03:00
Jaime Passos
42590d5aff
Cool defines
2019-08-19 16:19:25 -03:00
Jaime Passos
21f2553a98
hghdfhdjhdhkdlfh
2019-08-19 15:34:12 -03:00
Jaime Passos
1ef58da49b
slight cleanup
2019-08-19 15:27:20 -03:00
Jaime Passos
af8c67c59a
uh
2019-08-19 14:43:48 -03:00
Jaime Passos
518bb32ecb
did The Thing
2019-08-19 14:23:03 -03:00
Jaime Passos
4ce5840289
More character select work
2019-08-18 22:26:52 -03:00
Jaime Passos
4ba044c30b
Tweak Record Attack screen just a little bit
2019-08-18 20:35:16 -03:00
Jaime Passos
ec797ee106
how do i code
2019-08-18 19:46:55 -03:00
Jaime Passos
b214a4c123
Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus
2019-08-18 19:35:14 -03:00
Jaime Passos
513d34aef8
Character select WIP
2019-08-18 19:34:54 -03:00
Steel Titanium
17cbd9a986
New music for record attack and nights attack menus
2019-08-18 17:32:52 -04:00
Steel Titanium
79587c90ce
Merge branch 'newmenus' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus
2019-08-18 13:49:08 -04:00
Steel Titanium
07cf717e33
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus
2019-08-18 13:46:50 -04:00
Jaime Passos
b31c012063
Merge remote-tracking branch 'origin/master' into newmenus
2019-08-18 14:46:34 -03:00
Steel Titanium
5fa4954c02
Update libpng and zlib
2019-08-18 13:21:20 -04:00
Monster Iestyn
4f12b4dfed
Merge branch '2.1.25-prep' into 'next'
...
Update version to 2.1.25
See merge request STJr/SRB2!507
2019-08-17 14:07:04 -04:00
Monster Iestyn
42eaa1ed39
Merge branch 'netcode-exploits' into 'next'
...
Fix an exploit where players could steal the final hash of a login
See merge request STJr/SRB2!508
2019-08-17 14:05:20 -04:00
James R
abf06098da
Include md5.h
2019-08-17 10:34:19 -07:00
James R
f335519007
Remove a printf
2019-08-17 10:33:33 -07:00
James R
f69983c010
Kart discrepancies
2019-08-17 10:33:14 -07:00
Monster Iestyn
361332b888
Update MD5 for patch.dta
2019-08-17 18:15:23 +01:00
Monster Iestyn
fcc2a8014c
Disable the level end music fade code for now, because we discovered it causes freezes sometimes.
2019-08-16 23:19:43 +01:00
Monster Iestyn
a20079e410
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
Monster Iestyn
8106370fe7
Merge branch 'polyobj-crush-fix-mi' into 'next'
...
PolyObject crush hotfix
See merge request STJr/SRB2!506
2019-08-16 12:04:56 -04:00
Monster Iestyn
f993d74e63
Use P_MobjInsidePolyobj instead of P_MobjTouchingPolyobj, so that you can be crushed by the polyobject's middle rather than just its edges
2019-08-16 14:54:01 +01:00
Monster Iestyn
41dec6e220
Merge branch 'polyobj-fixes-backport' into 'next'
...
PolyObject fixes backport
See merge request STJr/SRB2!505
2019-08-15 13:51:46 -04:00
Monster Iestyn
bd0bd153a7
Make the various carry types' handling code into a switch case
2019-08-15 18:02:30 +01:00
Monster Iestyn
ace2e890c0
split MT_TAILSOVERLAY handling code into a function of its own, since there's so much of it
...
# Conflicts:
# src/p_user.c
2019-08-15 18:02:22 +01:00
Monster Iestyn
9d19883646
After looking at the FOF part of P_LineOpening for a while I now realise many of these variables aren't even necessary, so I removed them all.
...
(Naturally I did the same to the camera equivalent)
# Conflicts:
# src/p_maputl.c
2019-08-15 14:30:10 +01:00
Monster Iestyn
c1ff9f8c64
Edit a lot of the rest of the polyobject-related code in P_LineOpening to make more sense and be more optimised.
...
* If you collide with a line belonging to a polyobject, you should NEVER have to care about any FOFs that might be present in either sector of the linedef. This could lead to colliding with ghostly FOFs that aren't actually there or something dumb, if someone decided to give either of the polyobject's control sectors FOFs for some reason. We don't want that, obviously.
* Polyobjects without POF_CLIPPLANE apparently are supposed to have a top and bottom "physical" height of value INT32_MAX and _MIN respectively, according to P_CheckPosition ...let's be consistent with this.
* Finally, there is no more need for that back = front nonsense hack anymore with my changes made.
# Conflicts:
# src/p_maputl.c
2019-08-15 14:28:06 +01:00
Monster Iestyn
4d3057ff7a
P_LineOpening: set int32 max/min as defaults for opentop, openbottom etc if a linedef you touched belongs to a polyobjetc. the only thing that really matters in this scenario is the polyobject itself after all!
...
# Conflicts:
# src/p_maputl.c
2019-08-15 14:25:02 +01:00
Monster Iestyn
845b657ac1
Remove commented out P_CheckSector calls and add extra comments explaining the situation
2019-08-15 14:21:19 +01:00
Monster Iestyn
925c9dc5d8
Modify P_CheckSector with a modified version of Sal's attempted proper fix for polyobjects crushing, so that we only need to check the polyobject's control sector directly in the waypoints code.
...
This time I've definitely fixed that teleport to ground issue I'm pretty sure, I don't get it in my tests at least.
2019-08-15 14:20:52 +01:00
Steel Titanium
6b16560832
Merge branch 'master' into newmenus
2019-08-14 22:51:06 -04:00
toaster
3b8f176720
Tweak the Metal Sonic death explosion sequence. It's longer than all the others before the egg capsule comes up, but so is Mecha Sonic in s3k, so it fits.
...
(Not uploading an exe for this miniscule change. If you want to play with this, get it in Master. :P )
2019-08-14 10:22:14 +01:00
toaster
cf94cce073
Use the softer explosion sound from s3k to go with the increased quantity of explosions.
2019-08-13 20:24:46 +01:00
toaster
6f63c2c499
Fix P_PlayerCanDamage for CA_FLY and CA_BOUNCE to be less lenient in causing damage, by making them based off the top and bottom of the player object respectively rather than its vertical center.
2019-08-13 20:11:44 +01:00
toaster
9aaee61dce
Tweak the ACZ3 fight a little, animationwise, since every other non-Brak boss got an upgrade to its death anim in this branch.
...
Also make its bomb throw anim use all the new sprites.
2019-08-13 19:41:04 +01:00
Monster Iestyn
febbe1425f
Fixed TC_RAINBOW so it doesn't accept invalid colors, whoopsies
2019-08-12 19:06:18 +01:00
toaster
d8f4a1b7a1
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework
2019-08-12 18:50:42 +01:00
toaster
1d17cd4566
Tweak the animation speed of the fleeing eggmobiles' sweatdrops.
2019-08-12 18:50:23 +01:00
