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

pull #25

Open
wants to merge 370 commits into
base: main
Choose a base branch
from
Open

pull #25

wants to merge 370 commits into from

Conversation

mc4706
Copy link

@mc4706 mc4706 commented Aug 3, 2023

No description provided.

ncerl10 and others added 30 commits August 21, 2023 15:48
@ncerl10
Merge pull request #36 from ncerl10/Data-Designer
6ab7ce1 
noah vry good
@ratSpoT
something
0c3ab8f
@ncerl10
Merge pull request #37 from ncerl10/game-programmer
eae0103 
something
@ncerl10
fix ming cong
dfbebf0
@ratSpoT
somethuing
fa41091
@mc4706
fix noah
5c12dae
@ratSpoT
somethuinig
264c829
@mc4706
i made potions
7fbcd00
@ncerl10
made the thing work
1d52c7d
@ncerl10
Merge branch 'main' into Data-Designer
017955b
@ncerl10
Merge pull request #38 from ncerl10/Data-Designer
8f44a5b 
Data designer
@ncerl10
Merge branch 'main' into game-programmer
8cb2d86
@ncerl10
Merge pull request #39 from ncerl10/game-programmer
c87417d 
Game programmer
@ncerl10
fix
65471e4
@ratSpoT
lazy
1231531
@mc4706
hi
27a1f52
@ratSpoT
Merge branch 'main' of https://github.com/ncerl10/Voldy-Mouldy
49de21a
@mc4706
Merge branch 'main' into Data-Designer
5d11feb
@mc4706
I did what lingkai asked me to do
6bc5957
@ncerl10
Merge pull request #40 from ncerl10/Data-Designer
efabb94 
Data designer
@ncerl10
Day 1
dec5d10
@ncerl10
day 2
cfa44bc
@ratSpoT
Merge branch 'main' of https://github.com/ncerl10/Voldy-Mouldy
c09eb01
@ncerl10
fixed bugs
cd15755
@ncerl10
improved formatting
512b170
@ncerl10
items
8e07322
@ncerl10
enemies can now catch you
78c0bbd
@ncerl10
balanced some stuff
d28e486
@ratSpoT
i dont rmb
9b7bc43
@ratSpoT
Merge branch 'main' of https://github.com/ncerl10/Voldy-Mouldy
59dd3e4
awpgikxdigj and others added 30 commits September 18, 2023 11:23
@awpgikxdigj
stuff
976ada2 
- removed shield method from encounter because its no longer used
- removed time library since delay is implemented with tk
- removed string library since tags don't rely on random names anymore
- added music for glados fight and aperture lap
- moved encountertest out of content
@ncerl10
change back to principals office
ee77773
@ncerl10
Merge branch 'main' into awpgikxidgj
59b60bc
@ncerl10
Merge pull request #65 from ncerl10/awpgikxidgj
f146e5f 
stuff
@awpgikxdigj
more stuff
8d57169 
added hud to encounters
@awpgikxdigj
Merge branch 'awpgikxidgj' of https://github.com/ncerl10/Realmulti in…
0519ec2 
…to awpgikxidgj
@ncerl10
hollow knight fight
9248129
@ncerl10
Merge branch 'main' of https://github.com/ncerl10/Realmulti into main
c491e86
@awpgikxdigj
gabriel
6dd35d9 
added gabriel music
@ncerl10
nil
ba6c90c
@ncerl10
Merge pull request #66 from ncerl10/awpgikxidgj
8c3f44a 
Awpgikxidgj
@awpgikxdigj
glados
792dcd4 
balance changes
@ncerl10
Merge pull request #67 from ncerl10/awpgikxidgj
a439913 
glados
@ncerl10
bug fix
f272374
@ncerl10
Merge branch 'main' of https://github.com/ncerl10/Realmulti into main
110dc2b
@ncerl10
fight text animation
48e868f
@ncerl10
get input animation
dcf3ca9
@awpgikxdigj
moved enemy status to sidebar thing
bc302a7
@ncerl10
hide hud when moving
a8ed916
@awpgikxdigj
stuff
d9cbde0 
i don't remember
@ncerl10
Merge branch 'main' into awpik
07adc44
@ncerl10
Merge pull request #68 from ncerl10/awpik
744f2f9 
Awpik
@Existance29
Merge branch 'main' into exihs
2d3e0ff
@Existance29
worked on ganondorf fight, still incomplete
aa93e10
@Existance29
removed font change
9a6b7bb
@ncerl10
Merge pull request #69 from ncerl10/exihs
5504474 
Exihs
@ncerl10
bug fixes
9c01047
@ncerl10
Merge branch 'main' of https://github.com/ncerl10/Realmulti into main
d591827
@ncerl10
ender dragon fight
a5593a8
@ncerl10
bug fix
b4818c3
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mc4706 @ncerl10 @ratSpoT @awpgikxdigj @Existance29