Monster Iestyn
e06f85d847
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
a431cb9cdd
Fix some compiler complaints about A_Boss5FindWaypoint
2019-05-04 20:17:00 +01:00
Monster Iestyn
3362a0672b
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
cfa9da9b45
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
7dddfb3466
AND I forgot these checks, confound it
2019-05-03 23:16:11 +01:00
Monster Iestyn
d506c403fa
ah, forgot to do this
2019-05-03 23:12:03 +01:00
Monster Iestyn
faf353b546
Hardcoded A_Boss5FindWaypoint
...
...that took a while x_x
2019-05-03 22:58:54 +01:00
Monster Iestyn
59c345d68f
Hardcoded A_Boss5MakeItRain
2019-05-03 20:52:56 +01:00
Monster Iestyn
fd2c5a31a6
Hardcode A_DoNPCSkid
2019-05-03 20:00:31 +01:00
Monster Iestyn
1c8ec85019
Hardcoded A_Boss5PinchShot
2019-05-03 19:46:41 +01:00
Monster Iestyn
e1482e1f6b
Hardcoded A_LookForBetter
2019-05-03 19:14:17 +01:00
Monster Iestyn
2dd9c81259
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
1fb8aa1f25
fix a slipup in A_DoNPCPain I just noticed I made, whoops
2019-05-02 21:34:00 +01:00
Monster Iestyn
d10a524d9a
Hardcoded A_Boss5CheckFalling
2019-05-02 21:32:28 +01:00
Monster Iestyn
2b7614b3db
Hardcoded A_Boss5ExtraRepeat
2019-05-02 21:21:15 +01:00
Monster Iestyn
6083771dd2
Hardcoded A_Boss5CheckOnGround
2019-05-02 19:09:40 +01:00
Monster Iestyn
2feca194f7
hardcoded A_DoNPCPain
2019-05-02 18:32:43 +01:00
Monster Iestyn
5979fc8540
Hardcode Fang waypoint object type (turns out no state is needed)
2019-05-02 18:11:44 +01:00
Monster Iestyn
61693e3f2e
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
Nev3r
c0665acad3
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
ed2247c52a
Merge branch 'trans-FOF-plane-fullbright-flip' into 'master'
...
Translucent FOF plane fullbright flip
See merge request STJr/SRB2Internal!218
2019-04-18 15:16:52 -04:00
Monster Iestyn
8bf5c4ec57
Remove old code altogether at Nev3r's request
2019-04-17 16:46:32 +01:00
Monster Iestyn
f5231d614b
Undefine toaster's old define to flip full-brightness default status for planes
2019-04-17 14:51:48 +01:00
Monster Iestyn
dc39209a61
Merge branch 'opengl-new-patch-features-support' into 'master'
...
OpenGL new patch features support (part 1: flipping)
See merge request STJr/SRB2Internal!211
2019-04-11 15:32:06 -04:00
Monster Iestyn
334bec1777
Merge branch 'master' into opengl-new-patch-features-support
2019-04-11 20:09:57 +01:00
Monster Iestyn
d92b142180
Merge branch 'polyobj-netgame-crash-fix' into 'master'
...
PolyObj netgame crash fix
See merge request STJr/SRB2Internal!217
2019-04-05 07:29:47 -04:00
Monster Iestyn
ef59dba8bc
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
370e4eec6f
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
6223831db9
Merge branch 'polyrotdisplacement' into 'master'
...
Implement displacement-based polyobject rotation.
See merge request STJr/SRB2Internal!216
2019-04-05 06:30:45 -04:00
Nev3r
bb374a7b36
Implement displacement-based polyobject rotation.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 11:50:59 +02:00
Monster Iestyn
6827688575
Merge branch 'public_next'
2019-04-02 15:49:15 +01:00
Monster Iestyn
4f58d00eec
Merge branch 'master' into next
2019-04-02 15:47:07 +01:00
Nev3r
00e90db72a
Merge branch 'less-obtuse-console-fixes' into 'master'
...
Console quality of life changes
See merge request STJr/SRB2!479
2019-03-31 16:15:05 -04:00
James R
aa82d67fca
Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes
2019-03-31 12:29:55 -07:00
Nev3r
938e4477f6
Merge branch 'do-not-disturb-console' into 'master'
...
Keep console open in certain instances
See merge request STJr/SRB2!480
2019-03-31 05:54:11 -04:00
Monster Iestyn
257f31c1ba
Merge branch 'public_next'
...
# Conflicts:
# src/doomstat.h
# src/g_game.c
2019-03-28 14:19:02 +00:00
Alam Ed Arias
247c9429d2
Merge branch 'master' into next
2019-03-27 19:03:36 -04:00
Alam Ed Arias
8d51de4993
CircleCI: use libpng-dev
2019-03-27 18:51:20 -04:00
Alam Ed Arias
af1682d758
CircleCI: Debian Jessie is dead, long live Debian Stretch
2019-03-27 18:23:03 -04:00
James R
7ebf19fd00
Don't close console when starting title screen
2019-03-26 13:05:19 -07:00
James R
841daf940f
Don't close console when changing map
2019-03-26 13:04:11 -07:00
James R
d7ad7a4f40
Remove redundant CON_ClearHUD calls
2019-03-26 12:59:13 -07:00
James R
f995e8c241
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
a8aea17469
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
f6143dafb0
Scroll console immediately upon pressing PageUp
2019-03-26 12:05:23 -07:00
Monster Iestyn
7ef12f7dd7
Merge branch 'master' into next
2019-03-26 13:46:15 +00:00
Monster Iestyn
0194922509
Merge branch 'buildbot' into 'master'
...
Buildbot changes
See merge request STJr/SRB2!477
2019-03-26 09:44:56 -04:00
Monster Iestyn
a1c30e3b6a
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
8e51cad3d6
Merge branch 'mi-side-discolor-fix' into 'master'
...
MI's side discolor fix
See merge request STJr/SRB2!475
2019-03-26 09:43:20 -04:00
Monster Iestyn
e0ae13306a
Merge branch 'gametype-strings-backport' into 'next'
...
Gametype strings backport
See merge request STJr/SRB2!473
2019-03-26 09:42:52 -04:00
