Monster Iestyn
b4d8c2fa29
Hardcoded A_Boss5PinchShot
2019-05-03 19:46:41 +01:00
Monster Iestyn
6cd2b73273
Hardcoded A_LookForBetter
2019-05-03 19:14:17 +01:00
Monster Iestyn
a0220454fd
Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description)
2019-05-03 18:51:17 +01:00
Monster Iestyn
1b2afea091
Merge branch 'public_next'
2019-05-03 16:42:42 +01:00
Monster Iestyn
454306cf86
Merge branch 'master' into next
2019-05-03 16:40:13 +01:00
Monster Iestyn
a5dfbe7eff
add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
...
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
Monster Iestyn
d4ab2837bb
Merge branch 'master' into next
2019-05-03 16:00:45 +01:00
mazmazz
904b00e921
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
89ab777c40
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
Monster Iestyn
266fa05e15
fix a slipup in A_DoNPCPain I just noticed I made, whoops
2019-05-02 21:34:00 +01:00
Monster Iestyn
61eb05eab2
Hardcoded A_Boss5CheckFalling
2019-05-02 21:32:28 +01:00
Monster Iestyn
953a0c2967
Hardcoded A_Boss5ExtraRepeat
2019-05-02 21:21:15 +01:00
Monster Iestyn
fb17c1ac5a
Hardcoded A_Boss5CheckOnGround
2019-05-02 19:09:40 +01:00
Monster Iestyn
3bbc5d0b08
hardcoded A_DoNPCPain
2019-05-02 18:32:43 +01:00
Monster Iestyn
75701294ea
Hardcode Fang waypoint object type (turns out no state is needed)
2019-05-02 18:11:44 +01:00
Monster Iestyn
d92ccf6823
Hardcoded all the main Fang-specific object types, states and sprites.
...
This cannot be compiled as-is right now for the following reasons:
* Numerous actions still need to be hardcoded.
* MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it.
Also missing:
* Fang waypoint object type+states.
* Fang's good looks (to be put in the resource files obviously).
* Fang's brain.
2019-05-02 18:01:18 +01:00
Sryder
4d77ed925e
OpenGL sprite billboarding
...
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00
Nev3r
a56e8e4f8b
Merge branch 'further-mace-advancements' into 'master'
...
Further Mace Advancements
See merge request STJr/SRB2Internal!147
2019-04-30 15:15:35 -04:00
Monster Iestyn
3203dc5d4b
Remove old code altogether at Nev3r's request
2019-04-17 16:46:32 +01:00
Monster Iestyn
6bddd131da
Undefine toaster's old define to flip full-brightness default status for planes
2019-04-17 14:51:48 +01:00
Steel Titanium
26fdee8217
Don't enable UPnP support if NONET is defined.
2019-04-16 15:05:09 -04:00
James R
36e678b292
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
Monster Iestyn
797ca99f42
Detect infinite alias self-recursion mixed with other commands, such as in the case of alias a "echo test; a"; a
.
...
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
2019-04-14 16:39:14 +01:00
Monster Iestyn
8a2f8a441b
Merge branch 'master' into opengl-new-patch-features-support
2019-04-11 20:09:57 +01:00
Monster Iestyn
212be85655
added "checkmobjs" boolean to both Polyobj_moveXY and Polyobj_rotate, so we can disable interaction with mobjs for netgames
2019-04-05 12:03:03 +01:00
Nev3r
1d401d8481
Merge branch '144-scrolltweaks' into 'master'
...
Resolve "Let scrollers and wind/current affect front sector if untagged, and use texture offsets as parameters if different from 0"
Closes #144
See merge request STJr/SRB2Internal!213
2019-04-05 06:41:11 -04:00
Nev3r
fec991dedb
Implement displacement-based polyobject rotation.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 11:50:59 +02:00
Monster Iestyn
07a66e5355
Merge branch 'public_next'
2019-04-02 15:49:15 +01:00
Monster Iestyn
ab0fe6b164
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
James R
42d25f67ca
Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
2019-03-31 12:29:55 -07:00
Monster Iestyn
7ae6d5ee8c
Merge branch 'public_next'
...
# Conflicts:
# src/doomstat.h
# src/g_game.c
2019-03-28 14:19:02 +00:00
James R
917edf720d
Don't close console when starting title screen
2019-03-26 13:05:19 -07:00
James R
9a350eb879
Don't close console when changing map
2019-03-26 13:04:11 -07:00
James R
69d7e98f34
Remove redundant CON_ClearHUD calls
2019-03-26 12:59:13 -07:00
James R
e8071e66e4
Resize console upon resolution change
...
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
2019-03-26 12:30:02 -07:00
jameds
b9b36a44a8
Keep color across wrapped lines
...
And this works by inserting the same color code on each wrapped line.
2019-03-26 12:07:11 -07:00
jameds
587586f4bb
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
Monster Iestyn
a01a0a3dc3
Merge branch 'master' into next
2019-03-26 13:46:15 +00:00
Monster Iestyn
9ef98471a4
Merge branch 'buildbot' into 'master'
...
Buildbot changes
See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00
Monster Iestyn
8e78369f83
Merge branch 'dedicated-server-credits-fix' into 'master'
...
Dedicated server credits fix
See merge request STJr/SRB2!476
2019-03-26 09:44:21 -04:00
Monster Iestyn
67874180b2
Merge branch 'gametype-strings-backport' into 'next'
...
Gametype strings backport
See merge request STJr/SRB2!473
2019-03-26 09:42:52 -04:00
Monster Iestyn
8c1c0875a2
Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way
2019-03-25 21:35:04 +00:00
Alam Ed Arias
fe22fdc5a3
P_SuperDamage() is too big for inlining
2019-03-25 15:30:25 -04:00
Monster Iestyn
147221cf6e
R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them.
2019-03-25 18:54:47 +00:00
Monster Iestyn
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
James R
ed0f8fd967
Actually allow connecting to "localhost"
...
Because IPv6 doesn't seem to work anyway.
2019-03-20 20:37:00 -07:00
James R
f139ffd1dc
Let localhost connections
2019-03-20 20:37:00 -07:00
Monster Iestyn
ecb6322a52
Merge branch 'sdl-noxinput-nohidapi' into 'master'
...
-noxinput and -nohidapi command line parameters.
See merge request STJr/SRB2!468
2019-03-20 17:33:04 -04:00
Monster Iestyn
2fb569857a
Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa
...
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names
# Conflicts:
# src/doomstat.h
# src/m_menu.c
2019-03-18 22:00:23 +00:00
Nev3r
aa43f8b3bf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks
2019-03-16 08:14:29 +01:00
Steel Titanium
6d751ff302
Remove the define.
2019-03-15 18:46:25 -04:00
Steel Titanium
5a170b9e4e
Merge branch 'master' into errorifpng
2019-03-15 16:40:47 -04:00
Steel Titanium
67a80ba311
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command
2019-03-15 16:13:31 -04:00
Jimita
6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots
2019-03-15 16:38:33 -03:00
mazmazz
8afaaa80a1
lclear -> _clear typo
2019-03-15 03:15:20 -04:00
mazmazz
f163633591
Merge branch 'public_next'
2019-03-15 01:43:03 -04:00
mazmazz
6b93ca9221
Intermission: Don't fade out level music when using win32 midi volume hack
2019-03-15 01:26:13 -04:00
mazmazz
6cf05a4613
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
mazmazz
9064a0b33a
Merge remote-tracking branch 'origin/master'
2019-03-15 00:33:12 -04:00
mazmazz
4377386153
Merge branch 'public_next'
2019-03-15 00:33:06 -04:00
mazmazz
bd9e42ce6e
Merge branch 'public-gl-next' into public-musicplus-inter
2019-03-14 23:42:16 -04:00
mazmazz
3b6be9b419
Remove redundant music reset block for MIXNIGHTSCOUNTDOWN
2019-03-14 23:21:52 -04:00
mazmazz
469ed9cbe3
Implement MIXNIGHTSCOUNTDOWN
...
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
2019-03-14 23:10:14 -04:00
mazmazz
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
mazmazz
fdde5f13c5
When resetting volume on same music, make it fade instead of a hard change
2019-03-13 23:55:30 -04:00
mazmazz
67e2857303
When changing to same music, reset the internal volume
2019-03-13 23:41:35 -04:00
mazmazz
c021e29835
Restore MUSIC_RELOADRESET if block in g_game
2019-03-13 21:18:23 -04:00
mazmazz
2c75d4da69
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
mazmazz
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
Nev3r
ae9f8856ac
Override vectorial magnitude with front X offset, if provided; takes the line's lengths into account otherwise, as usual.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-13 12:24:47 +01:00
Nev3r
cd3ea897c3
Dealt with no-tag business:
...
* Wind/current pushers affect front sector if left untagged.
* Plane scrollers affect front sector if left untagged.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-13 11:13:54 +01:00
Alam Ed Arias
08784ce58d
Merge branch 'master' into next
2019-03-09 20:37:17 -05:00
Alam Ed Arias
60ca6ae06b
TravisCI: add option for GCC 8.1
2019-03-09 19:41:56 -05:00
Nev3r
83f953edb8
Make FOFs extend to infinity when in contact with a horizon line.
...
Make FOFs extend to infinity when in contact with a horizon line.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-03-07 19:01:02 +01:00
Alam Ed Arias
747995ae6a
Merge branch 'master' into next
2019-03-04 17:15:04 -05:00
Alam Ed Arias
67e246cd53
No more errors for VC6 support
2019-03-04 16:46:14 -05:00
Alam Ed Arias
145ccfd405
no more floating constants warnings, and disable bad array bounds warnings
2019-03-04 16:46:14 -05:00
Steel Titanium
9542a47f7f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
Steel Titanium
15323328c5
Check using memcmp()
2019-03-03 22:43:21 -05:00
Steel Titanium
3d5d02fc15
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00
Monster Iestyn
a93e96c75b
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/Srb2SDL-vc10.vcxproj
# src/sdl12/Srb2SDL-vc9.vcproj
# src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-03-02 20:51:15 +00:00
Alam Ed Arias
c2618fd987
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
Alam Ed Arias
f823768699
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
Monster Iestyn
008b0bf560
Merge branch 'master' into next
2019-03-01 16:23:51 +00:00
Monster Iestyn
67e721e983
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Monster Iestyn
4459ecdd90
Merge branch 'master' into next
2019-03-01 16:05:49 +00:00
wolfy852
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
Alam Ed Arias
7cd60a544a
Merge branch 'apng-oh-shit-fixes' into 'master'
...
Compiling errors for apng fixed
See merge request KartKrew/Kart-Public!69
2019-02-28 12:00:58 -08:00
wolfs
5620d0188e
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
ae244d2af3
Fix goofup with addonsp patch unlock for loop from 2.1.13 merge
2019-02-28 15:48:27 +00:00
Monster Iestyn
7a0d8b408e
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00:00
Steel Titanium
fa990e8603
Remove double define
2019-02-27 16:05:43 -05:00
Steel Titanium
e71977fe6a
Merge branch 'next' into banip-command
2019-02-27 16:03:01 -05:00
Steel Titanium
15b27bb7d7
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
Monster Iestyn
0340eb0b99
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
Monster Iestyn
d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
Monster Iestyn
a25f4b8194
Make sure that B_CheckRespawn can be called even if Tails is dead
2019-02-26 21:14:22 +00:00
Alam Ed Arias
e36193e44e
Merge branch 'hide-error-devmode' into 'next'
...
Show line number on error, also hide under devmode
See merge request STJr/SRB2!458
2019-02-21 23:05:09 -05:00
Alam Ed Arias
2f8eadd211
Merge branch 'master' into next
2019-02-21 22:42:26 -05:00
Steel Titanium
bfbb83df23
Save when quitting the game.
...
Also use default reason if not custom reason is given.
2019-02-21 19:48:15 -05:00
Steel Titanium
bf2f6ebc09
Save ban list right after banning.
2019-02-21 19:47:00 -05:00
Steel Titanium
c9d90f7688
Add command to ban an IP address.
2019-02-21 19:44:18 -05:00
Steel Titanium
c1deea0714
Disable multi statement macros errors.
2019-02-21 18:48:42 -05:00
Monster Iestyn
cb986bf1c0
added support for both horizontal and vertical flipping (not sure if complete or not atm, but I've done enough for tonight I think)
2019-02-13 22:40:48 +00:00
Monster Iestyn
7321df8015
some more mucking about with function arguments (preparing for alpha/flip support adding particularly), also fixed a slipup I made when I first made HWR_DrawColumnInCache
2019-02-13 20:56:59 +00:00
Monster Iestyn
d2c6b995d3
split HWR_DrawPatchInCache into two functions: one for texture patches and one for everything else
2019-02-13 20:12:10 +00:00
Monster Iestyn
497e79d1de
Turns out the consts ARE needed after all, also fix some other errors the compiler reported
2019-02-13 18:20:26 +00:00
Monster Iestyn
55e3e99a94
Merge branch 'master' into opengl-new-patch-features-support
2019-02-13 18:08:17 +00:00
Monster Iestyn
8f667906eb
Fix compiler warnings
2019-02-13 18:06:56 +00:00
Monster Iestyn
ff2ebf20fb
blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache
2019-02-13 17:27:20 +00:00
Monster Iestyn
efa042a995
whoops, removed some variables I shouldn't have, so I've added them back
2019-02-13 16:52:51 +00:00
Monster Iestyn
30a00c812c
Split the column caching code of HWR_DrawPatchInCache into a new function, HWR_DrawColumnInCache. This should make modifying the OpenGL caching code look a little less daunting, hopefully.
...
I also removed some "const"s for now, since I wasn't sure if they were needed or even correct to use or not here... if they're fine I could add them back later though.
(Note: I have not tested if this compiles yet)
2019-02-13 16:39:37 +00:00
Steel Titanium
76724c9c13
Show line number on error, also hide under devmode
2019-02-11 16:39:58 -05:00
Monster Iestyn
e6cb47e2f2
Merge branch 'fix_skins_overflow' into 'next'
...
Fix skin overflow error
See merge request STJr/SRB2!455
2019-02-11 15:05:00 -05:00
MascaraSnake
5eb089cc14
Forgot the continue statements
2019-02-03 17:07:13 +01:00
MascaraSnake
00cad05550
Emblem number in emblem definition is optional. If none is supplied, place in first free slot.
2019-02-03 17:03:33 +01:00
MascaraSnake
bc30bd06df
In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC
2019-02-03 14:32:07 +01:00
MascaraSnake
8c345b87ca
Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD
2019-02-03 11:05:22 +01:00
MascaraSnake
0dd8779b91
Hardcoded emblems of the first four special stages
2019-01-30 23:01:58 +01:00
MascaraSnake
88a6dbae9b
Spring Hill -> Christmas Chime
2019-01-29 22:26:15 +01:00
MascaraSnake
f6dd521fd0
Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ
2019-01-28 21:28:38 +01:00
Steel Titanium
0aa965c59f
How did I forget about this
2019-01-26 23:22:30 -05:00
Steel Titanium
bce093fd06
Setup the tables even eariler.
...
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
2019-01-26 23:16:49 -05:00
Steel Titanium
74bf3164f8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia
2019-01-26 00:51:39 -05:00
TehRealSalt
0d1c501664
Update the SP menu stuff to use MAXSKINS
...
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
2019-01-26 00:22:05 -05:00
Alam Ed Arias
74850fea17
Merge branch 'master' into next
2019-01-20 17:01:01 -05:00
Sryder
b18a8dbc8d
Disable the APNG code if the version of libpng is greater than 1.4.
...
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
2019-01-20 18:50:28 +00:00
james
356249dade
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
Jimita
424b2b1aaf
Merge branch 'next' into flashpals-on-screenshots
2019-01-16 05:59:05 -02:00
Steel Titanium
fad341b0e9
Fix skins overflow
2019-01-15 14:29:43 -05:00
fickleheart
7e026824a4
Fix rendering gaps on polys with upper/lower textures
2019-01-12 20:15:58 -05:00
Monster Iestyn
f3796dc7f6
revert to LF_SAVEGAME system code, removing all traces of saveoverride
...
(I believe Sal wanted us to do this anyway, so...)
2019-01-08 17:14:21 +00:00
mazmazz
a050ed956a
Fixed Addons Menu icons for search bar
2019-01-08 01:31:44 -05:00
mazmazz
47bd042a7e
Misssed alwaysfreelook defaults (first person)
2019-01-08 01:29:12 -05:00
mazmazz
d5de5e9f49
Fix player.dta SIGNA0 overwriting regular end sign frame
2019-01-08 00:19:42 -05:00
mazmazz
e02fd489a7
GCC 7 fallthru bypasses (-Werror-implicit-fallthrough)
2019-01-07 23:06:47 -05:00
mazmazz
8ea8bf2587
Chat arrow offsets
2019-01-07 22:34:48 -05:00
mazmazz
5066e340f4
Update SRB2-CHAT nickname colors to 2.2 skincolors
2019-01-07 22:26:39 -05:00
mazmazz
e403d1bacc
Correct addons menu back color
2019-01-07 21:58:42 -05:00
mazmazz
dfc427e81a
Dummy out SRB2-CHAT console colors
...
Pending translation to 2.2 palette indexes
2019-01-07 21:54:38 -05:00
mazmazz
411b1b4f54
Addons menu merge fixes
2019-01-07 21:45:41 -05:00
mazmazz
a775a63dfd
WIP hu_stuff merge fixes
2019-01-07 17:56:55 -05:00
mazmazz
875aee60a0
Menu merge fixes
2019-01-07 17:56:43 -05:00
mazmazz
b3f7b169b2
Merge errors for compile
2019-01-07 17:05:20 -05:00
Digiku
4f0be1b064
Update f_finale.c - Small credits update
2019-01-07 16:50:59 -05:00
mazmazz
7aa55f24f5
Resolve r_data.c colormap conflict
2019-01-07 15:29:37 -05:00
Nev3r
7d09149b04
Solved conflicts related to PK3s
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-01-07 19:00:31 +01:00
Monster Iestyn
9effa134d2
resolve the conflict in p_spec.c
2019-01-07 17:02:05 +00:00