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

Dev #108

Merged
merged 112 commits into from
Aug 22, 2021
Merged

Dev #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
7278b42
made bullet object, updated enums, and started work on test cases
amanda-f-ndsu Jun 13, 2021
987ed7a
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
amanda-f-ndsu Jun 13, 2021
c7d42a4
Created hitbox object. Working on unit testing
HagenSR Jun 17, 2021
9409ea6
Fixed error in corner property. Added more unit tests
HagenSR Jun 20, 2021
6776d12
pulled in hitbox object and started work on collision algorithm
amanda-f-ndsu Jun 20, 2021
cdafc39
Fixed up assertRaises unit tests
HagenSR Jun 22, 2021
5f286e0
merged dev:
HagenSR Jun 22, 2021
fa1ce5a
Fixed issues with unit tests having old hitbox format, no object type…
HagenSR Jun 22, 2021
1909e14
Changes, pulled dev
HagenSR Jun 23, 2021
a50065f
Initial commit, WIP, will replace
Jun 24, 2021
e6b0ce8
Created test cases and continued work on collision algorithm
amanda-f-ndsu Jun 25, 2021
8c8e1e9
stashing changes
Jun 25, 2021
d32d98c
working on game map generation WIP
Mitchell-Borders Jun 26, 2021
fb097a8
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
Mitchell-Borders Jun 26, 2021
8822a60
Merge branch 'newHitbox' of https://github.com/HagenSR/byte_le_royale…
Mitchell-Borders Jun 26, 2021
be7e38d
Started on map generation, made sure the circle closes in approriatel…
Mitchell-Borders Jun 29, 2021
71a1020
Made some progress on game map generation
HagenSR Jun 29, 2021
a71a328
made name changes and revised algorithm; added additional unit tests.
amanda-f-ndsu Jun 29, 2021
11bc21a
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
Jun 29, 2021
46e6f23
small fixes
Jun 29, 2021
2bab690
Merge branch 'dev' into Rectangle-Collision-Algorithm
erickbickler Jun 30, 2021
4b4aaa1
small fix
Jun 30, 2021
f24b983
changed if statement to match changes in hitbox corners
amanda-f-ndsu Jun 30, 2021
4376595
Merge branch 'Rectangle-Collision-Algorithm' of https://github.com/Ha…
amanda-f-ndsu Jun 30, 2021
d773dd1
Merge branch 'dev' into Ray-Collision
Anomalous-Creator Jun 30, 2021
f122c00
missing import
Jul 1, 2021
f4813a2
Merge branch 'Ray-Collision' of https://github.com/HagenSR/byte_le_ro…
Jul 1, 2021
3798a1c
Having problems, Reset
HagenSR Jul 2, 2021
43efce8
Great progress on game map structure generation
HagenSR Jul 3, 2021
6258c50
More good progress on game map generation. Working on getting game to…
HagenSR Jul 5, 2021
b1925fa
More changes to game map in engine. Need to figure out how that proce…
HagenSR Jul 6, 2021
af182ba
Pulled dev, formatted
HagenSR Jul 6, 2021
30b46df
Automated autopep8 fixes
actions-user Jul 6, 2021
7b47e12
fixed conflicts and fixed unit tests
amanda-f-ndsu Jul 6, 2021
0e3dc91
pulled dev again and solved more conflicts
amanda-f-ndsu Jul 6, 2021
f0f248e
Automated autopep8 fixes
actions-user Jul 6, 2021
103b72b
Commented out integration test
HagenSR Jul 6, 2021
03d3a15
Merge branch 'create_game_map' of https://github.com/HagenSR/byte_le_…
HagenSR Jul 6, 2021
26a25f1
Automated autopep8 fixes
actions-user Jul 6, 2021
6b4879f
modified enums and TestInit, turned termination from dictionary to tu…
amanda-f-ndsu Jul 6, 2021
5e78cd3
Erick fixes implemented for the most part
HagenSR Jul 6, 2021
64ed94e
Merge branch 'create_game_map' of https://github.com/HagenSR/byte_le_…
HagenSR Jul 6, 2021
237196f
Automated autopep8 fixes
actions-user Jul 6, 2021
70281c7
Made minor syntax changes
amanda-f-ndsu Jul 7, 2021
65016ba
made minor syntax changes
amanda-f-ndsu Jul 7, 2021
7b4811a
create partition grid data structure
erickbickler Jul 7, 2021
953151f
adjust obfuscate in game board
erickbickler Jul 7, 2021
ec48ce1
add to_json
erickbickler Jul 7, 2021
26610bd
Automated autopep8 fixes
actions-user Jul 7, 2021
d978252
fix linting error
erickbickler Jul 7, 2021
715e715
Merge remote-tracking branch 'origin/creater-partition-grid' into cre…
erickbickler Jul 7, 2021
b1dfb3e
fix linting error
erickbickler Jul 7, 2021
a4676a1
Automated autopep8 fixes
actions-user Jul 7, 2021
0949a91
fix unit tests
erickbickler Jul 7, 2021
48732b5
Merge remote-tracking branch 'origin/creater-partition-grid' into cre…
erickbickler Jul 7, 2021
5cc0f42
Automated autopep8 fixes
actions-user Jul 7, 2021
b2cb0b1
fixed setter method so that it is setting the tuple correctly and cha…
amanda-f-ndsu Jul 10, 2021
85a9e3a
fixed error in TestInit
amanda-f-ndsu Jul 10, 2021
11b0d32
Automated autopep8 fixes
actions-user Jul 10, 2021
488abbe
Merge pull request #87 from HagenSR/Create-Bullet-Object
amanda-f-ndsu Jul 10, 2021
9c69c6f
Reverted to isinstance type check in player inventory
HagenSR Jul 10, 2021
ca5d555
Changed where wall list is instantiated
HagenSR Jul 10, 2021
c24f432
add from json and obj list for partition
erickbickler Jul 10, 2021
0e09912
Merge remote-tracking branch 'origin/creater-partition-grid' into cre…
erickbickler Jul 10, 2021
e0c9865
Merge branch 'create_game_map' of https://github.com/HagenSR/byte_le_…
Mitchell-Borders Jul 14, 2021
726d96f
fixed spelling mistake
HagenSR Jul 15, 2021
a98fa40
Working json output
HagenSR Jul 15, 2021
ae6e6dc
minor changes. Revert so that the game map is a part of world data. R…
HagenSR Jul 17, 2021
7eff321
merge dev
HagenSR Jul 17, 2021
fd8a6dd
Automated autopep8 fixes
actions-user Jul 17, 2021
312ee2b
Merge branch 'dev' into create_game_map
HagenSR Jul 17, 2021
2c4d174
Automated autopep8 fixes
actions-user Jul 17, 2021
7569154
Merge pull request #83 from HagenSR/create_game_map
HagenSR Jul 17, 2021
13d74c1
Another dev merge
HagenSR Jul 17, 2021
dc34d43
Merge branch 'game-map/controller' of https://github.com/HagenSR/byte…
HagenSR Jul 17, 2021
258da05
Update generate_game.py
Mitchell-Borders Jul 20, 2021
5479ac8
Merge branch 'dev' into creater-partition-grid
HagenSR Jul 20, 2021
e0b1b08
Automated autopep8 fixes
actions-user Jul 20, 2021
6ab2e96
Merge pull request #84 from HagenSR/creater-partition-grid
erickbickler Jul 21, 2021
c41b31b
Structures can now automatically be created by running the create_str…
Mitchell-Borders Jul 21, 2021
1191fad
Merge pull request #91 from HagenSR/game-map/controller
HagenSR Jul 24, 2021
a32838c
Try and get .gitignore to work
Mitchell-Borders Jul 24, 2021
b8c423c
Fixed issue with partition to/from json, added logic that puts shoote…
HagenSR Jul 24, 2021
2469345
Automated autopep8 fixes
actions-user Jul 24, 2021
253c281
Implementation change
Anomalous-Creator Jul 28, 2021
d0808ca
Switched to tick, added clients to tojson
HagenSR Jul 31, 2021
2436153
Merge branch 'generate-fix' of https://github.com/HagenSR/byte_le_roy…
HagenSR Jul 31, 2021
eddcb23
Merge branch 'dev' into create_game_structures
Mitchell-Borders Jul 31, 2021
7fe396e
Automated autopep8 fixes
actions-user Jul 31, 2021
ac25e83
Merge pull request #93 from HagenSR/create_game_structures
Mitchell-Borders Jul 31, 2021
fe762f4
Merge pull request #98 from HagenSR/generate-fix
HagenSR Aug 6, 2021
7189a1a
Ray fixes
Anomalous-Creator Aug 6, 2021
7f9b1ef
Merge
Anomalous-Creator Aug 6, 2021
ea8c10b
Automated autopep8 fixes
actions-user Aug 6, 2021
9fbaa26
fixes
Anomalous-Creator Aug 6, 2021
d188228
Merge branch 'Ray-Collision' of https://github.com/HagenSR/byte_le_ro…
Anomalous-Creator Aug 6, 2021
63bebe2
json changes
Anomalous-Creator Aug 6, 2021
01cdaf2
Game generation should be fixed for real now (#105)
HagenSR Aug 7, 2021
d56773c
Endpoint fixes
Anomalous-Creator Aug 7, 2021
0f51809
Automated autopep8 fixes
actions-user Aug 7, 2021
071369d
recreated deleted file
Anomalous-Creator Aug 8, 2021
947edce
Automated autopep8 fixes
actions-user Aug 8, 2021
5986634
moved conditionals
Anomalous-Creator Aug 8, 2021
e9bd24c
horizontal fixes
Anomalous-Creator Aug 10, 2021
ec758e7
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
Anomalous-Creator Aug 10, 2021
6ab9af5
initialized origin and endpoint to none
Anomalous-Creator Aug 10, 2021
6780375
Automated autopep8 fixes
actions-user Aug 10, 2021
8180442
fixes
Anomalous-Creator Aug 10, 2021
a1320a3
Merge branch 'Ray-Collision' of https://github.com/HagenSR/byte_le_ro…
Anomalous-Creator Aug 10, 2021
3a10114
Automated autopep8 fixes
actions-user Aug 10, 2021
ef0c492
Merge pull request #79 from HagenSR/Ray-Collision
erickbickler Aug 14, 2021
3efc892
Website (#107)
HagenSR Aug 22, 2021
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
Empty file added __init__.py
Empty file.
4 changes: 4 additions & 0 deletions docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 26dd9c0651e3c983b68c592323bd944b
tags: 645f666f9bcd5a90fca523b33c5a78b7
Empty file added docs/.nojekyll
Empty file.
25 changes: 25 additions & 0 deletions docs/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Website Liscence:


The MIT License (MIT)


Copyright (c) 2013-2017 Blackrock Digital LLC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
285 changes: 285 additions & 0 deletions docs/css/freelancer.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,285 @@
/*!
* Start Bootstrap - Freelancer v4.0.0-beta.2 (https://startbootstrap.com/template-overviews/freelancer)
* Copyright 2013-2018 Start Bootstrap
* Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-freelancer/blob/master/LICENSE)
*/
body {
font-family: 'Lato'; }

h1,
h2,
h3,
h4,
h5,
h6 {
font-weight: 700;
font-family: 'Montserrat'; }

hr.star-light,
hr.star-dark {
max-width: 15rem;
padding: 0;
text-align: center;
border: none;
border-top: solid 0.25rem;
margin-top: 2.5rem;
margin-bottom: 2.5rem; }

hr.star-light:after,
hr.star-dark:after {
position: relative;
top: -.8em;
display: inline-block;
padding: 0 0.25em;
content: '\f005';
font-family: FontAwesome;
font-size: 2em; }

hr.star-light {
border-color: #fff; }

hr.star-light:after {
color: #fff;
background-color: #4D7348; }

hr.star-dark {
border-color: #454545; }

hr.star-dark:after {
color: #454545;
background-color: white; }

section {
padding: 6rem 0; }
section h2 {
font-size: 2.25rem;
line-height: 2rem; }
@media (min-width: 992px) {
section h2 {
font-size: 3rem;
line-height: 2.5rem; } }

.btn-xl {
padding: 1rem 1.75rem;
font-size: 1.25rem; }

.btn-social {
width: 3.25rem;
height: 3.25rem;
font-size: 1.25rem;
line-height: 2rem; }

.scroll-to-top {
z-index: 1042;
right: 1rem;
bottom: 1rem;
display: none; }
.scroll-to-top a {
width: 3.5rem;
height: 3.5rem;
background-color: rgba(33, 37, 41, 0.5);
line-height: 3.1rem; }

#mainNav {
padding-top: 1rem;
padding-bottom: 1rem;
font-weight: 700;
font-family: 'Montserrat'; }
#mainNav .navbar-brand {
color: #fff; }
#mainNav .navbar-nav {
margin-top: 1rem;
letter-spacing: 0.0625rem; }
#mainNav .navbar-nav li.nav-item a.nav-link {
color: #fff; }
#mainNav .navbar-nav li.nav-item a.nav-link:hover {
color: #4D7348; }
#mainNav .navbar-nav li.nav-item a.nav-link:active, #mainNav .navbar-nav li.nav-item a.nav-link:focus {
color: #fff; }
#mainNav .navbar-nav li.nav-item a.nav-link.active {
color: #4D7348; }
#mainNav .navbar-toggler {
font-size: 80%;
padding: 0.8rem; }

@media (min-width: 992px) {
#mainNav {
padding-top: 1.5rem;
padding-bottom: 1.5rem;
-webkit-transition: padding-top 0.3s, padding-bottom 0.3s;
-moz-transition: padding-top 0.3s, padding-bottom 0.3s;
transition: padding-top 0.3s, padding-bottom 0.3s; }
#mainNav .navbar-brand {
font-size: 2em;
-webkit-transition: font-size 0.3s;
-moz-transition: font-size 0.3s;
transition: font-size 0.3s; }
#mainNav .navbar-nav {
margin-top: 0; }
#mainNav .navbar-nav > li.nav-item > a.nav-link.active {
color: #fff;
background: #4D7348; }
#mainNav .navbar-nav > li.nav-item > a.nav-link.active:active, #mainNav .navbar-nav > li.nav-item > a.nav-link.active:focus, #mainNav .navbar-nav > li.nav-item > a.nav-link.active:hover {
color: #fff;
background: #4D7348; }
#mainNav.navbar-shrink {
padding-top: 0.5rem;
padding-bottom: 0.5rem; }
#mainNav.navbar-shrink .navbar-brand {
font-size: 1.5em; } }

header.masthead {
padding-top: calc(6rem + 72px);
padding-bottom: 6rem; }
header.masthead h1 {
font-size: 3rem;
line-height: 3rem; }
header.masthead h2 {
font-size: 1.3rem;
font-family: 'Lato'; }

@media (min-width: 992px) {
header.masthead {
padding-top: calc(6rem + 106px);
padding-bottom: 6rem; }
header.masthead h1 {
font-size: 4.75em;
line-height: 4rem; }
header.masthead h2 {
font-size: 1.75em; } }

.portfolio {
margin-bottom: -15px; }
.portfolio .portfolio-item {
position: relative;
display: block;
max-width: 25rem;
margin-bottom: 15px; }
.portfolio .portfolio-item .portfolio-item-caption {
-webkit-transition: all ease 0.5s;
-moz-transition: all ease 0.5s;
transition: all ease 0.5s;
opacity: 0;
background-color: rgba(77, 115, 72, 0.9); }
.portfolio .portfolio-item .portfolio-item-caption:hover {
opacity: 1; }
.portfolio .portfolio-item .portfolio-item-caption .portfolio-item-caption-content {
font-size: 1.5rem; }
@media (min-width: 576px) {
.portfolio {
margin-bottom: -30px; }
.portfolio .portfolio-item {
margin-bottom: 30px; } }

.portfolio-modal .portfolio-modal-dialog {
padding: 3rem 1rem;
min-height: calc(100vh - 2rem);
margin: 1rem calc(1rem - 8px);
position: relative;
z-index: 2;
-moz-box-shadow: 0 0 3rem 1rem rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 0 0 3rem 1rem rgba(0, 0, 0, 0.5);
box-shadow: 0 0 3rem 1rem rgba(0, 0, 0, 0.5); }
.portfolio-modal .portfolio-modal-dialog .close-button {
position: absolute;
top: 2rem;
right: 2rem; }
.portfolio-modal .portfolio-modal-dialog .close-button i {
line-height: 38px; }
.portfolio-modal .portfolio-modal-dialog h2 {
font-size: 2rem; }

@media (min-width: 768px) {
.portfolio-modal .portfolio-modal-dialog {
min-height: 100vh;
padding: 5rem;
margin: 3rem calc(3rem - 8px); }
.portfolio-modal .portfolio-modal-dialog h2 {
font-size: 3rem; } }

.floating-label-form-group {
position: relative;
border-bottom: 1px solid #e9ecef; }
.floating-label-form-group input,
.floating-label-form-group textarea {
font-size: 1.5em;
position: relative;
z-index: 1;
padding-right: 0;
padding-left: 0;
resize: none;
border: none;
border-radius: 0;
background: none;
box-shadow: none !important; }
.floating-label-form-group label {
font-size: 0.85em;
line-height: 1.764705882em;
position: relative;
z-index: 0;
top: 2em;
display: block;
margin: 0;
-webkit-transition: top 0.3s ease, opacity 0.3s ease;
-moz-transition: top 0.3s ease, opacity 0.3s ease;
-ms-transition: top 0.3s ease, opacity 0.3s ease;
transition: top 0.3s ease, opacity 0.3s ease;
vertical-align: middle;
vertical-align: baseline;
opacity: 0; }
.floating-label-form-group:not(:first-child) {
padding-left: 14px;
border-left: 1px solid #e9ecef; }

.floating-label-form-group-with-value label {
top: 0;
opacity: 1; }

.floating-label-form-group-with-focus label {
color: #4D7348; }

form .row:first-child .floating-label-form-group {
border-top: 1px solid #e9ecef; }

.footer {
padding-top: 5rem;
padding-bottom: 5rem;
background-color: #454545;
color: #fff; }

.copyright {
background-color: #2c2c2c; }

a {
color: #4D7348; }
a:focus, a:hover, a:active, a:visited {
color: #385434; }

.btn {
border-width: 2px; }

.bg-primary {
background-color: #4D7348 !important; }

.bg-secondary {
background-color: #454545 !important; }

.text-primary {
color: #4D7348 !important; }

.text-secondary {
color: #454545 !important; }

.btn-primary {
background-color: #4D7348;
border-color: #4D7348; }
.btn-primary:hover, .btn-primary:focus, .btn-primary:active {
background-color: #385434;
border-color: #385434; }

.btn-secondary {
background-color: #454545;
border-color: #454545; }
.btn-secondary:hover, .btn-secondary:focus, .btn-secondary:active {
background-color: #2c2c2c;
border-color: #2c2c2c; }
5 changes: 5 additions & 0 deletions docs/css/freelancer.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading