Skip to content

Teleport functionality #168

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

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
957fb53
Basic Refactoring of Main, Model, And Window
hotshotksw Feb 26, 2025
7072a1b
Added Block File & Restructured
hotshotksw Feb 27, 2025
b208a53
Added Player Class
hotshotksw Feb 27, 2025
c3e3b10
Refactored For Math Library & Furthered Player Class Separation From …
hotshotksw Feb 27, 2025
eebabab
Further Refactoring For Player
hotshotksw Feb 27, 2025
372f0af
Fixed Issues Regarding Player Movement and View
hotshotksw Feb 27, 2025
8037dfe
Moved All Movement Input to Player
hotshotksw Feb 28, 2025
f102beb
Fixed Player Collision
hotshotksw Mar 5, 2025
d11bdb7
Added Player Velocity Variable
hotshotksw Mar 6, 2025
1191073
start of statemachine
Elispse Mar 6, 2025
74c9cc8
Create .gitignore
Elispse Mar 7, 2025
1cacbca
added states to proper files.
Elispse Mar 7, 2025
710b836
Merge remote-tracking branch 'origin/PRO250-ThanosBaddies' into PRO25…
Elispse Mar 7, 2025
73b7dec
states setup. Can switch back and forth.
Elispse Mar 7, 2025
f9e374b
Lamp and Portal blocks added
StephenieDugan Mar 7, 2025
a506842
Merge branch 'PRO250-ThanosBaddies' into SteefBranch
StephenieDugan Mar 7, 2025
c90cce5
some minor changes
StephenieDugan Mar 7, 2025
5b8456b
Merge remote-tracking branch 'origin/PRO250-ElijahMenu' into SteefBranch
StephenieDugan Mar 7, 2025
e9d96b3
Added Running & More Flight Movement
hotshotksw Mar 7, 2025
335e8a6
Merge remote-tracking branch 'origin/SteefBranch' into kyle-branch
hotshotksw Mar 7, 2025
829a9ed
Pause menu GUI is setup, no interaction with it.
Elispse Mar 7, 2025
7e9f8a1
player interaction stops on pause
Elispse Mar 7, 2025
0871c82
Added More Blocks & Updated Terrain Generation
hotshotksw Mar 7, 2025
bf61f8f
Pause functionality works, No main menu.
Elispse Mar 7, 2025
ffc26bf
main menu is created and implemented
Elispse Mar 7, 2025
c0982ab
Merge branch 'PRO250-ThanosBaddies' into PRO250-ElijahMenu
Elispse Mar 7, 2025
23bf01a
Merge pull request #1 from Elispse/PRO250-ElijahMenu
Elispse Mar 7, 2025
34de707
added indent
Elispse Mar 7, 2025
f007d24
Updated Textures
hotshotksw Mar 8, 2025
fdb639f
Fixed blurry texture
Elispse Mar 8, 2025
e492b4d
Merge remote-tracking branch 'origin/PRO250-ThanosBaddies' into kyle-…
hotshotksw Mar 8, 2025
1a0a181
Moved Visual Functions to Window
hotshotksw Mar 8, 2025
d039f86
Added New Terrain Generation & Updated Player Interaction with Blocks
hotshotksw Mar 9, 2025
fbed6e6
Teleport blocks added and removed from list
StephenieDugan Mar 9, 2025
b5f2348
Merge branch 'PRO250-ThanosBaddies' into SteefBranch
StephenieDugan Mar 9, 2025
3b0b403
Updated New Terrain Generation & Updated Player Block Interaction
hotshotksw Mar 9, 2025
1469a83
Merge branch 'PRO250-ThanosBaddies' into SteefBranch
StephenieDugan Mar 9, 2025
dda1416
teleport blocks add/remove in list
StephenieDugan Mar 11, 2025
327df37
Updated Terrain Generation
hotshotksw Mar 11, 2025
3852da6
teleport kinda works
StephenieDugan Mar 11, 2025
e9efb00
Added More Variance to World Generation
hotshotksw Mar 11, 2025
9392924
Merge remote-tracking branch 'origin/SteefBranch' into kyle-branch
hotshotksw Mar 11, 2025
774d3ad
Command Line inputs p.1
StephenieDugan Mar 12, 2025
e269e32
Updated Terrain Generation & Improved Inventory
hotshotksw Mar 12, 2025
b93b5b5
starting the inventory bar
Elispse Mar 12, 2025
b886c99
Merge branch 'PRO250-ThanosBaddies' into ElijahInventory
Elispse Mar 12, 2025
93f6d90
Delete MainMenu.py
Elispse Mar 12, 2025
d230279
Updated Terrain Generation & Removed Non-Functional Player Spawn Code
hotshotksw Mar 12, 2025
000a7ea
hotbar there, but textures not loading.
Elispse Mar 12, 2025
8a1f0ed
inventory complete
Elispse Mar 12, 2025
b6fcfc0
Merge branch 'PRO250-ThanosBaddies' into ElijahInventory
Elispse Mar 12, 2025
8a33e27
Merge pull request #2 from Elispse/ElijahInventory
Elispse Mar 12, 2025
0b0a7c8
command prompt is done
StephenieDugan Mar 12, 2025
4501bbb
Merge remote-tracking branch 'origin/kyle-branch' into SteefBranch
StephenieDugan Mar 12, 2025
ad85081
Merge branch 'PRO250-ThanosBaddies' into SteefBranch
StephenieDugan Mar 12, 2025
afe5393
Revert "Merge branch 'PRO250-ThanosBaddies' into SteefBranch"
Elispse Mar 12, 2025
7174a87
Update main.py
Elispse Mar 12, 2025
19ff868
Command Line inputs p.1
StephenieDugan Mar 12, 2025
6b285b5
command prompt is done
StephenieDugan Mar 12, 2025
1f57870
Merge branch 'PRO250-ThanosBaddies' into SteefBranch
Elispse Mar 12, 2025
804bedd
Merge branch 'SteefBranch' of https://github.com/Elispse/Minecraft in…
Elispse Mar 12, 2025
7d2ae94
Merge branch 'SteefBranch' of https://github.com/Elispse/Minecraft in…
Elispse Mar 12, 2025
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Virtual Environment
.venv
/pycache/
*.pyc
Empty file added MainMenu.py
Empty file.
Binary file added MainMenu_background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
File renamed without changes.
Loading