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 #99

Merged
merged 31 commits into from
Feb 21, 2021
Merged

Dev #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6d33b41
Base client, truck upgrade cost method, docs (#80)
Anomalous-Creator Feb 20, 2021
1d8b8ca
Fixed body object toString()
HagenSR Feb 20, 2021
e4c1214
I apologize in advance
Feb 20, 2021
1ee8da5
Merge branch 'dev' of github.com:PixPanz/byte_le_royale_2021 into dev
Feb 20, 2021
74653fd
zMerge branch 'dev' of https://github.com/PixPanz/byte_le_royale_2021…
HagenSR Feb 20, 2021
04bc5b6
fixed visualizer.exe not found
GrimQuagle Feb 20, 2021
7df4f8f
upped version
Feb 20, 2021
e49eee8
Merge branch 'dev' of github.com:PixPanz/byte_le_royale_2021 into dev
Feb 20, 2021
1c3b7ee
Region documentation
qastanley Feb 20, 2021
b36092e
Built sphinx docs locally
qastanley Feb 20, 2021
2b4488c
Added deleted files back
HagenSR Feb 20, 2021
c918a0c
added event chance equation
qastanley Feb 20, 2021
327ada1
Added space
qastanley Feb 20, 2021
511f07b
Merge pull request #84 from PixPanz/quinn-docs
GrimQuagle Feb 20, 2021
76e0e5f
Sean (#87)
HagenSR Feb 20, 2021
85944a6
Pulled dev
HagenSR Feb 20, 2021
0d78a1e
Fixed merge conflicts
HagenSR Feb 20, 2021
bf9a84b
Police and speed bug fixes (#88)
Anomalous-Creator Feb 20, 2021
817d641
scrimmage server now can run the visualizer (#90)
wylyandrews Feb 20, 2021
198bb0f
visualizer automatically stops and team name added (#89)
Sopapia Feb 20, 2021
fd8a3f7
Upped version num
HagenSR Feb 20, 2021
458dd9e
Tire doc fix
HagenSR Feb 20, 2021
83b6176
Uppded version :DDDDD
HagenSR Feb 20, 2021
903ab26
Merged master
HagenSR Feb 20, 2021
b6daaf0
Fixed issue with repairs (#94)
Sopapia Feb 21, 2021
dfaca10
Upped version number
HagenSR Feb 21, 2021
0a7829f
Merge branch 'master' into dev
HagenSR Feb 21, 2021
e8e0adf
fixedi import validation and allowed math (#96)
wylyandrews Feb 21, 2021
d233650
Wyly (#98)
wylyandrews Feb 21, 2021
e831cf7
bumped versioning
wylyandrews Feb 21, 2021
d048766
Merge branch 'master' into dev
wylyandrews Feb 21, 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
3 changes: 2 additions & 1 deletion game/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
SET_NUMBER_OF_CLIENTS_CONTINUE = 1 # required number of clients to continue running the game; should be None when MIN_CLIENTS or MAX_CLIENTS are used

ALLOWED_MODULES = ["game.client.user_client", # modules that clients are specifically allowed to access
"game.common.enums"]
"game.common.enums",
"math"]

RESULTS_FILE_NAME = "results.json" # Name and extension of results file
RESULTS_DIR = os.path.join(os.getcwd(), "logs") # Location of the results file
Expand Down
3 changes: 2 additions & 1 deletion game/utils/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ def verify_code(filename):
illegal_imports.append(module)

line.remove('from')
line.remove('import')
if 'import' in line:
line.remove('import')
elif 'import' in line:
module = line[line.index('import') + 1]
if module not in ALLOWED_MODULES:
Expand Down
3 changes: 1 addition & 2 deletions wrapper/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
v = '1.1.1'

v = '1.1.2'