6cd7595c3a
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
2016-04-24 18:25:08 +02:00
13a8adec82
Deleted echoes from all classes
2016-04-24 18:21:01 +02:00
3ec53d55c8
Deleted echoes from all classes.
2016-04-24 18:15:47 +02:00
12fd837aa3
Please enter the commit message for your changes. Lines starting
2016-04-24 17:58:27 +02:00
Kjistóf
e041576547
made cosmetic changes to most of the files: unified coding style
2016-04-23 17:15:19 +02:00
Kjistóf
7eeeefa3e2
finished implementing map parser (Dungeon.buildDungeon())
...
the parser now sets up references between adjecent Tiles, however a team
consultation is needed regarding the Gates/Scales on the map. note that
the part of the parser that sets the references up is still untested.
2016-04-23 17:08:32 +02:00
Kjistóf
e1d24d05dd
started implementing map parser in Dungeon.buildDungeon()
...
also added an example map file: exampledungeon.dungeon. work to be done:
implement rest of the parser, so it sets up cross references between
Tiles correctly.
2016-04-23 15:07:48 +02:00
Kjistóf
98d888b696
fixed the order of output identing in Wall.spawnStargate()
2016-04-23 13:35:53 +02:00
Kjistóf
9d5be2a0db
changed ident to 4spaces instead of tabs in Scale, also made cosmetic changes
2016-04-23 13:28:38 +02:00
Kjistóf
1f2903272e
removed terrible abusion of underscore paradigm in Scale ctor.
2016-04-23 13:24:26 +02:00
Kjistóf
f22e470d4d
Player class: changed ident to glorious 4spaces instead of tab, fixed order in methods
2016-04-23 13:19:55 +02:00
Kjistóf
d60400b5f4
minor refactor regarding Box.weight(), weight is now also an attribute
2016-04-23 13:15:30 +02:00
19aad35791
Measurable interface implemented
...
Method int weight() overridden, the return value is 0.
2016-04-22 10:43:45 +02:00
d1d6e8b725
Boolean isOpen fixed
...
"return open" was in the middle of the code, I moved it to the end of it. Methods onEntry, onExit are still unfinished.
2016-04-22 10:38:18 +02:00
6868baec84
Weight of Box finished
...
After implementing the Measurable interface, the constant weight of Boxes in the int weight method is 5. Attribute int weight, methods set- and getWeight were removed.
2016-04-22 10:18:31 +02:00
a30cb01cd0
Ready Gate except onEntry and onExit.
2016-04-21 23:39:00 +02:00
d735d72a78
Added weight to Box, not finished
2016-04-21 23:32:14 +02:00
a83a849ac0
Added weight to Box, + getter/setter
2016-04-21 23:01:20 +02:00
ab02de6e86
Finished Gate class, except onEntry and onExit.
2016-04-21 21:57:45 +02:00
b8b79db028
Added threshold initialization to ctor
2016-04-19 11:46:59 +02:00
f45ed417ae
Refactored ONeill into PlayerBase and Player
...
Change was needed because of updated specification.
2016-04-19 11:46:06 +02:00
db54dcdd1d
Implemented stack in Scale
...
Implemented a stack of items on the Scale, instead of one item, change was needed due to the modified specification
2016-04-19 11:31:56 +02:00
7f98d7ff3d
Pickable now extends Measurable
2016-04-19 11:01:26 +02:00
78b3fb0986
Created Measurable interface
2016-04-19 11:01:09 +02:00
cfb630ff18
Little changing in the echoes of Wall
...
Megcseréltem a két részt, mert a metódus törzse az echo után jött csak.
2016-04-03 23:14:59 +02:00
Kjistóf
68a6c44ae5
red and green Stargate instances now appear on the class diagram
2016-04-03 21:08:02 +02:00
Kjistóf
943fe482fb
class diagram now matches modifications made to the project
2016-04-03 20:34:07 +02:00
Kjistóf
764f2022c7
added a class diagram to the project root
2016-04-03 17:56:01 +02:00
Kjistóf
c19f437c21
fixed infinite recursion in Field.spawnStargate()
2016-04-01 17:59:53 +02:00
a06feaa0ca
attempt to fix stargate spawning
...
still gives stackoverflow, as there's no stop condition
2016-04-01 17:59:53 +02:00
5ece8b8f27
Stargate isn't initialized with nullpointers now
2016-04-01 17:59:53 +02:00
Kjistóf
07d7934524
fixed notation in Menu (Doboz lerakása helyett felvétele volt 2x)
2016-04-01 17:59:53 +02:00
Kjistóf
ddffc0f655
fixed nullptrexception on ONeill.boxLift() & ONeill.move()
...
static attribute Field.testfield now initializes properly
2016-04-01 17:59:53 +02:00
Kjistóf
a9b9e8d5ef
fixed Tile.removeItemFromTile() nullptr exception
2016-04-01 17:59:53 +02:00
Kjistóf
2790260ef9
added out/* to .gitignore
2016-04-01 17:59:53 +02:00
a8a938ee14
added default ctor to Tile
2016-04-01 17:59:53 +02:00
b3ecdf2b95
implemented misteriously gone setAdjacentTile
2016-04-01 17:59:53 +02:00
0230aec6d8
ONeill is now constructed with an existing ctor
2016-04-01 17:59:53 +02:00
59d03d193f
added testField as a temporary measure
...
this field can be set as all adjacentFields in the skeleton
2016-04-01 17:59:53 +02:00
15c9306d95
setItemOnTile doesn't use nonexistent methods
2016-04-01 17:59:52 +02:00
Kjistóf
65436b2ed4
setCurrentWall now doesn't use nonexistent methods
2016-04-01 17:59:42 +02:00
562015b7ab
added Scale constructor
2016-04-01 17:51:58 +02:00
127da96aea
added ONeill constructor
2016-04-01 17:51:30 +02:00
dbdcae7742
added Tile constructor
2016-04-01 17:50:06 +02:00
120c459df9
added echo to Wall.clearStargate() method
2016-04-01 17:49:14 +02:00
94965f70fb
added echoes to the Tile class
2016-04-01 17:48:38 +02:00
b1f38c6afc
fixed echoes in the Dungeon class
2016-04-01 17:48:38 +02:00
10bb64282b
fixed echoes in the FlowOfTime class
2016-04-01 17:48:38 +02:00
50456d092a
added echoes to the Stargate class
2016-04-01 17:48:00 +02:00
0bd209e1f5
fixed echoes in the Field class
2016-04-01 17:48:00 +02:00
muskenum
Kjistóf
ericnerdo
Bokros Bálint
hegedusfanni