muskenum
|
76dcbc7488
|
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
|
2016-05-09 16:44:48 +02:00 |
|
muskenum
|
0f377fadb8
|
EAST and WEST dirs implemented in PlayerDrawer
|
2016-05-09 16:36:05 +02:00 |
|
ericnerdo
|
80b844900c
|
Drawer.java refactored: It is now an abstract class instead of an
interface. ImagePanel.java removed.
|
2016-05-09 16:35:49 +02:00 |
|
muskenum
|
0103489de7
|
EAST and WEST dirs implemented in PlayerDrawerBase
|
2016-05-09 16:32:06 +02:00 |
|
muskenum
|
b498942bde
|
EAST and WEST directions added to Replicator image
Eredetit nem basztattam, otthagytam
|
2016-05-09 16:29:12 +02:00 |
|
muskenum
|
5453a939f4
|
EAST and WEST directions added to ONeill and Jaffa images
az eredetit nem basztattam, maradjon meg az is
|
2016-05-09 16:21:07 +02:00 |
|
muskenum
|
a057f73ad2
|
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
|
2016-05-09 11:41:12 +02:00 |
|
ericnerdo
|
f241695413
|
WallDrawer.java fixed. Looks like asking a null reference's name is not a
good idea.
|
2016-05-07 23:24:51 +02:00 |
|
ericnerdo
|
e63a62893e
|
PlayerBaseDrawer.java added.
|
2016-05-07 22:27:16 +02:00 |
|
ericnerdo
|
25fd8189d2
|
PlayerDrawer.java added.
|
2016-05-07 22:19:55 +02:00 |
|
ericnerdo
|
c854a1ed37
|
Drawers fixed from Babylonian errors (JComponent also has getX, getY).
|
2016-05-07 20:21:36 +02:00 |
|
ericnerdo
|
0d31d8c79b
|
Revert "Drawers refactored. Imageloading is now in the Drawers instead of"
This reverts commit 3268268dc2.
|
2016-05-07 20:12:49 +02:00 |
|
ericnerdo
|
3268268dc2
|
Drawers refactored. Imageloading is now in the Drawers instead of
inheriting from ImagePanel. ImagePanel.java deleted.
|
2016-05-07 19:41:57 +02:00 |
|
|
|
3a9c615b48
|
fixed a bug, where Gates would not initialize (Dungeon.buildDungeon())
|
2016-05-07 19:17:14 +02:00 |
|
|
|
3d81dc6c65
|
Dungeon.buildDungeon() now correctly sets Display up
|
2016-05-07 19:15:19 +02:00 |
|
|
|
1f02ffc892
|
added Game reference to ApplicationFrame
|
2016-05-07 17:47:31 +02:00 |
|
Bokros Bálint
|
1c4488d710
|
Added keyboard input support for shooting stargates
|
2016-05-07 17:45:06 +02:00 |
|
Bokros Bálint
|
a7d6c604d8
|
Implemented Stargate shooting in Game
|
2016-05-07 17:45:06 +02:00 |
|
Bokros Bálint
|
070d3ef3f4
|
Added a map to Stargate
|
2016-05-07 17:45:06 +02:00 |
|
ericnerdo
|
ed45c604a4
|
PNG files for GUI added.
|
2016-05-07 17:43:55 +02:00 |
|
ericnerdo
|
316e6e60ea
|
ScaleDrawer.draw() modified.
|
2016-05-07 17:35:11 +02:00 |
|
ericnerdo
|
46d43ae4ed
|
WallDrawer.draw() fixed.
|
2016-05-07 17:21:46 +02:00 |
|
|
|
22553d657f
|
added proof of concept mouse listener to JList in ApplicationFrame
|
2016-05-07 17:08:35 +02:00 |
|
ericnerdo
|
04afbf83a4
|
GateDrawer.draw() modified
|
2016-05-07 17:05:40 +02:00 |
|
Bokros Bálint
|
d61b6af8ed
|
Implemented box operations
|
2016-05-07 16:51:20 +02:00 |
|
Bokros Bálint
|
f760ded0e4
|
Added hasBox to Player
|
2016-05-07 16:51:20 +02:00 |
|
ericnerdo
|
6edcffc586
|
ScaleDrawer.java added.
|
2016-05-07 16:47:57 +02:00 |
|
ericnerdo
|
96c3adba83
|
GateDrawer.java added.
|
2016-05-07 16:12:03 +02:00 |
|
|
|
5c32997f8b
|
ApplicationFrame now correctly displays menu with maps on run()
|
2016-05-07 16:10:56 +02:00 |
|
ericnerdo
|
46ced04536
|
FieldDrawer.draw() modified.
|
2016-05-07 15:47:43 +02:00 |
|
ericnerdo
|
c91a1d051c
|
Tile.hasBox() fixed.
|
2016-05-07 15:23:47 +02:00 |
|
ericnerdo
|
f11adc2fab
|
boolean hasZPM() and hasBox() added to Tile.java.
|
2016-05-07 15:22:42 +02:00 |
|
Bokros Bálint
|
645028bc94
|
Added keyboard input support for moving players and box operations
|
2016-05-07 15:20:20 +02:00 |
|
|
|
536081b015
|
started implementing ApplicationFrame.init() -- further work needed
|
2016-05-07 15:16:18 +02:00 |
|
ericnerdo
|
c157981253
|
Display.drawVisuals() now throws IOException.
|
2016-05-07 15:10:42 +02:00 |
|
ericnerdo
|
f4f118a9ba
|
draw() modified, Wall now shows stargates.
|
2016-05-07 15:08:13 +02:00 |
|
ericnerdo
|
39a082c2aa
|
Drawer.draw() now throws IOException.
|
2016-05-07 15:07:23 +02:00 |
|
ericnerdo
|
9e37f114d0
|
String getName() added to Stargate.java
|
2016-05-07 15:06:25 +02:00 |
|
ericnerdo
|
cd5b407fb3
|
Stargate getStargate() added to Wall.java.
|
2016-05-07 14:51:20 +02:00 |
|
ericnerdo
|
1c847c06ae
|
void changeImage(String path) added to ImagePanel.
|
2016-05-07 14:45:58 +02:00 |
|
ericnerdo
|
573518d14b
|
Heirs of ImagePanel now throw IOException.
|
2016-05-07 14:40:52 +02:00 |
|
ericnerdo
|
17d7f46d78
|
WallDrawer.java added
|
2016-05-07 14:29:36 +02:00 |
|
ericnerdo
|
cc5f21ab78
|
Display display added to Game.java
|
2016-05-07 14:24:23 +02:00 |
|
Bokros Bálint
|
6fb3f4fb17
|
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
|
2016-05-07 14:21:37 +02:00 |
|
ericnerdo
|
0b5ef542df
|
FieldDrawer.java added
|
2016-05-07 14:19:56 +02:00 |
|
Bokros Bálint
|
a458aba4dd
|
Added delay parameter to start of flowoftime
|
2016-05-07 14:19:53 +02:00 |
|
Bokros Bálint
|
bf191678a6
|
Merge branch 'master' into game
|
2016-05-07 14:18:43 +02:00 |
|
|
|
9e93cf8928
|
added ApplicationFrame.java -- to be implemented
|
2016-05-07 14:09:59 +02:00 |
|
ericnerdo
|
c425fb7fe8
|
Merge branch 'master' of https://github.com/bokrosbalint/cicaprojekt
|
2016-05-07 14:07:01 +02:00 |
|
Bokros Bálint
|
e98abbecac
|
Added FlowOfTime init in Game
|
2016-05-07 14:06:09 +02:00 |
|
