Commit Graph

Select branches

Hide Pull Requests

Connections

Mick

master

#1

#10

#11

#12

#2

#3

#4

#5

#6

#7

#8

#9

1.0

Mono Color

• edd9d6c34f added more title text master 1.0 Sem van der Hoeven 2020-06-07 19:34:52 +02:00
• 3cb7d2369b removed souts Sem van der Hoeven 2020-06-07 19:21:20 +02:00
• d5186ceb24 made it possible to restart game Sem van der Hoeven 2020-06-07 19:20:00 +02:00
• f812fedd11 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 18:28:52 +02:00
• 4a332d1221 last stuff Sem van der Hoeven 2020-06-07 18:28:44 +02:00
• 26419dc29a Removed all souts MickWerf 2020-06-07 18:15:31 +02:00
• 17df656725 fix Sem van der Hoeven 2020-06-07 17:59:48 +02:00
• 0d22df0fab Fixed create and removed souts MickWerf 2020-06-07 17:54:47 +02:00
• fdb80afba5 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 17:33:35 +02:00
• 046cade8a0 add restart Sem van der Hoeven 2020-06-07 17:33:03 +02:00
• 6914bb891c Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 17:25:57 +02:00
• 50e6b7ca95 Maingame cleaning MickWerf 2020-06-07 17:25:50 +02:00
• 5fa138b43b comment team Sem van der Hoeven 2020-06-07 17:20:56 +02:00
• 298fe3af96 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 17:16:19 +02:00
• f2e5504c5c added esc string Sem van der Hoeven 2020-06-07 17:16:07 +02:00
• 87d4627eca Cleaned Client order MickWerf 2020-06-07 17:15:41 +02:00
• 6ae2b5de51 add exit method Sem van der Hoeven 2020-06-07 17:15:00 +02:00
• 784762991f Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 17:14:03 +02:00
• d31a10971e Removed Test Characters and cleaned Client MickWerf 2020-06-07 17:13:14 +02:00
• 9ed89bf642 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 17:11:12 +02:00
• 749429b171 clean bst Sem van der Hoeven 2020-06-07 17:10:36 +02:00
• 37cefd6d88 refactor method Sem van der Hoeven 2020-06-07 17:06:00 +02:00
• 2283767c3d Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 17:02:39 +02:00
• c9ba1bff30 Util cleaning MickWerf 2020-06-07 17:02:00 +02:00
• 3e316ccc17 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 16:56:36 +02:00
• 3d5ad16eba add music Sem van der Hoeven 2020-06-07 16:56:16 +02:00
• a2a7095881 Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 16:54:34 +02:00
• 3df66c1789 Cleaned Data Removed updatable MickWerf 2020-06-07 16:54:20 +02:00
• 7ce4cba2ff Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 16:51:54 +02:00
• b80fe293e0 comments Sem van der Hoeven 2020-06-07 16:51:41 +02:00
• 355d9757b4 Removed controller and replaced with runnable. Remove unused logic package MickWerf 2020-06-07 16:49:37 +02:00
• e86a48d3cd Disconnect clients properly and cleaned server package MickWerf 2020-06-07 16:47:04 +02:00
• 4c23293c2c Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 16:36:35 +02:00
• c5411217b8 Server Coments MickWerf 2020-06-07 16:36:13 +02:00
• 133310a3e2 stuff fix Sem van der Hoeven 2020-06-07 16:34:27 +02:00
• 8344cbab0b made not able to move dead people Sem van der Hoeven 2020-06-07 16:25:19 +02:00
• 6ac66d8311 update moving Sem van der Hoeven 2020-06-07 16:09:16 +02:00
• fd6d91b7ed fix faction choosing Sem van der Hoeven 2020-06-07 15:54:22 +02:00
• 9337c44e20 fix import Sem van der Hoeven 2020-06-07 15:50:02 +02:00
• 80ebf342c6 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 15:49:34 +02:00
• e33aca517f faction choose progress Sem van der Hoeven 2020-06-07 15:49:26 +02:00
• 30b343fc84 Fixed move and implemented Damaging characters MickWerf 2020-06-07 15:30:05 +02:00
• 6d22fce2d1 Move Character communication done MickWerf 2020-06-07 15:26:02 +02:00
• e9f22850f7 Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 15:22:21 +02:00
• 3adf271cfe MoveData Initial stuff MickWerf 2020-06-07 15:22:15 +02:00
• 60f3edb656 made getter for username Sem van der Hoeven 2020-06-07 15:21:27 +02:00
• 63b1f66567 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 15:13:17 +02:00
• 41b8544646 stuff 2 Sem van der Hoeven 2020-06-07 15:12:38 +02:00
• 8b70287aa0 fixed import issue MickWerf 2020-06-07 15:06:54 +02:00
• b35161f4de Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 15:04:53 +02:00
• 1a1d014f42 Added package structure for Data Renamed CharacterData to MoveData Added DamageData. MickWerf 2020-06-07 15:03:32 +02:00
• fd0c8ba765 stuff Sem van der Hoeven 2020-06-07 14:50:29 +02:00
• 360e2cb967 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 14:44:11 +02:00
• ff35e96312 usernames 2 Sem van der Hoeven 2020-06-07 14:44:03 +02:00
• 79a0348a84 team picking things Sem van der Hoeven 2020-06-07 14:42:39 +02:00
• a3e79cf6c4 fixed test build error MickWerf 2020-06-07 14:38:26 +02:00
• 0af0ca02b6 Removed server interfaces from client game MickWerf 2020-06-07 14:36:35 +02:00
• d913138cda Added automatic updating an sending data for the server MickWerf 2020-06-07 14:31:15 +02:00
• a971c3c44e Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 14:27:31 +02:00
• 2aeec735d4 Merge remote-tracking branch 'origin/master' Sem van der Hoeven 2020-06-07 14:26:12 +02:00
• e1029187f6 Removed DataController from server MickWerf 2020-06-07 14:24:51 +02:00
• ddaf07df49 username sending done Sem van der Hoeven 2020-06-07 14:24:34 +02:00
• 51558d1d4d Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht MickWerf 2020-06-07 14:13:08 +02:00
• 60d478bb1e Added automatic updates server side when data is changed MickWerf 2020-06-07 14:12:48 +02:00
• 749f27d448 made game extend game Sem van der Hoeven 2020-06-07 14:05:45 +02:00
• b287360012 Added TeamData MickWerf 2020-06-07 14:04:30 +02:00
• fdf9b22d58 Fixed Datacontroller to allow for Data sendback MickWerf 2020-06-07 13:58:55 +02:00
• 315d447a2a Added Client to DataController MickWerf 2020-06-07 13:48:45 +02:00
• 1be186e113 souts Sem van der Hoeven 2020-06-07 13:43:05 +02:00
• 7abe8e22a1 made them bois killable Sem van der Hoeven 2020-06-06 23:00:35 +02:00
• f8074d5e64 Merge pull request #12 from SemvdH/temp SemvdH 2020-06-06 22:51:19 +02:00
• 8d99753f7c merge with master Squashed commit of the following: Sem van der Hoeven 2020-06-06 22:50:47 +02:00
• 272a3c6966 temp Sem van der Hoeven 2020-06-06 22:48:45 +02:00
• ec0d0c3531 Merge pull request #10 from SemvdH/Connections SemvdH 2020-06-06 22:43:28 +02:00
• cb2ef909eb Merge pull request #11 from SemvdH/damage-character SemvdH 2020-06-06 22:43:07 +02:00
• 35a93d3ecb hit timer Sem van der Hoeven 2020-06-06 22:42:43 +02:00
• 6a078550b2 timeout stuff Sem van der Hoeven 2020-06-06 21:06:11 +02:00
• 24a03a2854 made characters in range attackable Sem van der Hoeven 2020-06-06 17:37:23 +02:00
• bdb7c6e5c5 remove line Sem van der Hoeven 2020-06-06 17:21:27 +02:00
• bbfa59ab7f amazing music Sem van der Hoeven 2020-06-06 17:19:44 +02:00
• 15492cb91d Fixed test build issue Connections MickWerf 2020-06-06 16:50:32 +02:00
• 4b7eaaa641 Merge branch 'master' into Connections MickWerf 2020-06-06 16:47:59 +02:00
• 9349e6ce48 Finished Server/Client registration and communications MickWerf 2020-06-06 16:42:44 +02:00
• c07c86098a Merge pull request #9 from SemvdH/characters-moving SemvdH 2020-06-06 16:30:23 +02:00
• c8325ba55c optimize imports Sem van der Hoeven 2020-06-06 16:21:00 +02:00
• 95a582b91e fixed memory leaks Sem van der Hoeven 2020-06-06 16:19:36 +02:00
• ab3d57bc7f made only possible to select own factions characters Sem van der Hoeven 2020-06-06 16:07:05 +02:00
• 3dbffa4ffb Finished server side registration. MickWerf 2020-06-06 15:44:53 +02:00
• 23cf4d120e made character only able to move in some position Sem van der Hoeven 2020-06-06 15:44:46 +02:00
• 737e1ac1cb added character squares he can move Sem van der Hoeven 2020-06-06 15:35:01 +02:00
• 3827098c42 added stuff Sem van der Hoeven 2020-06-06 15:27:22 +02:00
• f942bbbc92 Connections, Applied Data objects, removed parsers and Made genereric data handling MickWerf 2020-06-06 15:02:45 +02:00
• 8b4538da39 add square to selected character Sem van der Hoeven 2020-06-06 14:40:22 +02:00
• f32a1b34c3 made compareto only use health Sem van der Hoeven 2020-06-02 23:44:14 +02:00
• 1285e1ae82 update compareTo Sem van der Hoeven 2020-06-02 23:43:35 +02:00
• c9a6907fca added isDead method to team class Sem van der Hoeven 2020-06-02 23:42:51 +02:00
• be0703ba61 added health to characters Sem van der Hoeven 2020-06-02 23:40:25 +02:00
• 087c3a7193 added team class that uses a tree Sem van der Hoeven 2020-06-02 23:35:28 +02:00
• 42d88e434f added coordinates to characters Sem van der Hoeven 2020-05-27 23:34:16 +02:00
• f89dbbb6b3 Merge branch 'master' into Mick Mick MickWerf 2020-05-27 23:27:38 +02:00