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

Commits on Sep 29, 2016

  1. DOOM 3 vanilla and ROE running through run_release.bat

    Creating new branch.  Semi-figured out what variables need to be set to
    what in order to run vanilla DOOM 3 and ROE.
    nazarioes committed Sep 29, 2016
    Configuration menu
    Copy the full SHA
    5186902 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2016

  1. Configuration menu
    Copy the full SHA
    0b7b625 View commit details
    Browse the repository at this point in the history
  2. Revert "Merge remote-tracking branch 'refs/remotes/origin/buddybots_E…

    …steban' into buddybots_ctf"
    
    This reverts commit 0b7b625, reversing
    changes made to b66ac1b.
    nazarioes committed Sep 30, 2016
    Configuration menu
    Copy the full SHA
    f419d79 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0baceb2 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2016

  1. SampleBot loading

    personal changes made to bat, and changes made to the samplebot python
    script. add deltatimeMS to list of perameters in think().
    Drodarte committed Oct 5, 2016
    Configuration menu
    Copy the full SHA
    a861b26 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2016

  1. Changes to buddybot pak files are added to buddybots folder. Contents…

    … 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.
    nazarioes committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    a3053c1 View commit details
    Browse the repository at this point in the history
  2. Commiting batch files and release with debug command arguments

    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.
    nazarioes committed Oct 10, 2016
    Configuration menu
    Copy the full SHA
    24fafb7 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. Timing found

    Changed death so if not killed by player the game will not crash, and
    changed the timer so the game runs twice as fast
    Drodarte committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    1ce7936 View commit details
    Browse the repository at this point in the history
  2. Python importing corrected for statemachine in samplebot.

    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.
    nazarioes committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    33b3022 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2016

  1. Configuration menu
    Copy the full SHA
    868499b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0c6bd19 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    391aa09 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6a4b260 View commit details
    Browse the repository at this point in the history
  5. New gitignore added

    d3xp being tracked.
    nazarioes committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    87b89b2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c8f44eb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c0e967c View commit details
    Browse the repository at this point in the history
  8. Re-fixed environmental death bug (merge error?)

    cleaned up unnecessary python importing (my bad)
    nazarioes committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    7286df4 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    635d93f View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'origin/buddybots_Dylan' into buddybots_ctf

    # Conflicts:
    #	buddybots/botPaks/Sample.pk4
    #	d3xp/afiBots-AASMaps.pk4
    #	d3xp/afiBots-defpak.pk4
    #	d3xp/botPaks/Sample.pk4
    #	neo/d3xp/MultiplayerGame.cpp
    doctorjei committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    e25be38 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2016

  1. Contains a .h file that allows for tickrate increase/decrease. Also c…

    …ontains DefenderBot, Robohobo, and DummyBot. Update made to SampleBot.def to make the UI name a single string.
    Drodarte committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    84d33e2 View commit details
    Browse the repository at this point in the history
  2. Team def slightly working. Still needs work. Need to cherrypick more …

    …bots for proper testing.
    nazarioes committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    73a266e View commit details
    Browse the repository at this point in the history
  3. Changed Defenders behavior so he will pick up visible items in his sp…

    …ectrum. Updated Robohobo to AssaultBot.
    Drodarte committed Oct 21, 2016
    Configuration menu
    Copy the full SHA
    b7b8558 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2016

  1. Added variables to track scores across multiple games for both flag c…

    …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.
    Drodarte committed Oct 31, 2016
    Configuration menu
    Copy the full SHA
    46b2914 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2016

  1. Configuration menu
    Copy the full SHA
    233b6e5 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2016

  1. Added test map Luis created. Added functionality for bots to be able …

    …to run/walk in the python scripts.
    Drodarte committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    10abc47 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2016

  1. Team definitions and addTeam command argument added.

    Slight bug with armor colors not being consistent with teams. Will fix next.
    nazarioes committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    c9d5691 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ca7ff0f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    805c102 View commit details
    Browse the repository at this point in the history
  4. Bot armor matching team.

    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.
    nazarioes committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    df6c158 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2016

  1. Configuration menu
    Copy the full SHA
    86bb485 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2016

  1. edited the scores so that disconnecting resets the averages, and also…

    … a possible fix to the removebot and removeallbots
    Drodarte committed Nov 11, 2016
    Configuration menu
    Copy the full SHA
    0e9ff26 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2016

  1. Edit made to replay_count to be 10 runs. Added functionality so when …

    …replay_count is 0 it will stay on the score screen until you disconnect
    Drodarte committed Nov 29, 2016
    Configuration menu
    Copy the full SHA
    5435ff6 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2016

  1. Made a change to some math for turning speed for the bots. Made anoth…

    …er tweak to final scoring system with disconnecting from the server.
    Drodarte committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    c0e8ec1 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2016

  1. Configuration menu
    Copy the full SHA
    314ebf8 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2016

  1. Fixed problem with FindNearestItem, made it take a const char* instea…

    …d of an idString which solved the python conversion problem.
    Drodarte committed Dec 2, 2016
    Configuration menu
    Copy the full SHA
    c513a73 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2016

  1. Configuration menu
    Copy the full SHA
    fc6e49b View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. Fixed problem with the kills and flag return points. list of function…

    …s and item/weapons updated in doc.
    Drodarte committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    507d59e View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2016

  1. made a change to the scoring states so as not to effect the original …

    …doom scoring state and gui.
    Drodarte committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    4b0594c View commit details
    Browse the repository at this point in the history
  2. Removebot, Removeallbots, Removeteams, Removeallteams, RemovebotIndex…

    …, and Printallbots functionality added to the game.
    nazarioes committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    0efc3af View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2016

  1. Merge branch 'buddybots_Dylan' into buddybots_ctf

    # Conflicts:
    #	d3xp/afiBots-AASMaps.pk4
    #	d3xp/botPaks/Sample.pk4
    #	neo/d3xp/MultiplayerGame.cpp
    Drodarte committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    170353b View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'remotes/origin/buddybots_Esteban' into …

    …buddybots_ctf
    
    # Conflicts:
    #	neo/d3xp/Game_local.cpp
    #	neo/d3xp/bot/BotManager.cpp
    #	neo/d3xp/bot/BotPlayer.cpp
    #	neo/d3xp/gamesys/SysCmds.cpp
    Drodarte committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    2ff7d57 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'buddybots_Esteban' into buddybots_ctf

    # Conflicts:
    #	neo/d3xp/bot/BotManager.cpp
    #	neo/d3xp/gamesys/SysCmds.cpp
    Drodarte committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    6b16b8e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5b211f1 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'buddybots_Dylan' of https://github.com/cacticouncil/bud…

    …dybots into buddybots_Dylan
    
    # Conflicts:
    #	neo/d3xp/MultiplayerGame.cpp
    LuisNievesP committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    fbc9afb View commit details
    Browse the repository at this point in the history
  6. Merge branch 'buddybots_Dylan' into buddybots_ctf

    # Conflicts:
    #	d3xp/afiBots-AASMaps.pk4
    #	d3xp/botPaks/Sample.pk4
    #	neo/d3xp/MultiplayerGame.cpp
    Drodarte committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    7765442 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9a222c3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0f63f04 View commit details
    Browse the repository at this point in the history
  9. Merge branch 'buddybots_Esteban' into buddybots_ctf

    # 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
    Drodarte committed Dec 12, 2016
    Configuration menu
    Copy the full SHA
    bc61ff9 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2016

  1. Merge remote-tracking branch 'origin/buddybots_ctf' into buddybots_ctf

    # Conflicts:
    #	d3xp/afiBots-AASMaps.pk4
    #	neo/d3xp/MultiplayerGame.cpp
    #	neo/d3xp/bot/BotManager.cpp
    #	neo/d3xp/gamesys/SysCmds.cpp
    Drodarte committed Dec 13, 2016
    Configuration menu
    Copy the full SHA
    5da7086 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. Configuration menu
    Copy the full SHA
    589ffa7 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2016

  1. Configuration menu
    Copy the full SHA
    249f8c8 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'buddybots_ctf' of https://github.com/cacticouncil/buddy…

    …bots into buddybots_ctf
    
    # Conflicts:
    #	neo/d3xp/MultiplayerGame.cpp
    #	neo/d3xp/bot/BotManager.cpp
    Drodarte committed Dec 16, 2016
    Configuration menu
    Copy the full SHA
    f522e26 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    acc3a6b View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2017

  1. Configuration menu
    Copy the full SHA
    8c193cc View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. Configuration menu
    Copy the full SHA
    e03dcc3 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2017

  1. Configuration menu
    Copy the full SHA
    3178008 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. Added A 4v4 map made by Designer Kyle. Added code functionality for t…

    …he gui to access the loaded bot list. Tracking mainmenu gui now.
    Drodarte committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    805f262 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2017

  1. Configuration menu
    Copy the full SHA
    28b91e4 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2017

  1. Fixed an issue with the endgame state continuing to increase the last…

    … teams win count. Made an edit to the SampleBot.pk4 to have all the naming conventions the same.
    Drodarte committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    348ef80 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1682823 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Attempt to delete old Kyle maps, and inputting of kyles new and impro…

    …ved maps. Addition made to botplayer to be able to save a previous entity.
    Drodarte committed Feb 10, 2017
    Configuration menu
    Copy the full SHA
    074d579 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. Luis Nieves

    Menu With Add Bot and Add Team pop ups working but no functionality yet.
    LuisNievesP committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    7b635dc View commit details
    Browse the repository at this point in the history
  2. Functioning GUI with Add and Remove Bot

    Funtionality for adding and removing bot through gui is implemented and
    working
    LuisNievesP committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    6a6e63e View commit details
    Browse the repository at this point in the history