Commit graph

493 commits

Author SHA1 Message Date
66b4094d17 Add bling
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@344 72836036-5685-4462-b002-a69064685172
2011-05-31 04:45:28 +02:00
98f3e09d98 Updated UML
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@343 72836036-5685-4462-b002-a69064685172
2011-05-31 04:25:05 +02:00
Bennet Gerlach
d276b03c39 AIUtil now needs game settings, both hand and player do not anymore
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@342 72836036-5685-4462-b002-a69064685172
2011-05-31 03:45:32 +02:00
Bennet Gerlach
278edc37a9 findSetsWithTotalPoints now finds sets (and total points)
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@341 72836036-5685-4462-b002-a69064685172
2011-05-31 03:45:21 +02:00
eea3cb2188 Don't show last player when a round has ended
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@340 72836036-5685-4462-b002-a69064685172
2011-05-31 03:11:29 +02:00
acc7d3f11f HumanTurnControl: Fix method length
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@339 72836036-5685-4462-b002-a69064685172
2011-05-31 03:04:22 +02:00
25c6383c73 Allow setting stone colors to use
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@338 72836036-5685-4462-b002-a69064685172
2011-05-31 03:02:31 +02:00
c004a07a42 Make highest value and number of stones dealt settable
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@337 72836036-5685-4462-b002-a69064685172
2011-05-31 01:50:56 +02:00
c78e8e6448 StonePainter: Paint stones lazily
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@336 72836036-5685-4462-b002-a69064685172
2011-05-31 01:50:54 +02:00
Ida Massow
2e24ee3e7f Man kann im Model bestimmen, wie viele Steine gegeben werden. Test geht auch
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@335 72836036-5685-4462-b002-a69064685172
2011-05-31 00:58:50 +02:00
Ida Massow
489e7858e7 Test für mehr Steine geben
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@334 72836036-5685-4462-b002-a69064685172
2011-05-31 00:58:49 +02:00
Ida Massow
0cb36fb752 Man kann viele FAreben benutzen, alle Test laufen. Man kann auch Karten bis Wert X größer oder kleiner 13 nehmen. Alles nur im Model, aber getestet und toll
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@333 72836036-5685-4462-b002-a69064685172
2011-05-31 00:58:48 +02:00
Ida Massow
f22ff5f0f1 Tests für Sets mit mehr Farben, mehr Values, ...
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@332 72836036-5685-4462-b002-a69064685172
2011-05-31 00:58:46 +02:00
Jannis Harder
d66d73ea8f Fixed out of stones rules
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@331 72836036-5685-4462-b002-a69064685172
2011-05-30 21:04:43 +02:00
Bennet Gerlach
d25a73167c Extracted a AIUtil class from several hand methods
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@330 72836036-5685-4462-b002-a69064685172
2011-05-30 21:01:48 +02:00
55088e15a1 Test different stone heap configurations with JUnit theories; allow creating stone heaps with different stone set numbers
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@329 72836036-5685-4462-b002-a69064685172
2011-05-30 20:49:36 +02:00
Ida Massow
1660736239 Man kann jetzt die Anzahl der Steinsätze einstellen
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@328 72836036-5685-4462-b002-a69064685172
2011-05-30 20:16:48 +02:00
Ida Massow
c398c081ed Test für Änderung der StoneSet Anzahl fertig
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@327 72836036-5685-4462-b002-a69064685172
2011-05-30 19:50:58 +02:00
Bennet Gerlach
ad2f226369 Implemented timer in base AI class
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@326 72836036-5685-4462-b002-a69064685172
2011-05-30 19:29:20 +02:00
Ida Massow
ae9ce59d36 Warnings tauchen auf, wenn man beim Einstellen Unfug macht
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@325 72836036-5685-4462-b002-a69064685172
2011-05-30 19:08:33 +02:00
498c2529bd Fix umlauts on ISO8859 systems
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@324 72836036-5685-4462-b002-a69064685172
2011-05-30 17:50:24 +02:00
f3b5db2866 Uhh... forgot star image
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@323 72836036-5685-4462-b002-a69064685172
2011-05-30 17:50:22 +02:00
5406d540d3 Show winners in score panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@322 72836036-5685-4462-b002-a69064685172
2011-05-30 17:37:39 +02:00
2b38167087 ScorePanel: Make round number column less wide
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@321 72836036-5685-4462-b002-a69064685172
2011-05-30 15:35:11 +02:00
Ida Massow
7404566d46 Fixed a few warnings
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@320 72836036-5685-4462-b002-a69064685172
2011-05-30 10:13:26 +02:00
Jannis Harder
b19a46b7b2 Implemented view code for AI turns
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@319 72836036-5685-4462-b002-a69064685172
2011-05-30 01:31:36 +02:00
Jannis Harder
15558d7138 Implemented dummy AI
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@318 72836036-5685-4462-b002-a69064685172
2011-05-30 01:31:32 +02:00
Jannis Harder
f3f52956f7 Tested and implemented player type selection in the settings panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@317 72836036-5685-4462-b002-a69064685172
2011-05-29 22:24:48 +02:00
d9b651828a Make score panel look nice
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@316 72836036-5685-4462-b002-a69064685172
2011-05-29 22:12:58 +02:00
Jannis Harder
43ace4c18a Added player type selection to the settings panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@315 72836036-5685-4462-b002-a69064685172
2011-05-29 21:49:03 +02:00
08e9b28f3b Fix metrics
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@314 72836036-5685-4462-b002-a69064685172
2011-05-29 21:21:55 +02:00
d6b8b23c6d Disable player panel while settings panel is shown
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@313 72836036-5685-4462-b002-a69064685172
2011-05-29 21:19:20 +02:00
Ida Massow
e4a1246f01 Viele Warnings durch Kommentare beseitigt
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@312 72836036-5685-4462-b002-a69064685172
2011-05-29 20:36:26 +02:00
Jannis Harder
65d08ea450 Created dummy base AI control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@311 72836036-5685-4462-b002-a69064685172
2011-05-29 20:22:47 +02:00
Jannis Harder
f6a3409ed5 Use correct joker colors
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@310 72836036-5685-4462-b002-a69064685172
2011-05-29 20:22:45 +02:00
Ida Massow
794777c2fe Neuer Button im WinPanel mit funktion
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@309 72836036-5685-4462-b002-a69064685172
2011-05-29 20:19:17 +02:00
Jannis Harder
eb7ccb46c5 Added TurnControlFactory
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@308 72836036-5685-4462-b002-a69064685172
2011-05-29 19:46:53 +02:00
Jannis Harder
73f6fb9c1b Created interface and abstract base class for turn control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@307 72836036-5685-4462-b002-a69064685172
2011-05-29 19:46:50 +02:00
Jannis Harder
f62b953c9e Added more fields to GameSettings
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@306 72836036-5685-4462-b002-a69064685172
2011-05-29 19:14:28 +02:00
Jannis Harder
c09a94a359 Classify for more than two jokers
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@305 72836036-5685-4462-b002-a69064685172
2011-05-29 18:51:06 +02:00
Jannis Harder
cb50f92edd Test classify for more than two jokers
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@304 72836036-5685-4462-b002-a69064685172
2011-05-29 18:50:59 +02:00
Jannis Harder
699a0b0a29 Deal the correct number of jokers aka funny joker action
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@303 72836036-5685-4462-b002-a69064685172
2011-05-29 18:50:54 +02:00
Jannis Harder
bf8aa23758 Implement joker number in settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@302 72836036-5685-4462-b002-a69064685172
2011-05-29 18:50:52 +02:00
Jannis Harder
9e21e3f23c Test for joker number in settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@301 72836036-5685-4462-b002-a69064685172
2011-05-29 18:50:49 +02:00
Jannis Harder
3f3f6370c9 Added UI for the joker number
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@300 72836036-5685-4462-b002-a69064685172
2011-05-29 18:50:47 +02:00
Ida Massow
05107f6035 Rauskommen ist in der View zu sehen, genauso wie Farben
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@299 72836036-5685-4462-b002-a69064685172
2011-05-29 18:42:36 +02:00
9cf3dc09ae Implement score panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@298 72836036-5685-4462-b002-a69064685172
2011-05-29 15:50:30 +02:00
eea456991c Calculate accumulated score in game state
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@297 72836036-5685-4462-b002-a69064685172
2011-05-29 15:50:24 +02:00
Jannis Harder
89e59b2f2c Implemented initial meld threshold in settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@296 72836036-5685-4462-b002-a69064685172
2011-05-29 15:32:01 +02:00
Jannis Harder
09aa507e3b Test initial meld threshold in settings control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@295 72836036-5685-4462-b002-a69064685172
2011-05-29 15:32:00 +02:00