Commit Graph

41 Commits

Author SHA1 Message Date
6ad8eb93d7 Minor changes
Fixed magic weapons using the wrong sound
Made some changes to better detect the weapon used to attack
2018-03-20 11:05:15 +01:00
30ba612e56 Minor changes
Adds new method for containers for finding first item of a class
Adds health potions
Allows the user to use potions
2018-03-20 01:10:30 +01:00
5ac42d8fcb Merge remote-tracking branch 'origin/master' 2018-03-19 19:11:26 +01:00
27e4259f00 Small fixes and improvements
A boss will drop all its items
A girl will choose a name from a list (not finalized)
Carrots will no longer spawn randomly
Lets a message overflow to the next line
Added a new method for dropping an item at any location (for Boss.java)
Improves backpacks
Improves symbols for existing items
Added an interact-message to all containers, and removed it from IStatic
Makes it possible to get any of the 1-10 items in a chest
Makes an item dropped on the same tile as a static container enter the container
Code improvements
Game end screen
2018-03-19 19:11:09 +01:00
Anya Helene Bagge
3ec2c95e20 Merge branch 'master' into kkn015 2018-03-18 21:11:01 +01:00
Anya Helene Bagge
cf22ab626e add window title 2018-03-18 21:10:27 +01:00
Anya Helene Bagge
3971345fdb Merge branch 'master' into kkn015 2018-03-18 20:13:42 +01:00
Anya Helene Bagge
8a39b63e19 fix clearLine() performance issue 2018-03-18 18:38:32 +01:00
Anya Helene Bagge
3c5b291c26 Merge branch 'master' of https://retting.ii.uib.no/kkn015/inf101.v18.sem1 into kkn015 2018-03-17 22:22:11 +01:00
Anya Helene Bagge
1971194a63 add AppInfo file; oppdater README 2018-03-17 16:04:53 +01:00
bec5f90efd Fixes getNeighbourhood counting corners twice 2018-03-15 00:16:26 +01:00
d4c7d08df7 Improves getNeighbours greatly 2018-03-14 14:00:48 +01:00
6a21332877 Tests out some new things 2018-03-14 00:00:52 +01:00
b88f3c0ef4 Fixes a misunderstanding 2018-03-13 21:35:38 +01:00
3c1eca4d39 Lets the player set a name
Better comments
2018-03-13 10:50:50 +01:00
7d0f0dc4f8 Adds item storage and more NPC behavior
Makes NPC look for and pick up items of specified types.
Adds a Backpack and IContainer interface.
Lets items use separate sounds. Not completed.
2018-03-12 21:26:36 +01:00
d1b4f4a316 Legger til en del fremdeles uimplementerte items 2018-03-10 15:17:50 +01:00
478a8f02a3 Adds a new type of NPC 2018-03-09 23:18:00 +01:00
5ec539fda2 Fredagsoppdatering 2018-03-09 21:29:56 +01:00
0b143037de Progress saving 2018-03-08 23:38:59 +01:00
Anya Helene Bagge
5011891aff Update SEM-1_DEL-B.md
(fixes #2)
2018-03-08 17:26:02 +01:00
2e50452a22 Fixed merge conflicts 2018-03-08 01:02:22 +01:00
6dea376195 IDK 2018-03-08 00:57:53 +01:00
eb924c7aff Push to prepare for pull 2018-03-08 00:44:22 +01:00
Anya Helene Bagge
858b4dfbc2 Don't use JavaFX Canvas when running headless 2018-03-07 22:44:54 +01:00
29ae17d535 Getneightbourhood without edge detection. 2018-03-07 21:40:06 +01:00
ea0a2695cc Getneightbourhood without edge detection. 2018-03-07 21:39:56 +01:00
Anya Helene Bagge
904d52872f Merge branch 'patch-1' into 'master'
Update SEM-1_DEL-A.md

See merge request inf101.v18.oppgaver/inf101.v18.sem1!2
2018-03-07 14:56:09 +01:00
Anya Helene Bagge
438d9b040f fiks oppgavefeil (et punkt var allerede løst i den utleverte koden 2018-03-07 14:39:24 +01:00
Anya Helene Bagge
cb2daed48a small improvements in gfx library 2018-03-07 13:26:03 +01:00
Henning Berge
293dccde50 Update SEM-1_DEL-A.md
Fixing markdown error related to Section 'Bedre gulrotter'.
2018-03-05 20:01:13 +01:00
Anna Maria Eilertsen
32fa84ea0a Update SEM-1_DEL-A.md 2018-03-05 15:39:22 +01:00
b2883a1c80 ÆÆÆÆ Eg er lei av å skrive
Del A er implementert sånn omtrentlig ok.
Tester har blitt fikset slik at de fungerer med Intellij.
Noen kommentarer har blitt fikset.
En del dårlig kode har blitt fikset.
2018-03-01 21:13:25 +01:00
Anya Helene Bagge
83a44b6691 final! 2018-03-01 00:44:18 +01:00
Anya Helene Bagge
2931dbb28e fiks noen smådetaljer 2018-03-01 00:22:38 +01:00
Anya Helene Bagge
c1ad21da8c ready! 2018-02-28 23:51:40 +01:00
Anya Helene Bagge
c6692845f5 use R instead of smiley 2018-02-28 17:06:11 +01:00
Anya Helene Bagge
14ed39ad7b updates 2018-02-28 15:29:13 +01:00
Anna Maria Eilertsen
01580e9c7f Update SEM-1_DEL-A.md: Rm finished TODO in ´~~´ expl; moved paragraph 2018-02-28 11:12:24 +01:00
Anya Helene Bagge
64616697dd in progress advarsler 2018-02-28 10:33:38 +01:00
Anya Helene Bagge
6c2103c9ca initial import 2018-02-28 10:22:33 +01:00