Jaime Passos
c72f3cbc69
Merge remote-tracking branch 'origin/master' into newmenus
2019-09-02 23:34:25 -03:00
Monster Iestyn
7f1e13b746
Merge branch 'ring-penalty-graphic' into 'master'
...
Weapon ammo penalty indicator
See merge request STJr/SRB2Internal!297
2019-08-30 13:28:05 -04:00
Steel Titanium
3a08761a8f
Merge branch 'abpolish' into 'master'
...
Autobrake polish
Closes #176
See merge request STJr/SRB2Internal!293
2019-08-28 00:34:21 -04:00
Jaime Passos
740deea181
Don't draw borders or patches if not necessary.
2019-08-26 20:49:04 -03:00
James R
d51b516446
Show a negative number to indicate ammo penalty
2019-08-26 16:07:17 -07:00
Jaime Passos
129fc6d3ae
Merge remote-tracking branch 'origin/master' into newmenus
2019-08-26 19:32:44 -03:00
Monster Iestyn
4416be5def
Merge branch 'candamagefix' into 'master'
...
P_PlayerCanDamage fix
See merge request STJr/SRB2Internal!291
2019-08-26 11:32:10 -04:00
Monster Iestyn
e5c46e9b18
Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively
2019-08-25 22:24:08 +01:00
Monster Iestyn
a7353a9835
Merge branch 'public_next'
...
# Conflicts:
# src/d_netfil.c
2019-08-25 18:18:59 +01:00
Monster Iestyn
7a5263e1a0
Merge branch 'master' into next
2019-08-24 23:28:38 +01:00
Monster Iestyn
68c94ab194
Merge branch 'based-files' into 'master'
...
Compare the file name only for real
See merge request STJr/SRB2!511
2019-08-24 15:51:11 -04:00
Monster Iestyn
59931b6bfd
Merge branch 'calling-all-lua-consvars' into 'next'
...
Calling all Lua consvars
See merge request STJr/SRB2!509
2019-08-24 15:50:43 -04:00
James R
30d7cf0fb5
Compare the file name only for real
...
CL_SendRequestFile prepends the path for each file.
2019-08-23 11:00:05 -07:00
Monster Iestyn
5035443dc8
Merge branch 'gfz_boss_rework' into 'master'
...
GFZ boss rework + boss explosion fun
See merge request STJr/SRB2Internal!290
2019-08-22 11:27:24 -04:00
toaster
c7ea762cf1
Autobrake polish!
...
* Make it actually look like a brake, so people can tell it's on instead of just having high friction.
* Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
2019-08-22 16:13:00 +01:00
Jaime Passos
6b4a86d31b
NiGHTS Attack menu: Let patch offsets control the alignment of the top border.
2019-08-20 21:45:55 -03:00
James R
06c441703f
Old string drawing functions are dumb
2019-08-20 16:33:39 -07:00
Jaime Passos
4fa44a16c0
Fix character select menu to use the new Color_Opposite array.
2019-08-20 19:08:45 -03:00
Jaime Passos
92817a8991
Merge remote-tracking branch 'origin/master' into newmenus
2019-08-20 19:07:34 -03:00
Steel Titanium
c18ec4774e
true not TRUE
2019-08-20 15:43:59 -04:00
Monster Iestyn
7be7d86ff5
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
fa76579a1b
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
ebfa40c004
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
6f9fbd0ddf
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
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
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
