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

Config margins #47

Merged
merged 5 commits into from
Jun 3, 2023
Merged

Config margins #47

merged 5 commits into from
Jun 3, 2023

Conversation

JuliaCaesar
Copy link
Collaborator

No description provided.

Copy link
Owner

@JeanAEckelberg JeanAEckelberg left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Owner

@JeanAEckelberg JeanAEckelberg left a comment

Choose a reason for hiding this comment

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

Wrong Config

@JeanAEckelberg JeanAEckelberg self-requested a review June 3, 2023 03:46
Copy link
Owner

@JeanAEckelberg JeanAEckelberg left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Collaborator

@MoodyMan04 MoodyMan04 left a comment

Choose a reason for hiding this comment

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

😐 👍

@JuliaCaesar JuliaCaesar merged commit 024db90 into Visualizer Jun 3, 2023
@JuliaCaesar JuliaCaesar deleted the config_margins branch June 3, 2023 04:09
JeanAEckelberg added a commit that referenced this pull request Sep 2, 2023
* Added base visualizer

* Initial Commit

* Update main.py (#35)

* Update main.py

* Update main.py

* added background color (#34)

* added background color

* Update config.py

* added comments to config

* Update main.py

* Update main.py

* Update main.py

* Update main.py

* Update python-app.yml

* Let me merge (#39)

* Turn_Log list populated

* Added TODOs

* Added more framework code

* Add event method to adapter (#44)

* added events in main and methods for them in adapter

* Config margins (#47)

* Fix merge (#46)

* Fix Merge

* Update config.py

* added margins

* Update config.py

---------

Co-authored-by: Jean A. Eckelberg <[email protected]>

* Implemented spritesheets on bytesprite (#48)

* First changes

Committing first changes for the sprite and bytesheet files

* Spritesheets implemented

Implemented spritesheets into Bytesprite.

* Fixed PR requests

Fixed wanted changes.

* Implement text class visualizer (#45)

* text class created

created class for making text in rect
Default Font: Bauhaus93
Default Color: #daa520
Default Position: Vector(0, 0)

* added getter and setter methods

added getter and setter methods to protect values of text

* added comments

* Update text.py

- fixed constructor
- fixed type hinting
-  added reevaluating to created text when changing values in setters
- allow full support of possible Color parameters

* Update text.py

- fixed some formatting
- fixed wrong check: str -> int

* font_size type hint

* Readme documentation (#51)

* Started documentation updates for README.md.

* Finished

Added documentation for all the files that were changes in revamp's lifespan.

* Development Notes

Added development notes to the README.

* Edits

Made requested changes.

* Plz approve (#57)

* Fix merge (#46)

* Fix Merge

* wip

* needs review

* Fixed it all... hopefully

---------

Co-authored-by: MyFridgeIsFinePleaseStopAsking <[email protected]>

* 58 create 3d list to store bytesprites (#60)

* Added functions to calculate logic and a data structure to store it all

* 59 create an example bytesprite (#65)

* Created example bytesprites, moved files around for a temporary fix, Will need to find a more permanent fix. Investigate a visualizer option when running built launcher?

* Added visualizer to build run with the v subcommand

* Create sidebars (#72)

* Fix merge (#46)

* Fix Merge

* created sidebars

* type safe

* fixed

* Update adapter.py

---------

Co-authored-by: Jean A. Eckelberg <[email protected]>

* Implement button visualizer (#71)

* Fix merge (#46)

* Fix Merge

* Fixed README (#68)

Added more info for the avatar class in the README.

* basic button implementation

- still needs work
- includes some testing in adapter class

* fixes and changes

added:
- better documentation
- background button to text
- padding parameter
- border_radius parameter (to round corners of button
- color parameters for bg button
- changed collision logic to work with bg rect, not text rect

* code clean up + timer

cleaned up code and added timer in button class to help display clicked colors better

* fixed documentation + timer

- relocated documentation to proper location
- fixed button timer to be adjustable and consistent with frame rate

* more timer changes

- reverted back to milliseconds, which do not need to be multiplied by the frame rate
- used math.floor when needed
- changed click_duration to int

---------

Co-authored-by: Jean A. Eckelberg <[email protected]>
Co-authored-by: Ian <[email protected]>

* Start screen (#76)

* Made Start Screen

Made progress on the start screen.

* Made writing logs async.
Allowed position to be set through text and button rect
Changed default background color for button
Renamed start_menu_templates.py to menu_templates.py
Refreshed sidebars in prerender
Added second avatar to generate_game.py
Added End screen to template

* Added interact controller back to master_controller.py

* cleaned up some duplicate code and resized the sidebars

* removed print statement

* Started documentation updates

---------

Co-authored-by: JeanAEckelberg <[email protected]>

* Sphinx documentation (#78)

* Fix merge (#46)

* Fix Merge

* Updated requirements.txt

Updated the requirements for the project.

* Fixed README (#68)

Added more info for the avatar class in the README.

* Starting to document

Starting to add sphinx documentation.

* Created rst files

Created the rst and html files for every file.

* Testing

Testing different things to make the formatting make sense.

* Fixing mistake

Fixed a mistake from a merge conflict.

* Item Docs

Finished the item docs for sphinx.

* Map Directory

Fixed documentation in Map directory. Will need to find solution for visuals.

* Added Stations

Added station docs. May need to expand on their explanations.

* Fixed Formatting

Fixed the formatting for GameBoard docs and README. Thanks Jean.

* Reformatting

Reformatted and made small changes to some files

* Game Package Classes

Fixed docs for Game package classes like enums and avatar

* Test File Docs

Formatted the Test File docs. Will eventually add proper docstrings to the individual files themselves.

* Formatting

This should be the final formats for the rst files.

* Controller Docs

Made changes for the Controller documents

* Test Docs

Made documentation for the tests.

* Test Docs 2

Last bits of the documentation for the test suit files.

* Utils Docs

Started documentation for the Utils files and the last few that are missing

* Changes

Changes for some files and an update to requirements.txt.

* Extra docs

Should be done adding documentation for everything.

* Fixes

Fixing warnings

* Removal

Removed unnecessary files

* Finalized

Should be done with documentation for main engine.

---------

Co-authored-by: Jean A. Eckelberg <[email protected]>

* Playback template (#77)

* Playback Buttons Template Basics

added:
- opencv added to requirements
- playback template for watching visualizer

modified:
- adapter to contain PlaybackButtons
- config file variables
- main to control the results of PlaybackButtons
- type hinting to menu_templates
- button to check if button can be clicked again during click_duration

* Switched to Flags instead of structs

* fixed multi-click bug

* main changes

- more type hinting
- optimized video recording to one frame per turn using bicubic as default setting
- organized methods in main

* Fixed button order

---------

Co-authored-by: Jean Eckelberg <[email protected]>

---------

Co-authored-by: JuliaCaesar <[email protected]>
Co-authored-by: Ian <[email protected]>
Co-authored-by: Gunnar Moody <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants