sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
384 Commits 15 Branches 0 Tags
9a46b170673e2fc07d55487ac90869b6241982d3
Commit Graph
62 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fabjuuuh 9a46b17067 Merge remote-tracking branch 'origin/develop' into dataOnTabs 2020-10-19 11:20:28 +02:00
fabjuuuh 62525f3a23 Merge remote-tracking branch 'origin/develop' into dataOnTabs 2020-10-19 11:14:57 +02:00
fabjuuuh 783c40d7d3 rip 2020-10-19 11:14:05 +02:00
fabjuuuh 5751bbed81 Progress with structure to send data 2020-10-16 16:23:50 +02:00
fabjuuuh b868515ade Merge branch 'newDoctor' into develop 2020-10-16 15:06:52 +02:00
fabjuuuh 93eeea856f errors 2020-10-16 15:06:38 +02:00
fabjuuuh 0427fa89aa Merge remote-tracking branch 'origin/develop' into newDoctor 2020-10-16 15:04:16 +02:00
fabjuuuh 173dbf2745 update 2020-10-16 15:02:26 +02:00
fabjuuuh e3c580c8c2 Merge remote-tracking branch 'origin/develop' into newDoctor 2020-10-16 12:51:42 +02:00
fabjuuuh aadbbc16a9 Workinng on communication 2020-10-16 12:48:14 +02:00
fabjuuuh b31fa293fb Commands 2020-10-16 11:42:32 +02:00
fabjuuuh 6e534c318b Merge branch 'develop' into newDoctor 2020-10-14 15:21:03 +02:00
fabjuuuh d8a3baeec1 Relaycommands 2020-10-14 15:19:43 +02:00
fabjuuuh af5dca25f4 Remove Tabs when disconnect 2020-10-14 14:35:14 +02:00
fabjuuuh 3547207cad Merge branch 'develop' into newDoctor 2020-10-14 13:51:19 +02:00
fabjuuuh ecb3be2916 Merge branch 'newDoctor' into develop 2020-10-14 13:07:20 +02:00
fabjuuuh 25176dbaeb Connections shit 2020-10-14 13:05:56 +02:00
fabjuuuh 301f6b447f Progress 2020-10-12 16:50:02 +02:00
fabjuuuh df5e276eb3 Vastgelopen 2020-10-12 12:50:38 +02:00
fabjuuuh ab9180281e Merge branch 'dokter' into develop 2020-10-09 10:57:16 +02:00
fabjuuuh a043cdc723 Merge branch 'develop' into dokter 2020-10-09 10:56:48 +02:00
fabjuuuh fc0e70403f Icon en livechart library 2020-10-07 16:16:52 +02:00
fabjuuuh acbe3e9d55 Connect new tab 2020-10-07 14:56:04 +02:00
fabjuuuh aea1b4fce4 connectie met server 2020-10-07 13:21:30 +02:00
fabjuuuh a2937c0427 Merge branch 'wpf' into develop 2020-10-07 11:08:05 +02:00
fabjuuuh 02bd68d142 Merge branch 'develop' into wpf 2020-10-07 11:07:40 +02:00
fabjuuuh f777b583f5 progress 2020-09-30 14:37:40 +02:00
fabjuuuh 41e77ba16c hi 2020-09-30 13:12:18 +02:00
fabjuuuh cc7f2d154c wpf 2020-09-30 11:52:38 +02:00
fabjuuuh 99887a22ba Merge remote-tracking branch 'origin/client' into client 2020-09-25 16:38:22 +02:00
fabjuuuh 68a43fb930 Save Raw data 2020-09-25 16:38:16 +02:00
fabjuuuh 6ef5bbfe12 More SaveData 2020-09-25 14:06:45 +02:00
fabjuuuh cf9341a93e SaveData 2020-09-25 13:43:00 +02:00
fabjuuuh 97e6a528bb Merge remote-tracking branch 'origin/client' into client 2020-09-25 13:18:49 +02:00
fabjuuuh 80ee448acf Handledata 2020-09-25 13:18:41 +02:00
fabjuuuh 8e45c9a435 Merge remote-tracking branch 'origin/client' into client 2020-09-23 14:12:50 +02:00
fabjuuuh cd5f23d3e4 Works i think 2020-09-23 14:12:35 +02:00
fabjuuuh c62b0224e1 Merge remote-tracking branch 'origin/client' into client 2020-09-23 13:46:54 +02:00
fabjuuuh 40cbff209b Auto stash before merge of "client" and "origin/client" 2020-09-23 13:25:59 +02:00
fabjuuuh 748f7eed46 Server 2020-09-23 12:11:32 +02:00
fabjuuuh dcae307754 Classes to server 2020-09-23 11:00:45 +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
fabjuuuh de7f667dd0 Terrain 2020-09-18 16:01:39 +02:00
fabjuuuh 1e7d679fc2 Yeet 2020-09-18 14:24:55 +02:00
fabjuuuh e32d103e61 Node method 2020-09-18 11:41:44 +02:00
fabjuuuh 4782ecf53a Made methods for all the command still empty 2020-09-18 11:01:27 +02:00
fabjuuuh a9036e6fc2 Terrrain command changed 2020-09-18 10:50:17 +02:00
fabjuuuh 7b94cd77f9 Shit 2020-09-16 15:03:36 +02:00
fabjuuuh bdbda2b570 Merge remote-tracking branch 'origin/develop' into opdrachten 2020-09-16 14:29:11 +02:00
fabjuuuh f292310775 JsonTextWriter 2020-09-16 14:18:39 +02:00
fabjuuuh 7da952628d Added comments to BikeSimulation 2020-09-11 11:55:13 +02:00
fabjuuuh 631129a206 Set resistance in simulator 2020-09-11 11:48:39 +02:00
fabjuuuh 024490df1e Made Interface 2020-09-11 11:32:28 +02:00
fabjuuuh e5e6ae16fd Page 0x10 working 2020-09-11 11:24:04 +02:00
fabjuuuh 03a0c6febb Merged 2020-09-11 11:09:59 +02:00
fabjuuuh 24ab1a01c1 Merge remote-tracking branch 'origin/DataConverter' into simulation 2020-09-11 11:03:08 +02:00
fabjuuuh a0e1e527a1 Almost done with page 0x10 2020-09-09 16:59:36 +02:00
fabjuuuh 692f9700cc Merge remote-tracking branch 'origin/DataConverter' into simulation 2020-09-09 16:02:11 +02:00
fabjuuuh 149c327f7e BikeSimulater Start 2020-09-09 15:02:10 +02:00
fabjuuuh 9c55b545dd Things 2020-09-09 12:26:00 +02:00
fabjuuuh b52926cc5a Merge remote-tracking branch 'origin/develop' into simulation 2020-09-09 12:12:09 +02:00