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.

Sign up for GitHub

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

Jump to bottom

Dev #108

Merged
merged 112 commits into from
Aug 22, 2021
Merged

Dev #108

merged 112 commits into from
Aug 22, 2021

Conversation

HagenSR
Copy link
Owner

@HagenSR HagenSR commented Aug 22, 2021

No description provided.

amanda-f-ndsu and others added 30 commits June 13, 2021 12:00
@amanda-f-ndsu
made bullet object, updated enums, and started work on test cases
7278b42
@amanda-f-ndsu
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
987ed7a 
…into Create-Bullet-Object
@HagenSR
Created hitbox object. Working on unit testing
c7d42a4
@HagenSR
Fixed error in corner property. Added more unit tests
9409ea6
@amanda-f-ndsu
pulled in hitbox object and started work on collision algorithm
6776d12
@HagenSR
Fixed up assertRaises unit tests
cdafc39
@HagenSR
merged dev:
5f286e0
@HagenSR
Fixed issues with unit tests having old hitbox format, no object type…
fa1ce5a 
… for Upgrade
@HagenSR
Changes, pulled dev
1909e14
Initial commit, WIP, will replace
a50065f
@amanda-f-ndsu
Created test cases and continued work on collision algorithm
e6b0ce8
stashing changes
8c8e1e9
@Mitchell-Borders
working on game map generation WIP
d32d98c
@Mitchell-Borders
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
fb097a8 
…into create_game_map
@Mitchell-Borders
Merge branch 'newHitbox' of https://github.com/HagenSR/byte_le_royale…
8822a60 
…_2022 into create_game_map
@Mitchell-Borders
Started on map generation, made sure the circle closes in approriatel…
be7e38d 
…y (radius will never be negative, and zero at its smallest), and added stuff to make sure the game ran.
@HagenSR
Made some progress on game map generation
71a1020
@amanda-f-ndsu
made name changes and revised algorithm; added additional unit tests.
a71a328
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
11bc21a 
…into Ray-Collision
small fixes
46e6f23
@erickbickler
Merge branch 'dev' into Rectangle-Collision-Algorithm
2bab690
small fix
4b4aaa1
@amanda-f-ndsu
changed if statement to match changes in hitbox corners
f24b983
@amanda-f-ndsu
Merge branch 'Rectangle-Collision-Algorithm' of https://github.com/Ha…
4376595 
…genSR/byte_le_royale_2022 into Rectangle-Collision-Algorithm
@Anomalous-Creator
Merge branch 'dev' into Ray-Collision
d773dd1
missing import
f122c00
Merge branch 'Ray-Collision' of https://github.com/HagenSR/byte_le_ro…
f4813a2 
…yale_2022 into Ray-Collision
@HagenSR
Having problems, Reset
3798a1c
@HagenSR
Great progress on game map structure generation
43efce8
@HagenSR
More good progress on game map generation. Working on getting game to…
6258c50 
… run
actions-user and others added 29 commits July 24, 2021 22:59
@actions-user
Automated autopep8 fixes
2469345
@Anomalous-Creator
Implementation change
253c281
@HagenSR
Switched to tick, added clients to tojson
d0808ca
@HagenSR
Merge branch 'generate-fix' of https://github.com/HagenSR/byte_le_roy…
2436153 
…ale_2022 into generate-fix
@Mitchell-Borders
Merge branch 'dev' into create_game_structures
eddcb23
@actions-user
Automated autopep8 fixes
7fe396e
@Mitchell-Borders
Merge pull request #93 from HagenSR/create_game_structures
ac25e83 
Create_game _structures
@HagenSR
Merge pull request #98 from HagenSR/generate-fix
fe762f4 
Fixed issue with partition to/from json,
@Anomalous-Creator
Ray fixes
7189a1a
@Anomalous-Creator
Merge
7f9b1ef
@actions-user
Automated autopep8 fixes
ea8c10b
@Anomalous-Creator
fixes
9fbaa26
@Anomalous-Creator
Merge branch 'Ray-Collision' of https://github.com/HagenSR/byte_le_ro…
d188228 
…yale_2022 into Ray-Collision
@Anomalous-Creator
json changes
63bebe2
@HagenSR
Game generation should be fixed for real now (#105)
01cdaf2
@Anomalous-Creator
Endpoint fixes
d56773c
@actions-user
Automated autopep8 fixes
0f51809
@Anomalous-Creator
recreated deleted file
071369d
@actions-user
Automated autopep8 fixes
947edce
@Anomalous-Creator
moved conditionals
5986634
@Anomalous-Creator
horizontal fixes
e9bd24c
@Anomalous-Creator
Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …
ec758e7 
…into Ray-Collision
@Anomalous-Creator
initialized origin and endpoint to none
6ab9af5
@actions-user
Automated autopep8 fixes
6780375
@Anomalous-Creator
fixes
8180442
@Anomalous-Creator
Merge branch 'Ray-Collision' of https://github.com/HagenSR/byte_le_ro…
a1320a3 
…yale_2022 into Ray-Collision
@actions-user
Automated autopep8 fixes
3a10114
@erickbickler
Merge pull request #79 from HagenSR/Ray-Collision
ef0c492 
Ray collision
@HagenSR
Website (#107)
3efc892 
* Added website with correct information

* Removed food tickets

* Removed sphinx stuff from last year

* removed static folder
@HagenSR HagenSR merged commit efc03eb into master Aug 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@HagenSR @amanda-f-ndsu @Mitchell-Borders @erickbickler @Anomalous-Creator @actions-user