Steel Titanium
7731bf6b09
Use correct integer format
2019-08-21 21:25:45 -04:00
Jaime Passos
f90a6540d6
NiGHTS Attack menu: Let patch offsets control the alignment of the top border.
2019-08-20 21:45:55 -03:00
James R
c6c0a9dd1a
Old string drawing functions are dumb
2019-08-20 16:33:39 -07:00
Jaime Passos
41d5ffa17f
Fix OpenGL renderer crash with -skipintro command line parameter.
2019-08-20 20:21:53 -03:00
Jaime Passos
1a1f4136e8
Fix character select menu to use the new Color_Opposite array.
2019-08-20 19:08:45 -03:00
Jaime Passos
403eafb003
Merge remote-tracking branch 'origin/master' into newmenus
2019-08-20 19:07:34 -03:00
Steel Titanium
6ef9ee5467
true not TRUE
2019-08-20 15:43:59 -04:00
Monster Iestyn
eacc589ae1
Added quick validity checks for three linedef executor specials that require a player mobj to be the triggerer (432, 434 and 437)
2019-08-20 20:31:28 +01:00
Monster Iestyn
2dd5f1abe3
Fixes for lib_cvRegisterVar (the Lua version of CV_RegisterVar):
...
* Make sure the consvar's properties are all initialised to zeros as defaults
* Error if the consvar is not given a name
* Error if the consvar has CV_CALL but no call function
* Error if the consvar has CV_NOINIT but not CV_CALL
2019-08-20 18:18:29 +01:00
Monster Iestyn
7f5034bb75
Merge branch 'mi-cleanup-returns' into 'master'
...
MI cleanup returns
See merge request STJr/SRB2Internal!292
2019-08-20 09:35:36 -04:00
Monster Iestyn
54dbd7b4c1
Merge branch 'landingbetter' into 'master'
...
Fix all our landing woes. (For now.)
See merge request STJr/SRB2Internal!289
2019-08-20 09:28:40 -04:00
Monster Iestyn
03ce0adef8
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
f3484f7ded
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
5ef4b938be
Draw record attack foreground even if a message is currently on-screen.
2019-08-20 00:15:35 -04:00
Jaime Passos
12a6479521
Unlock all cached patches, fix accidental merge conflict.
2019-08-20 00:41:06 -03:00
Jaime Passos
d59febb5aa
Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus
2019-08-20 00:21:28 -03:00
Jaime Passos
e4e3af7be0
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
61866f326a
New Record Attack menu.
2019-08-20 00:12:22 -03:00
Steel Titanium
15b363773f
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
e2dde4412d
Fix character description text rendering.
2019-08-19 18:49:23 -03:00
Jaime Passos
5290f4c80b
Cool defines
2019-08-19 16:19:25 -03:00
Jaime Passos
15957bf13f
hghdfhdjhdhkdlfh
2019-08-19 15:34:12 -03:00
Jaime Passos
94e21c7b03
slight cleanup
2019-08-19 15:27:20 -03:00
Jaime Passos
29dc1119e5
uh
2019-08-19 14:43:48 -03:00
Jaime Passos
85499040d3
did The Thing
2019-08-19 14:23:03 -03:00
Jaime Passos
381258883e
More character select work
2019-08-18 22:26:52 -03:00
Jaime Passos
f13a014c4c
Tweak Record Attack screen just a little bit
2019-08-18 20:35:16 -03:00
Jaime Passos
6a66057a60
how do i code
2019-08-18 19:46:55 -03:00
Jaime Passos
feac7b56ec
Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus
2019-08-18 19:35:14 -03:00
Jaime Passos
778461028e
Character select WIP
2019-08-18 19:34:54 -03:00
Steel Titanium
59cdfa8e27
New music for record attack and nights attack menus
2019-08-18 17:32:52 -04:00
Steel Titanium
fe11620b60
Merge branch 'newmenus' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus
2019-08-18 13:49:08 -04:00
Steel Titanium
a40d5a2a45
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus
2019-08-18 13:46:50 -04:00
Jaime Passos
5e11c5fbe7
Merge remote-tracking branch 'origin/master' into newmenus
2019-08-18 14:46:34 -03:00
Steel Titanium
165ade339b
Update libpng and zlib
2019-08-18 13:21:20 -04:00
Jaime Passos
f68652aa66
I
2019-08-18 14:16:48 -03:00
GoldenTails
ac7db85149
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem
2019-08-17 21:17:38 -05:00
Monster Iestyn
c50831f875
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
9a4a90c9cb
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
9c1fa867fa
Include md5.h
2019-08-17 10:34:19 -07:00
James R
c1ba72ead8
Remove a printf
2019-08-17 10:33:33 -07:00
James R
19dd9a3c14
Kart discrepancies
2019-08-17 10:33:14 -07:00
Monster Iestyn
0949406b9c
Update MD5 for patch.dta
2019-08-17 18:15:23 +01:00
Monster Iestyn
450ea0cc43
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
e52a314ddb
Update version to 2.1.25
2019-08-16 20:14:01 +01:00
Monster Iestyn
99f04f1d89
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
ae9ecef592
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
392cb89ff4
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
5c2786b163
Make the various carry types' handling code into a switch case
2019-08-15 18:02:30 +01:00
Monster Iestyn
d55790097f
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
