Commit Graph

58 Commits

Author SHA1 Message Date
fabjuuuh
de7f667dd0 Terrain 2020-09-18 16:01:39 +02:00
shinichi
037bb8a6cf Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 14:25:04 +02:00
fabjuuuh
1e7d679fc2 Yeet 2020-09-18 14:24:55 +02:00
shinichi
0a2a0405bf Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 14:23:46 +02:00
shinichi
6e09b87f60 added method overloading and custom models 2020-09-18 14:23:43 +02:00
Sem van der Hoeven
0d107a7170 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 14:21:35 +02:00
Sem van der Hoeven
1cda955254 pc stuff 2020-09-18 14:21:33 +02:00
DESKTOP-TV73FK0\woute
ef0b293373 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
# Conflicts:
#	RH-Engine/Program.cs
2020-09-18 14:17:53 +02:00
DESKTOP-TV73FK0\woute
bc99bfd46b addlayer(not finished) 2020-09-18 14:16:41 +02:00
Sem van der Hoeven
8fd3322c63 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 12:53:17 +02:00
Sem van der Hoeven
c82f1e9537 comments 2020-09-18 12:53:14 +02:00
shinichi
178bbb030c Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 12:51:17 +02:00
shinichi
bb70d80409 added bike 2020-09-18 12:50:53 +02:00
Sem van der Hoeven
e54cca454b added null message 2020-09-18 12:37:02 +02:00
DESKTOP-TV73FK0\woute
e98bf569f9 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop
# Conflicts:
#	RH-Engine/Program.cs
2020-09-18 12:32:06 +02:00
DESKTOP-TV73FK0\woute
a655646e80 idk 2020-09-18 12:30:57 +02:00
Sem van der Hoeven
0e2ee807e1 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-18 12:18:42 +02:00
Sem van der Hoeven
9ff2eb4e68 added standard name identifiers 2020-09-18 12:18:32 +02:00
shinichi
a8494bc4d2 added first iteration of adding a bike 2020-09-18 12:15:18 +02:00
Sem van der Hoeven
2b80dbad47 merge conflicts 2020-09-18 11:51:56 +02:00
Sem van der Hoeven
7c7b64094b add scene/get and progress on node/delete 2020-09-18 11:50:47 +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
Sem van der Hoeven
189fc18448 oneliner 2020-09-16 16:36:22 +02:00
Sem van der Hoeven
2e19b4af92 fiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiix 2020-09-16 16:35:19 +02:00
Sem van der Hoeven
fe05f7e71d clean 2020-09-16 16:28:05 +02:00
Sem van der Hoeven
5f65eb32fd senior gesprek fixes 2020-09-16 16:04:21 +02:00
Sem van der Hoeven
c171f15316 vr message temp 2020-09-16 15:34:06 +02:00
Sem van der Hoeven
0264370b38 stuff 2020-09-16 15:30:49 +02:00
Sem van der Hoeven
39e4f655b1 change skybox 2020-09-16 15:21:07 +02:00
Sem van der Hoeven
87a370ee76 Merge remote-tracking branch 'origin/opdrachten' into skybox 2020-09-16 15:05:09 +02:00
Sem van der Hoeven
b9dc2b82a6 stuff 2020-09-16 15:05:07 +02:00
fabjuuuh
7b94cd77f9 Shit 2020-09-16 15:03:36 +02:00
Sem van der Hoeven
ac45f1b454 Merge branch 'develop' of https://github.com/SemvdH/Proftaak-RH-B4 into develop 2020-09-16 14:43:23 +02:00
Sem van der Hoeven
2adfce27b0 added vr message class 2020-09-16 14:43:19 +02:00
fabjuuuh
bdbda2b570 Merge remote-tracking branch 'origin/develop' into opdrachten 2020-09-16 14:29:11 +02:00
shinichi
5f18b3e772 working ish 2020-09-16 14:28:43 +02:00
shinichi
631342ba04 Merge remote-tracking branch 'origin/develop' into develop 2020-09-16 14:26:51 +02:00
shinichi
cb1ca0b671 fix? 2020-09-16 14:26:39 +02:00
shinichi
119f6384b6 tunnel created? 2020-09-16 14:18:56 +02:00
fabjuuuh
f292310775 JsonTextWriter 2020-09-16 14:18:39 +02:00
Sem van der Hoeven
60ae9a3716 finished getting all users method 2020-09-16 13:52:52 +02:00
Sem van der Hoeven
3307f57f36 added getting all users from response 2020-09-16 13:48:31 +02:00
shinichi
4854dcb759 fix re-added do while 2020-09-16 13:39:28 +02:00
shinichi
ae4fd1f093 wip
WHHHHYYYYYYY NOT WORK?!?!?
2020-09-16 13:10:59 +02:00
Sem van der Hoeven
ececffef3f fixed conflicts 2020-09-16 12:14:43 +02:00
Sem van der Hoeven
5699f8678e json parser stuff 2020-09-16 12:14:04 +02:00
shinichi
758fef325e added PC struct 2020-09-16 12:11:30 +02:00
Sem van der Hoeven
b0dc258455 removed offset for buffer 2020-09-16 11:47:37 +02:00