Dev oran bullet collision - #4

Open

wisehackermonkey wants to merge 24 commits into

dev-oran-bullet-collision

Commits on Sep 23, 2018

Fixed the script tag for the gun.js file
chasem74
committed
3fd8b83
Base of the tower class
chasem74
committed
a2f9bd3
Merge remote-tracking branch 'origin/dev-chase' into dev-chase
wisehackermonkey
committed
9ad8142
Merge branch 'oran-bullets' into dev
wisehackermonkey
committed
85cee20
working multiple bullets
wisehackermonkey
committed
4078165
changed gun.js's fire() parapmaters
wisehackermonkey
committed
2eacfcf
cleaned up script.js
wisehackermonkey
committed
b4cb652
Merge remote-tracking branch 'origin/oran-bullet-multiple' into oran-bullet-multiple
wisehackermonkey
committed
ca02519
Base of the tower class

chasem74
authored and
wisehackermonkey
committed
f2b0ec6
changed gun.js's fire() parapmaters
wisehackermonkey
committed
38d2860
working multiple bullets
wisehackermonkey
committed
eafaf73
cleaned up script.js
wisehackermonkey
committed
367a00b
removed reduntand 'tower"
wisehackermonkey
committed
5b6523a
Merge remote-tracking branch 'origin/oran-bullet-multiple' into oran-bullet-multiple
wisehackermonkey
committed
5628185
refactored gun.js to not include Game(), added tileset files
wisehackermonkey
committed
47e7fb9
added background, and player sprite
wisehackermonkey
committed
84a50e1
refactored background
AudioByAri
committed
a61cc89
working death screen on mouse pressed
AudioByAri
committed
0b274c3
Fixed player movement
AudioByAri
committed
2d67a7e
Fixed player collision with tower
AudioByAri
committed
6aefa4c
Fixed shooting
AudioByAri
committed
bea64a7
Tower shooting in random directions
chasem74
committed
9512a60
Merge branch 'Ari-Collision' of https://github.com/SRJC-Computer-Science-Club/farmwars into dev-chase
chasem74
committed
d8ed787

Commits on Sep 24, 2018

Auto stash before merge of "dev-oran-bullet-collision" and "dev-chase"
wisehackermonkey
committed
b034506