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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
5186902
DOOM 3 vanilla and ROE running through run_release.bat
nazarioes Sep 29, 2016
0b7b625
Merge remote-tracking branch 'refs/remotes/origin/buddybots_Esteban' …
nazarioes Sep 30, 2016
f419d79
Revert "Merge remote-tracking branch 'refs/remotes/origin/buddybots_E…
nazarioes Sep 30, 2016
0baceb2
Merge branch 'buddybots_ctf' of https://github.com/cacticouncil/buddy…
nazarioes Sep 30, 2016
a861b26
SampleBot loading
Drodarte Oct 5, 2016
a3053c1
Changes to buddybot pak files are added to buddybots folder. Contents…
nazarioes Oct 10, 2016
24fafb7
Commiting batch files and release with debug command arguments
nazarioes Oct 10, 2016
1ce7936
Timing found
Drodarte Oct 13, 2016
33b3022
Python importing corrected for statemachine in samplebot.
nazarioes Oct 13, 2016
868499b
Fixed ignore for d3xp folder
doctorjei Oct 14, 2016
0c6bd19
Adding previously unrevisioned files
doctorjei Oct 14, 2016
391aa09
Merge remote-tracking branch 'origin/buddybots_Esteban' into buddybot…
doctorjei Oct 14, 2016
6a4b260
Reversed changes that should remain unmerged
doctorjei Oct 14, 2016
87b89b2
New gitignore added
nazarioes Oct 14, 2016
c8f44eb
added in new bots and included some new functions that they use.
Drodarte Oct 14, 2016
c0e967c
updated git ignore, bots now finally in repo
Drodarte Oct 14, 2016
7286df4
Re-fixed environmental death bug (merge error?)
nazarioes Oct 14, 2016
635d93f
Merge branch 'buddybots_Esteban' into buddybots_ctf
doctorjei Oct 14, 2016
e25be38
Merge remote-tracking branch 'origin/buddybots_Dylan' into buddybots_ctf
doctorjei Oct 14, 2016
84d33e2
Contains a .h file that allows for tickrate increase/decrease. Also c…
Drodarte Oct 21, 2016
73a266e
Team def slightly working. Still needs work. Need to cherrypick more …
nazarioes Oct 21, 2016
b7b8558
Changed Defenders behavior so he will pick up visible items in his sp…
Drodarte Oct 21, 2016
46b2914
Added variables to track scores across multiple games for both flag c…
Drodarte Oct 31, 2016
233b6e5
Edited the turning speed for the bots so they dont take forever to lo…
Drodarte Nov 2, 2016
10abc47
Added test map Luis created. Added functionality for bots to be able …
Drodarte Nov 3, 2016
c9d5691
Team definitions and addTeam command argument added.
nazarioes Nov 4, 2016
ca7ff0f
added new map cycle script for grading, not fully done yet.
Drodarte Nov 4, 2016
805c102
Added functions for getting total wins, flag captures, and frag points.
Drodarte Nov 4, 2016
df6c158
Bot armor matching team.
nazarioes Nov 4, 2016
86bb485
Some warnings/error checking added to addTeam.
nazarioes Nov 7, 2016
0e9ff26
edited the scores so that disconnecting resets the averages, and also…
Drodarte Nov 11, 2016
5435ff6
Edit made to replay_count to be 10 runs. Added functionality so when …
Drodarte Nov 29, 2016
c0e8ec1
Made a change to some math for turning speed for the bots. Made anoth…
Drodarte Nov 30, 2016
314ebf8
Added scoring for flag returns add kills for teams over total runs.
Drodarte Dec 1, 2016
c513a73
Fixed problem with FindNearestItem, made it take a const char* instea…
Drodarte Dec 2, 2016
fc6e49b
allowed the ability to check if an item is in view in python
Drodarte Dec 6, 2016
507d59e
Fixed problem with the kills and flag return points. list of function…
Drodarte Dec 8, 2016
4b0594c
made a change to the scoring states so as not to effect the original …
Drodarte Dec 9, 2016
0efc3af
Removebot, Removeallbots, Removeteams, Removeallteams, RemovebotIndex…
nazarioes Dec 9, 2016
170353b
Merge branch 'buddybots_Dylan' into buddybots_ctf
Drodarte Dec 12, 2016
2ff7d57
Merge remote-tracking branch 'remotes/origin/buddybots_Esteban' into …
Drodarte Dec 12, 2016
6b16b8e
Merge branch 'buddybots_Esteban' into buddybots_ctf
Drodarte Dec 12, 2016
5b211f1
Luis Pak File Folder, CTF Scoreboard Update
LuisNievesP Dec 12, 2016
fbc9afb
Merge branch 'buddybots_Dylan' of https://github.com/cacticouncil/bud…
LuisNievesP Dec 12, 2016
7765442
Merge branch 'buddybots_Dylan' into buddybots_ctf
Drodarte Dec 12, 2016
9a222c3
Merge branch 'buddybots_Dylan' into buddybots_ctf
Drodarte Dec 12, 2016
0f63f04
Update before merge with Estebans branch. Added Kyles maps and Luis' GUI
Drodarte Dec 12, 2016
bc61ff9
Merge branch 'buddybots_Esteban' into buddybots_ctf
Drodarte Dec 12, 2016
5da7086
Merge remote-tracking branch 'origin/buddybots_ctf' into buddybots_ctf
Drodarte Dec 13, 2016
589ffa7
Fixed the problem with the linker error in the merged build
Drodarte Dec 14, 2016
249f8c8
Fixed the issue with the scores not being linked to the gui and not d…
Drodarte Dec 16, 2016
f522e26
Merge branch 'buddybots_ctf' of https://github.com/cacticouncil/buddy…
Drodarte Dec 16, 2016
acc3a6b
Updated DeathRowBot so that the basic teams won't end in a stalemate.
Drodarte Dec 16, 2016
8c193cc
Edited the AAS for map changing so it doesn't break the game.
Drodarte Jan 17, 2017
e03dcc3
Fixed issue with the team swapping bug and created a new bot.
Drodarte Jan 19, 2017
3178008
fixed some code formatting and added a new folder for base game aas f…
Drodarte Jan 20, 2017
805f262
Added A 4v4 map made by Designer Kyle. Added code functionality for t…
Drodarte Jan 30, 2017
28b91e4
added functionality for the gui to have access to the bots available …
Drodarte Feb 6, 2017
348ef80
Fixed an issue with the endgame state continuing to increase the last…
Drodarte Feb 9, 2017
1682823
Fixed bug with scoring occurring during warmup period
Drodarte Feb 9, 2017
074d579
Attempt to delete old Kyle maps, and inputting of kyles new and impro…
Drodarte Feb 10, 2017
7b635dc
Luis Nieves
LuisNievesP Feb 9, 2017
6a6e63e
Functioning GUI with Add and Remove Bot
LuisNievesP Feb 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
.project
.settings/
.vs/
d3xp/
base/DoomConfig.cfg
base/config.spec
base/*.pk4
Expand Down Expand Up @@ -39,3 +38,11 @@ version.inf
base/STEAM_xpkey
base/doomkey
base/xpkey
d3xp/D3ROE.ico
d3xp/DoomConfig.cfg
d3xp/game*.pk4
d3xp/pak000.pk4
d3xp/pak*.pk4
d3xp/config.spec
d3xp/description.txt
d3xp/install.log
Binary file modified buddybots/afiBots-AASMaps.pk4
Binary file not shown.
Binary file modified buddybots/afiBots-defpak.pk4
Binary file not shown.
Binary file modified buddybots/botPaks/Sample.pk4
Binary file not shown.
Binary file added buddybots/bots_def.pk4
Binary file not shown.
Binary file added d3xp/afiBot-x86.pk4
Binary file not shown.
Binary file added d3xp/afiBots-AASMaps.pk4
Binary file not shown.
Binary file added d3xp/afiBots-defpak.pk4
Binary file not shown.
1 change: 1 addition & 0 deletions d3xp/binary.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0
Binary file added d3xp/botPaks/AssaultBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/DeathRowBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/DefenderBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/DumbBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/DummyBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/SampleBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/TargetBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/WhereBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/WhyBot.pk4
Binary file not shown.
Binary file added d3xp/botPaks/WolverineBot.pk4
Binary file not shown.
Binary file added d3xp/bot_defs.pk4
Binary file not shown.
295 changes: 295 additions & 0 deletions d3xp/pakTrack/Guis/BBScoreboard.gui
Original file line number Diff line number Diff line change
@@ -0,0 +1,295 @@
windowDef Desktop
{
rect 0,0,640,480
windowDef BlueTeam
{
rect 10,60,290,255
visible 1
backcolor 0,0,1,0.49803925
bordersize 1
bordercolor 0,0,0,1
noevents 1
}
windowDef RedTeam
{
rect 340,60,290,255
visible 1
backcolor 1,0,0,0.51372552
bordersize 1
bordercolor 0,0,0,1
}
windowDef BlueTeamBanner
{
rect 10,60,290,40
visible 1
forecolor 1,1,1,1
text "Blue Team Scores"
textscale 0.60000002
textalignx 5
}
windowDef RedTeamBanner
{
rect 340,60,290,40
visible 1
forecolor 1,1,1,1
text "Red Team Score"
textscale 0.60000002
textalignx 15
}
windowDef VS
{
rect 298,162,40,40
visible 1
forecolor 1,1,1,1
text "VS"
textscale 0.60000002
}
windowDef BlueFlagCapBanner
{
rect 20,170,132,34
visible 1
forecolor 1,1,1,1
text "Flag Caps"
textscale 0.5
}
windowDef BlueFlagCaps
{
rect 25,200,91,30
visible 1
forecolor 1,1,1,1
text "gui::blue_team_total_capture_score"
textscale 0.5
textalignx 15
}
windowDef BlueWinsBanner
{
rect 10,100,132,34
visible 1
forecolor 1,1,1,1
text "Wins"
textscale 0.5
textalignx 25
}
windowDef BlueWins
{
rect 25,131,91,30
visible 1
forecolor 1,1,1,1
text "gui::blue_team_total_wins"
textscale 0.5
textalignx 15
}
windowDef BlueTotalFragScoreBanner
{
rect 10,230,290,40
visible 1
forecolor 1,1,1,1
text "Total Team Score"
textscale 0.60000002
}
windowDef BlueTotalFragScore
{
rect 50,270,210,35
visible 1
forecolor 1,1,1,1
text "gui::blue_team_total_frag_score"
textscale 0.60000002
textalignx 60
}
windowDef RedWinsBanner
{
rect 340,100,132,34
visible 1
forecolor 1,1,1,1
text "Wins"
textscale 0.5
textalignx 25
}
windowDef RedWins
{
rect 360,130,91,30
visible 1
forecolor 1,1,1,1
text "gui::red_team_total_wins"
textscale 0.5
textalignx 15
}
windowDef RedFlagCapBanner
{
rect 350,170,132,34
visible 1
forecolor 1,1,1,1
text "Flag Caps"
textscale 0.5
}
windowDef RedFlagCaps
{
rect 360,200,91,30
visible 1
forecolor 1,1,1,1
text "gui::red_team_total_capture_score"
textscale 0.5
textalignx 20
}
windowDef RedTotalFragScoreBanner
{
rect 345,230,290,40
visible 1
forecolor 1,1,1,1
text "Total Team Score"
textscale 0.60000002
}
windowDef RedTotalFragScore
{
rect 380,270,210,35
visible 1
forecolor 1,1,1,1
text "gui::red_team_total_frag_score"
textscale 0.69999999
textalignx 60
}
windowDef DisconnectButton
{
rect 6,425,230,50
visible 0
backcolor 0.25098041,0.50196081,0.50196081,1
bordersize 1
bordercolor 0,0,0,1
forecolor 1,1,1,1
text "Disconnect"
textscale 0.80000001

onMouseEnter {
transition "matcolor" "1 1 1 0.1" "1 1 1 0.3" "200" ;
}

onMouseExit {
transition "matcolor" "1 1 1 0.3" "1 1 1 0.1" "200" ;
}

onAction {
"cmd" "disconnect"
}

}
windowDef ReplayButton
{
rect 405,425,230,50
visible 0
backcolor 0.25098041,0.50196081,0.50196081,1
bordersize 1
bordercolor 0,0,0,1
forecolor 1,1,1,1
text "Run Again"
textscale 0.80000001
textalignx 10
menugui 1
}
windowDef BuddyBotsBanner
{
rect 168,0,298,56
visible 1
forecolor 1,1,1,1
text "Buddy Bots"
textscale 1
}
windowDef BlueReturnsBanner
{
rect 170,170,132,34
visible 1
forecolor 1,1,1,1
text "Returns"
textscale 0.5
}
windowDef BlueKillBanner
{
rect 160,100,132,34
visible 1
forecolor 1,1,1,1
text "Kills"
textscale 0.5
textalignx 25
}
windowDef BlueReturns
{
rect 180,200,91,30
visible 1
forecolor 1,1,1,1
text "gui::blue_team_total_flag_returns"
textscale 0.5
textalignx 15
}
windowDef BlueKills
{
rect 177,131,91,30
visible 1
forecolor 1,1,1,1
text "gui::blue_team_total_kills"
textscale 0.5
textalignx 15
}
windowDef RedReturns
{
rect 510,200,91,30
visible 1
forecolor 1,1,1,1
text "gui::red_team_total_flag_returns"
textscale 0.5
textalignx 15
}
windowDef RedReturnsBanner
{
rect 500,170,132,34
visible 1
forecolor 1,1,1,1
text "Returns"
textscale 0.5
}
windowDef RedKills
{
rect 510,130,91,30
visible 1
forecolor 1,1,1,1
text "gui::red_team_total_kills"
textscale 0.5
textalignx 15
}
windowDef RedKillBanner
{
rect 490,100,132,34
visible 1
forecolor 1,1,1,1
text "Kills"
textscale 0.5
textalignx 25
}
windowDef WinnBanner
{
rect 103,320,430,96
visible 1
backcolor 0,0,0,0.69411767
bordersize 1
bordercolor 0,0,0,1
forecolor 1,1,1,1
text ""
textscale 1
textalignx 15
textaligny 15

onTime 0 {
if("gui:red_team_total_frag_score" > "gui:blue_team_total_frag_score")
{
set "WinnBanner::text" "Red Team Wins!";
set "WinnBanner::backcolor" "1,0,0,1"
}
if("gui:red_team_total_frag_score" < "gui:blue_team_total_frag_score")
{
set "WinnBanner::text" "Blue Team Wins!";
set "WinnBanner::backcolor" "0,0,1,1"
}


}

}
}
Loading