37 Commits

Author SHA1 Message Date
f68b9d1ae3 fixed minor things
Signed-off-by: qsnow1845 <qrs01@snowtx.com>
2019-05-28 15:10:48 -05:00
01de291094 fixed NPC spawning outside of road line. Moved power move buttons down.
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-27 11:47:36 -05:00
05eb5e46b7 Added a power move and fixed NPC7 collision
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-26 17:05:27 -05:00
3703cd34c0 NPC change at 140 clicks
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-25 15:56:13 -05:00
04cccbdef1 Code documentation, cleanup, and optimisation
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-25 15:33:05 -05:00
f1713a1fb4 Fixed compatibility issues between Ubuntu and Windows
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-25 14:47:07 -05:00
56eaaeca4c No more prints
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-24 21:32:15 -05:00
b5ed376176 Cleaned up some access can be private warnings in Main.java and more code cleanup.
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-24 21:30:20 -05:00
7fba7e16e2 Code cleanup
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-24 21:23:35 -05:00
a7469c079c Multiple NPC & collision.
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-24 21:15:11 -05:00
bcbd0c6ba9 one NPC locomotion
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-24 18:52:25 -05:00
a96a7dec98 Cleaned code
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-24 18:38:59 -05:00
be3b16cd7b NPC spawning started
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-24 10:59:39 -05:00
a6ab0c9347 pushed test NPC locomotion again
Signed-off-by: qsnow1845 <qrs01@snowtx.com>
2019-05-22 15:20:06 -05:00
7d72e7bb54 pushed test NPC locomotion
Signed-off-by: qsnow1845 <qrs01@snowtx.com>
2019-05-22 15:08:40 -05:00
2e0b2b76c1 Removed meta resources for being a failed experiment
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-21 20:31:42 -05:00
1724997f4d Locomotion of player finished.
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-21 20:26:01 -05:00
3aa37813be Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/project/Sprites/player.java
2019-05-21 19:45:55 -05:00
apeterescam1982
0a1a5d9415 Merge remote-tracking branch 'origin/master' 2019-05-21 15:26:58 -05:00
apeterescam1982
83feeb11b9 Random NPC spawns 2019-05-21 15:26:43 -05:00
a7ef5d3ded almost done with locomotion
Signed-off-by: qsnow1845 <qrs01@snowtx.com>
2019-05-21 15:25:21 -05:00
a586fd40db push for team
Signed-off-by: qsnow1845 <qrs01@snowtx.com>
2019-05-21 15:19:55 -05:00
apeterescam1982
322bc0c97b Usable player sprite 2019-05-21 14:53:04 -05:00
debd6803b7 added test method for team
Signed-off-by: qsnow1845 <qrs01@snowtx.com>
2019-05-21 14:44:31 -05:00
684bac312f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/project/Colors.java
#	src/project/Main.java
#	src/project/Sprites/player.java
2019-05-20 15:26:37 -05:00
1bcac96066 added movement test and it works
Signed-off-by: qsnow1845 <qrs01@snowtx.com>
2019-05-20 15:25:25 -05:00
apeterescam1982
ea02e79a56 Test commit 2019-05-20 15:20:48 -05:00
3136e334bb Tests created
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-20 10:53:13 -05:00
45d9e7fded Added a start screen and it no longer throws errors
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-19 17:07:54 -05:00
a5daf9a27a Currently broken. Will fix later
Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-18 22:11:42 -05:00
09b4d54e66 Changed car_sprit class to to player and moved it into package Sprites.
added everything into a package

Signed-off-by: officereso <qrs01@snowtx.com>
2019-05-18 19:35:36 -05:00
apeterescam1982
6f843ef095 Merge remote-tracking branch 'origin/master' 2019-05-17 15:21:19 -05:00
apeterescam1982
fe7cb9c55f Test commit 2019-05-17 15:20:49 -05:00
52bf704414 started background 2019-05-17 15:20:15 -05:00
apeterescam1982
ff96741619 Test commit 2019-05-17 15:08:45 -05:00
7c89dfce88 innital commit 2 2019-05-17 15:01:03 -05:00
1010e56d58 Initial commit 2019-05-17 14:32:04 -05:00