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

Development #110

Merged
merged 277 commits into from
Mar 19, 2024
Merged

Development #110

merged 277 commits into from
Mar 19, 2024

Conversation

HilkopterBob
Copy link
Owner

bunp

HilkopterBob and others added 30 commits May 16, 2023 18:29
@HilkopterBob
del trailing whitespace
3e0717e
@Kartoffel096
Merge branch 'Inputparser' into development
efec5dc
@Kartoffel096
Merge pull request #45 from HilkopterBob/development
443a242 
Fixed Pr to Inputparser
@Kartoffel096
Integrated Inputparser
f7ae7c6
@Kartoffel096
Integrated Inputparser again...
4a5d901
@HilkopterBob
clearified inp doc string
463f02c
@Kartoffel096
Fixed Linting in DEV Branch and missspelled Functionname
1813e29
@Kartoffel096
Merge branch 'development' into Inputparser
ece99f1
@Kartoffel096
Removed Inputparser File for Linting
25af836 
Inputparser File is implemented in inp.py
@Kartoffel096
Fixed Linting for Merge
8bc88a9 
Fixed Linting for Merge to DEV
@Kartoffel096
Fixed Linting again
9d70dbb 
Line too Long again
@Kartoffel096
Merged Inputparser into DEV
0a5029b 
Merged tested Inputparser into DEV Branch
@Kartoffel096
Created Gamestates Branch
c2d6780
@HilkopterBob
linting
0f276f0
@Kartoffel096
Gamestates implemented
3f07c5e 
Guide: Frag Max
@HilkopterBob
Merge pull request #48 from HilkopterBob/Gamestates
d191902 
Gamestates implemented
@Tim16-sys
Moved each Level into own json
c50a054 
deleted old levels.json
@Kartoffel096
Fixed wrong JSON Schema Part
b15e804
@Kartoffel096
Changed Colors of Debug Prints
f66d779
@Kartoffel096
Merge pull request #49 from HilkopterBob/Level_Assets
b7a645d 
Levels converted to Assets
@HilkopterBob
save
beea301
@Kartoffel096
Merge Conflicts resolved
e574dbd
@HilkopterBob
save
e2c79ae
@Kartoffel096
TacticalSave
9f4bafa
@HilkopterBob
m
cf79157
@HilkopterBob
Merge pull request #53 from HilkopterBob/development
519ac3e 
Development
@HilkopterBob
linting
36623b9
@HilkopterBob
Merge branch 'Inputparser' of https://github.com/HilkopterBob/TA into…
89b384d 
… Inputparser
@HilkopterBob
Merge pull request #54 from HilkopterBob/Inputparser
10b699a 
Inputparser
@HilkopterBob
comment
13c2557
@HilkopterBob HilkopterBob added the Critical Critical Part label Mar 19, 2024
@HilkopterBob HilkopterBob added this to the Alpha V1.0 milestone Mar 19, 2024
@HilkopterBob HilkopterBob self-assigned this Mar 19, 2024
Kartoffel096
Kartoffel096 approved these changes Mar 19, 2024
View reviewed changes
Copy link
Collaborator

@Kartoffel096 Kartoffel096 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check Requirements.txt if really all requirements are present.

Merge Approved

@HilkopterBob HilkopterBob merged commit efddd21 into main Mar 19, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kartoffel096 Kartoffel096 Kartoffel096 approved these changes

Assignees

@HilkopterBob HilkopterBob

Labels
Critical Critical Part
Projects
None yet
Milestone
Alpha V1.0
Development

Successfully merging this pull request may close these issues.
3 participants
@HilkopterBob @Kartoffel096 @Tim16-sys