Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Buddybots ctf #3

Open
wants to merge 63 commits into
base: buddybots_Luis
Choose a base branch
from
Open

Buddybots ctf #3

wants to merge 63 commits into from

Conversation

LuisNievesP
Copy link
Collaborator

No description provided.

nazarioes and others added 30 commits September 29, 2016 09:08
Creating new branch.  Semi-figured out what variables need to be set to
what in order to run vanilla DOOM 3 and ROE.
…steban' into buddybots_ctf"

This reverts commit 0b7b625, reversing
changes made to b66ac1b.
personal changes made to bat, and changes made to the samplebot python
script. add deltatimeMS to list of perameters in think().
… of buddybots must be pasted into d3xp in order to work properly.

d3xp folder is not being tracked and/or actively ignored with git, so these steps are necessary.
As stated in previous commit. The contents of buddybots folder must be
pasted into d3xp in order to spawn bots , as d3xp is not being tracked
and this is the easiest workaround.
Changed death so if not killed by player the game will not crash, and
changed the timer so the game runs twice as fast
Bots load into all DeathMatch maps. (They do not do anything but stand there, as their behavior as of now was created for Capture The Flag)

Fixed bug associated with environmental deaths.
d3xp being tracked.
cleaned up unnecessary python importing (my bad)
# Conflicts:
#	buddybots/botPaks/Sample.pk4
#	d3xp/afiBots-AASMaps.pk4
#	d3xp/afiBots-defpak.pk4
#	d3xp/botPaks/Sample.pk4
#	neo/d3xp/MultiplayerGame.cpp
…ontains DefenderBot, Robohobo, and DummyBot. Update made to SampleBot.def to make the UI name a single string.
…aptures and frag points. A win counter has also been placed in. Fixed a problem where the speed of bots stayed at 160 instead of being set down to 127.
Slight bug with armor colors not being consistent with teams. Will fix next.
Teams loading with correct colors and stay on teams throughout map cycles.

Disconnection creates issue with wrong teams during warm-up. Low priority issue for later, as we are already getting rid of warm-up.
Drodarte and others added 30 commits December 1, 2016 16:05
…d of an idString which solved the python conversion problem.
…, and Printallbots functionality added to the game.
# Conflicts:
#	d3xp/afiBots-AASMaps.pk4
#	d3xp/botPaks/Sample.pk4
#	neo/d3xp/MultiplayerGame.cpp
…buddybots_ctf

# Conflicts:
#	neo/d3xp/Game_local.cpp
#	neo/d3xp/bot/BotManager.cpp
#	neo/d3xp/bot/BotPlayer.cpp
#	neo/d3xp/gamesys/SysCmds.cpp
# Conflicts:
#	neo/d3xp/bot/BotManager.cpp
#	neo/d3xp/gamesys/SysCmds.cpp
…dybots into buddybots_Dylan

# Conflicts:
#	neo/d3xp/MultiplayerGame.cpp
# Conflicts:
#	d3xp/afiBots-AASMaps.pk4
#	d3xp/botPaks/Sample.pk4
#	neo/d3xp/MultiplayerGame.cpp
# Conflicts:
#	d3xp/botPaks/Sample.pk4
#	neo/d3xp/Game_local.cpp
#	neo/d3xp/bot/BotManager.cpp
#	neo/d3xp/bot/BotPlayer.cpp
#	neo/d3xp/gamesys/SysCmds.cpp
# Conflicts:
#	d3xp/afiBots-AASMaps.pk4
#	neo/d3xp/MultiplayerGame.cpp
#	neo/d3xp/bot/BotManager.cpp
#	neo/d3xp/gamesys/SysCmds.cpp
…bots into buddybots_ctf

# Conflicts:
#	neo/d3xp/MultiplayerGame.cpp
#	neo/d3xp/bot/BotManager.cpp
…he gui to access the loaded bot list. Tracking mainmenu gui now.
… teams win count. Made an edit to the SampleBot.pk4 to have all the naming conventions the same.
…ved maps. Addition made to botplayer to be able to save a previous entity.
Menu With Add Bot and Add Team pop ups working but no functionality yet.
Funtionality for adding and removing bot through gui is implemented and
working
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants