Commit Graph
157 Commits
Author SHA1 Message Date
shinichi 674a10a779 Merge branch 'develop' into client 2020-09-23 12:01:16 +02:00
shinichi 797fb16465 client stuff 2020-09-23 12:00:40 +02:00
Sem van der Hoeven 60cf23d980 added identifier enum and made message use it 2020-09-23 11:58:36 +02:00
Sem van der Hoeven 31ef1beb82 added comments to message 2020-09-23 11:57:20 +02:00
Sem van der Hoeven 603703b3f6 rename program to message 2020-09-23 11:52:49 +02:00
Sem van der Hoeven 1a67e97f75 removed unused boolean warning 2020-09-23 11:51:22 +02:00
Sem van der Hoeven 28242ff052 added message class and added references to server and client projects 2020-09-23 11:50:25 +02:00
shinichi a52f1ea7ed started client 2020-09-23 11:12:10 +02:00
fabjuuuh dcae307754 Classes to server 2020-09-23 11:00:45 +02:00
Sem van der Hoeven 1041aa0391 added empty server and client projects 2020-09-23 10:43:03 +02:00
Sem van der Hoeven b391583107 added other project to solution 2020-09-23 09:57:36 +02:00
Sem van der Hoeven c63b51c22b fix? 2020-09-18 17:15:10 +02:00
Sem van der Hoeven 1ce519f661 wat 2020-09-18 17:14:16 +02:00
Sem van der Hoeven 7df8d98ed9 test 2020-09-18 17:08:19 +02:00
Sem van der Hoeven fce99ff9ec Merge branch 'master' into develop 2020-09-18 17:00:17 +02:00
Sem van der Hoeven a4bfac3de1 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 16:58:50 +02:00
SemvdH 5762989f93 Merge pull request #5 from SemvdH/temp
test
2020-09-18 16:58:41 +02:00
Sem van der Hoeven fe977deb46 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 16:57:25 +02:00
Sem van der Hoeven 541538d50a test 2020-09-18 16:56:37 +02:00
shinichi 8f8490fe2a Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 16:54:23 +02:00
shinichi 47cfe4efe6 nope 2020-09-18 16:54:21 +02:00
SemvdH 5cd4e61194 Merge pull request #4 from SemvdH/develop
merge Develop into master... again
2020-09-18 16:53:42 +02:00
Sem van der Hoeven 84a80df9ca Revert "removed unecessary folder"
This reverts commit 3f3a388ec1.
2020-09-18 16:52:33 +02:00
Sem van der Hoeven 3f3a388ec1 removed unecessary folder 2020-09-18 16:49:40 +02:00
Sem van der Hoeven 360767b6a5 added RH-Engine to solution 2020-09-18 16:49:02 +02:00
SemvdH ddcc2171e0 Merge pull request #3 from SemvdH/revert-2-develop
Revert "merge Develop into master"
2020-09-18 16:45:00 +02:00
SemvdH b6be86b811 Revert "merge Develop into master" 2020-09-18 16:44:47 +02:00
fdegroot1 109b982931 Merge pull request #2 from SemvdH/develop
merge Develop into master
2020-09-18 16:44:27 +02:00
Sem van der Hoeven 688509dc66 conflicts 5: The return 2020-09-18 16:42:02 +02:00
Sem van der Hoeven 02b180c246 clean and comment 2020-09-18 16:41:05 +02:00
shinichi d912f2dd31 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 16:32:17 +02:00
shinichi 6d0439fab3 added follow route 2020-09-18 16:31:19 +02:00
Sem van der Hoeven 6b78cf12a2 conflicts 4: the reckoning 2020-09-18 16:30:24 +02:00
Sem van der Hoeven 9f675844ed road showing 2020-09-18 16:29:39 +02:00
fabjuuuh 92d95eb6a6 Made method for terrain no longer in createconnection 2020-09-18 16:29:26 +02:00
fabjuuuh b2163b0459 Merge branch 'Terrain' into develop 2020-09-18 16:08:15 +02:00
Logophilist c837af0392 attempt for road on route 2020-09-18 16:06:35 +02:00
fabjuuuh de7f667dd0 Terrain 2020-09-18 16:01:39 +02:00
Sem van der Hoeven 7842baafb4 conflicts 3: revelations 2020-09-18 16:01:25 +02:00
Sem van der Hoeven 12b4b90bc5 create route method 2020-09-18 16:00:43 +02:00
shinichi 4a745ace75 added getUUIDFromResponse 2020-09-18 15:59:46 +02:00
shinichi f1d543dafc Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 15:57:13 +02:00
shinichi c69c3193d4 added moveTo
not working
2020-09-18 15:56:34 +02:00
shinichi 17eb3b1845 added positions for models 2020-09-18 15:39:30 +02:00
Sem van der Hoeven 6eb2ac1a82 added route 2020-09-18 15:33:04 +02:00
Logophilist 36a0177270 routecommand attempt1 2020-09-18 14:54:13 +02:00
shinichi a5a61a8a83 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 14:47:53 +02:00
shinichi b7f3f3542f various changes 2020-09-18 14:47:33 +02:00
Sem van der Hoeven f1066a365e comments on program.cs 2020-09-18 14:41:18 +02:00
Sem van der Hoeven 99b4e7f426 conflicts 2: the sequal 2020-09-18 14:26:24 +02:00