Alam Ed Arias
addf2bb3c4
Fix NONET build
2019-05-13 01:51:36 -04:00
Steel Titanium
8a14427420
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
Steel Titanium
06961a8f5e
Merge branch 'no-frameskip' into 'next'
...
Don't skip frames when connecting or paused
See merge request STJr/SRB2!489
2019-05-13 00:35:11 -04:00
Steel Titanium
cad65ad5e9
Properly fix crash due to duplicated lines.
2019-05-13 00:23:43 -04:00
Steel Titanium
4e0cc2505a
Revert "Check that lumps are okay"
...
This reverts commit 7ac0a8b4d2
.
2019-05-13 00:20:39 -04:00
Steel Titanium
b34aa86403
Hardcode some ACZ things
2019-05-11 22:56:23 -04:00
James R
7ac0a8b4d2
Check that lumps are okay
2019-05-08 20:30:19 -04:00
Monster Iestyn
f0e16cad32
Merge branch 'master' into next
2019-05-08 16:31:05 +01:00
Monster Iestyn
8ea9d0e95c
Merge branch 'alias_recursion_hotfix_2' into 'master'
...
Alias recursion hotfix 2
See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
wolfy852
8f05d75926
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
wolfs
e394f41c52
Merge branch 'public-musicplus-tagfix' into 'next'
...
Fix music load lag by reverting tag changes
See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
Sryder
b304b268c8
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
Sryder
1f1d67cd7e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
...
# Conflicts:
# src/p_user.c
2019-05-06 20:20:57 +01:00
Monster Iestyn
406c3619d7
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
aab2f55aec
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
Nev3r
ae25e8ea07
Merge branch 'console-wait-fix' into 'master'
...
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
Nev3r
8b8e165d19
Merge branch 'opengl-sprite-billboarding' into 'master'
...
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
Sryder
8273534967
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
Monster Iestyn
ea951eef78
fix an inconsistency I introduced between counting the waypoints and finding them again
2019-05-05 21:16:44 +01:00
Monster Iestyn
ee0c4b42a6
fix P_CheckSight to consider FOFs that completely block the view
...
(this could probably be in its own branch to be tested properly, but I'm on a roll with this atm)
2019-05-05 21:03:15 +01:00
Monster Iestyn
b9611c3a81
Hardcoded the cork's stun-you-even-while-flashing behaviour
2019-05-05 19:16:30 +01:00
Monster Iestyn
b0087616c7
Hardcoded the boss's TouchSpecial hook.
...
Also cleaned up this part of P_TouchSpecialThing a bit while I'm here
2019-05-05 18:22:19 +01:00
Monster Iestyn
373d12cb82
Hardcode "slapstick"
2019-05-05 17:36:55 +01:00
Monster Iestyn
f7fbf40437
Hardcoded MT_FSGNA's MobjThinker hook function
2019-05-05 16:42:50 +01:00
Monster Iestyn
9c0c0ad3dc
hardcoded the boss's A_BossDeath behaviour.
...
(also turned this part of the function into a switch case to make things neater)
2019-05-05 16:03:34 +01:00
Monster Iestyn
289a412377
Hardcode the boss thinker function
2019-05-05 15:34:06 +01:00
Monster Iestyn
9e26d7bdaa
I just checked how P_LookForPlayers works, and it turns out it doesn't modify the target *unless* it returns true. So I guess we've no need to account for a change in target in A_LookForBetter after all?
2019-05-05 14:09:09 +01:00
Monster Iestyn
09368963dd
hardcode MT_FBOMB's MobjSpawn hook function
2019-05-04 22:46:27 +01:00
Monster Iestyn
d44265a217
Mystery solved, he was turning "invisible" because of this mistake in A_DoNPCSkid
2019-05-04 22:38:14 +01:00
Monster Iestyn
691ae982e7
S_FANG_SLIDE wasn't defined in the Lua script, despite being declared :|
...
Also Fang seems to turn invisible after his first jump for some reason, and I can't figure out why???
2019-05-04 21:31:46 +01:00
Monster Iestyn
7b6b34212b
Swap "S_TNTBARREL_EXPL1" for S_NULL as a temporary measure until I actually hardcode the explosion states.
...
As of now, you can now compile this branch with no issues. But Fang won't work properly for a while yet, we'll get there don't worry.
2019-05-04 20:20:34 +01:00
Monster Iestyn
445709037d
Fix some compiler complaints about A_Boss5FindWaypoint
2019-05-04 20:17:00 +01:00
Monster Iestyn
b205602db6
DO NOT USE FRACUNIT AS A LAZY WAY TO DO UPPER 16 BITS FOR ACTION VARS
2019-05-04 19:43:14 +01:00
Monster Iestyn
a5331f8024
Fix A_LookForBetter to not leave a stray thinker reference lingering potentially forever, as toaster pointed out it might do.
2019-05-04 17:15:59 +01:00
Monster Iestyn
54fea4d0b9
AND I forgot these checks, confound it
2019-05-03 23:16:11 +01:00
Monster Iestyn
ee1fd72f9f
ah, forgot to do this
2019-05-03 23:12:03 +01:00
Monster Iestyn
df99e93288
Hardcoded A_Boss5FindWaypoint
...
...that took a while x_x
2019-05-03 22:58:54 +01:00
Monster Iestyn
0d7cd34882
Hardcoded A_Boss5MakeItRain
2019-05-03 20:52:56 +01:00
Monster Iestyn
b03bfbabe4
Hardcode A_DoNPCSkid
2019-05-03 20:00:31 +01:00
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