Master#5

Open

deepakdamera wants to merge 138 commits intodeepakdamera:masterfrom

AdamPassanisi:master

Commits on Mar 10, 2019

leaderboards and settings
AdamPassanisi
committed

Commits on Mar 18, 2019

exit game
AdamPassanisi
committed

Commits on Mar 23, 2019

Adding menus
AdamPassanisi
committed

Commits on Mar 31, 2019

test
AdamPassanisi
committed

Commits on Apr 1, 2019

Commits on Apr 24, 2019

Menu scalings
AdamPassanisi
committed

Commits on Apr 26, 2019

Commits on Apr 27, 2019

Commits on Apr 28, 2019

Merge branch 'master' into NewBranch
deepakdamera
authored
corrections after resolving conflicts..

deepakdamera
authored and
deepakdamera
committed
removed duplicates

deepakdamera
authored and
deepakdamera
committed
changes
AdamPassanisi
committed
merge
AdamPassanisi
committed
push
AdamPassanisi
committed
create
AdamPassanisi
committed
create account (no confrim yet)
AdamPassanisi
committed
some enemy, timer

deepakdamera
authored and
deepakdamera
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch

deepakdamera
authored and
deepakdamera
committed
re-fixed jump
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
working on hashing
AdamPassanisi
committed
Hashed password
AdamPassanisi
committed
change

deepakdamera
authored and
deepakdamera
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch

deepakdamera
authored and
deepakdamera
committed

Commits on Apr 29, 2019

theo+enemy attack

deepakdamera
authored and
deepakdamera
committed
Starting Leaderboard
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
Scaled jumping/framespeed -> .75f
AdamPassanisi
committed
edit

deepakdamera
authored and
deepakdamera
committed
merge 0.75f

deepakdamera
authored and
deepakdamera
committed
Leaderboards showing level 1
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
Login works with hash now
AdamPassanisi
committed
scrolling / middle pos

deepakdamera
authored and
deepakdamera
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch

deepakdamera
authored and
deepakdamera
committed
Tells user if username/password is too short
AdamPassanisi
committed
better scrolling and tile movement
AdamPassanisi
committed
Trying to add a finish line
AdamPassanisi
committed
background
AdamPassanisi
committed
Changed one of the queries and some variable names in the account
TwistedRazors
committed
Changed one of the queries and some of the variables in the account class
TwistedRazors
committed

Commits on Apr 30, 2019

enemy correction

deepakdamera
authored and
deepakdamera
committed
db & enemy updates

deepakdamera
authored and
deepakdamera
committed
adding finishline / door (L1)

deepakdamera
authored and
deepakdamera
committed
Login/Create account handles numbers
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
hasEnteredtheDoor

deepakdamera
authored and
deepakdamera
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch

deepakdamera
authored and
deepakdamera
committed
edit

deepakdamera
authored and
deepakdamera
committed
Beating level adds score to leaderbaord, fixed log in password problem
AdamPassanisi
committed
tweeked enemy hitbox, game exits if player is hit
AdamPassanisi
committed
Added a new game function to the database queries file
TwistedRazors
committed
enemy tries to run you over, pumps the brakes when you hit halfway
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
log in takes user to main menu
AdamPassanisi
committed

Commits on May 1, 2019

passwords show as astericks
AdamPassanisi
committed
lobby music / reset()

deepakdamera
authored and
deepakdamera
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch

deepakdamera
authored and
deepakdamera
committed
edit on lobby audio

deepakdamera
authored and
deepakdamera
committed
adding level 2
AdamPassanisi
committed
content merge
AdamPassanisi
committed
Added save game call when user beats the first level to update the database
TwistedRazors
committed
gameover screen
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
better gameover/ level complete
AdamPassanisi
committed
added victory and jump sounds

deepakdamera
authored and
deepakdamera
committed
check

deepakdamera
authored and
deepakdamera
committed
recheck merge.

deepakdamera
authored and
deepakdamera
committed
reseting enemy

deepakdamera
authored and
deepakdamera
committed
lvl 2
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
deathSound

deepakdamera
authored and
deepakdamera
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch

deepakdamera
authored and
deepakdamera
committed
Second enemy in lvl 1
AdamPassanisi
committed
merge
AdamPassanisi
committed
fixed sound effects for enemies
AdamPassanisi
committed
lvl 2 tiles moving
AdamPassanisi
committed
hopefully fixed scrolling/slight level 2
AdamPassanisi
committed
shows attack animation better
AdamPassanisi
committed
change in audio

deepakdamera
authored and
deepakdamera
committed
merge

deepakdamera
authored and
deepakdamera
committed
level 2
AdamPassanisi
committed
Merge branch 'NewBranch' of https://github.com/AdamPassanisi/Platformer into NewBranch
AdamPassanisi
committed
better reset on game over
AdamPassanisi
committed

Commits on May 3, 2019