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

Monthly Pull from Dev Branch - June & July 2022 #62

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open

Monthly Pull from Dev Branch - June & July 2022 #62

wants to merge 52 commits into from

Conversation

Evhann
Copy link
Collaborator

@Evhann Evhann commented May 25, 2022

No description provided.

@Evhann Evhann added Enhancement New feature or request On Hold An issue that is being held off for a while until another thing is done Tracking issue Is for tracking updates on a certain project or goal labels May 25, 2022
@davecarrijo davecarrijo marked this pull request as ready for review May 26, 2022 05:21
@C0rupted
Copy link
Owner

VERY big work in progress, don't expect many updates until mid-June

Evhann and others added 18 commits May 28, 2022 13:13
@Evhann Evhann removed the On Hold An issue that is being held off for a while until another thing is done label Jun 20, 2022
Chateauvisionn and others added 15 commits June 28, 2022 13:11
Fixed bug in server.py (can't start server)
e48b39a
changed requirements.txt to download the latest version of vitrix_engine
3d52399
changed default window size
214d90b
Fixed fullscreen
4ffe8eb
@Evhann
Added screenshot to README.md
6703033 
As suggested [here](https://www.reddit.com/r/Python/comments/u43oxi/comment/i4u3xd7/?utm_source=share&utm_medium=web2x&context=3)
@C0rupted
Remove mention of old documentation
2ed1b4f
@C0rupted
Basic inventory implemented opened with "e" and find crates for other…
70316b7 
… weapons
Fixed settings bug
b1398d3
Fixed window title bug
50b5a08
removed old ban system
89bcfa1
Added text at the start of the game
05f383d
add the ammo box and med kit texture
004a824
Removed placeholders from blacklist.json and moderators.json
f34ab43
@C0rupted
Add Vitrix website source code!
871f042
@C0rupted
Delete website code in favour of using gh-pages branch
419eeb7
@C0rupted
Copy link
Owner

Nearly done, just fixing some bugs and testing gameplay! After approved reviews, I will merge and prebuilts will come shortly after!

@github-actions
Copy link

This PR looks stale.

@Evhann
Copy link
Collaborator Author

Evhann commented Oct 7, 2023

Fixed conflict.

@Evhann Evhann removed the nstale-pr label Oct 7, 2023
davecarrijo
davecarrijo reviewed Oct 9, 2023
View reviewed changes
Copy link
Collaborator

@davecarrijo davecarrijo left a comment

Choose a reason for hiding this comment

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

looks good to me.

Evhann
Evhann commented Oct 10, 2023
View reviewed changes
Copy link
Collaborator Author

@Evhann Evhann left a comment

Choose a reason for hiding this comment

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

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davecarrijo davecarrijo davecarrijo approved these changes

Assignees

@davecarrijo davecarrijo

@C0rupted C0rupted

@Evhann Evhann

Labels
Enhancement New feature or request Tracking issue Is for tracking updates on a certain project or goal
Projects
Vitrix - Major Additions
Status: In Progress
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Evhann @C0rupted @davecarrijo