Commit graph

40 commits

Author SHA1 Message Date
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
8c2d889157 Make Tails' "I'll give you a hand!" bubble a hnext chain instead of a target set, which is way less likely to be clobbered in standard gameplay.
Should resolve both #440 and #458, which are two sides of the same issue - target being overwritten.
2019-12-05 09:36:58 +00:00
MascaraSnake
0031494f07 Merge branch 'tailsbotdetect' into 'master'
Attempt to detect Tailsbot and Sonic spawning on top of each other

See merge request STJr/SRB2Internal!584
2019-12-03 02:20:30 -05:00
MascaraSnake
547de4b364 Merge branch 'botregrab' into 'master'
Allow re-grabbing Tails AI mid-flight (resolves #428)

Closes #428

See merge request STJr/SRB2Internal!590
2019-12-03 02:17:37 -05:00
Alam Ed Arias
b869d29580 Fixup compiling errors 2019-12-02 12:12:26 -05:00
toaster
9861750068 Allow re-grabbing Tails AI mid-flight (resolves #428) 2019-12-01 13:31:33 +00:00
toaster
562dfb8906 Attempt to detect Tailsbot and Sonic spawning at the same coords and restrict some undesirable stuff happening, just in case we miss any situations (or for the sake of mods). 2019-11-30 16:54:51 +00:00
toaster
1223fac552 Prevent Tailsbot from considering flight when Sonic is exiting. 2019-11-26 11:53:49 +00:00
toaster
75e714956f It's not safe to store a file-scope pointer to a mobj_t* without having any mechanism to clear it between map reloadings, so move the Tailsbot "press jump now to fly!" indicator into tails->target.
Resolves #331, and likely also #330 and #309.
2019-11-23 14:43:47 +00:00
James R
387a068edf P_MobjFlip does not return boolean 2019-11-18 15:55:21 -08:00
James R
4a963d363e Mixed code... 2019-11-18 15:52:14 -08:00
toaster
ea8502050b compilation fixes (no review yet, currently just about to have dinner) 2019-11-18 19:22:51 +00:00
lachwright
11521b793d Fix controllable flight ending when player hits the ground while being carried by Tailsbot 2019-11-18 15:55:55 +08:00
lachwright
cd38e4ba1a Add flight indicator 2019-11-18 15:17:27 +08:00
lachwright
d0d723b841 Don't let the bot decide to fly if it doesn't have the ability to fly 2019-11-18 13:37:09 +08:00
lachwright
730ab79c08 Allow AI Tails to carry the player 2019-11-18 13:30:07 +08:00
lachwright
85c9b0c27f Update to latest script version 2019-11-18 11:22:27 +08:00
lachwright
c9dd2d3b93 WIP update to latest version of Lua script, halted because script inconsistencies still exist 2019-11-06 13:59:53 +08:00
lachwright
65a0db7b31 Merge branch 'master' into cobalt-ai 2019-11-06 13:41:18 +08:00
toaster
bfc5c7680f There's code in B_RespawnBot that handles gravflip, but none in B_CheckRespawn. This commit fixes that. (Only done on this branch since bots had already been touched.) 2019-10-06 15:11:00 +01:00
toaster
f0e9bdd0ec Resolve #208.
* Tailsbots can't get into Minecarts.
* Tailsbots will stop trying to move around when the player gets pw_carry, which usually means some sort of big gimmick is happening and trying to move along with it would make the tailsbot look stupid.
2019-10-06 12:13:13 +01:00
lachwright
1d74a0c29a Update to 9/25 Lua script 2019-10-05 03:02:27 +08:00
lachwright
578d7f8a79 Fix AI angling 2019-10-05 02:48:20 +08:00
lachwright
3c5f680b38 Initial commit 2019-10-03 12:49:46 +08:00
mazmazz
81352aece1 WIP 20190101 merge
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
toaster
66c8ab422b * (probably) fix crash with followmobj not being properly invalidated on mapload
* clean up P_LevelInitStuff
* [unrelated] make the bot use directionchar if you are (i only realised it wasn't as a consequence of testing this)
2018-06-09 18:06:14 +01:00
toasterbabe
f90d595332 * cv_directionchar and cv_autobrake, and their secondplayer versions (both on by default) now exist.
* cv_useranalog is now hidden from the menu.
* Directionchar now attempts to face the camera direction when you're standing still, and handles a few other states with more decorum.
* Tailsbot is now slightly more capable of keeping up with Sonic.
* pflags rearranged/adjusted, combining a few non-simulstaneous ones and turning PF_NIGHTSFALL into CR_NIGHTSFALL.
* [unrelated to branch] all ground-impact based abilities now happen more consistently with quicksand.
2017-09-16 20:25:14 +01:00
toasterbabe
7aeeb278fe Increased space in pflags (because we were getting VERY close to full capacity), which I will re-organise when this branch is closer to completion.
* PF_NIGHTSMODE is now CR_NIGHTSMODE as part of player->powers[pw_carry]. This is because it's mutually exclusive to every other "carry" type.
* PF_SUPERREADY is dead because it literally just checked for all 7 emeralds and 50 rings. That's it. You couldn't even appreciably alter its presence with Lua. That logic has been placed back in P_SuperReady.
2017-03-14 18:11:17 +00:00
toasterbabe
4a53d96099 * Fixed changing skins during differing-length sprite animations resulting in sprite errors.
* Added PF_BOUNCING to a place where it would likely be wanted.
2016-12-26 18:36:57 +00:00
toasterbabe
e16648a72b Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother.
* PF_ITEMHANG -> CR_GENERIC
* PF_CARRIED -> CR_PLAYER
* (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE
* PF_ROPEHANG -> CR_ROPEHANG
* PF_MACESPIN -> CR_MACESPIN
2016-09-23 23:48:48 +01:00
Alam Ed Arias
032313260a Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
Inuyasha
f07585191b copyright dates/statements updated and such
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Inuyasha
50d3fe15b8 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
# Conflicts:
#	src/d_main.c
#	src/doomdef.h
2016-03-31 21:17:29 -07:00
Alam Ed Arias
b169529dfd switich to do the angle math in signed, then run it thur abs() 2016-03-30 11:47:27 -04:00
Alam Ed Arias
0fe6ee5339 cleanup abs warnings 2016-03-30 00:22:12 -04:00
Alam Ed Arias
d09016c808 Merge branch 'public_next' into master 2016-02-09 14:19:50 -05:00
Alam Ed Arias
07fc74eaf5 clang: fixup a few clang warnings 2016-02-05 22:38:40 -05:00
JTE
b2681984a6 Merge branch 'player-animations'
SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible.

git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 01:59:38 -06:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00