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 |
|
Sem van der Hoeven
|
3d72ed9694
|
conflicts yay
|
2020-09-18 14:25:21 +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
|
359484baa3
|
Merge branch 'plz-help-fix' into develop
|
2020-09-16 13:39:42 +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 |
|
Sem van der Hoeven
|
d197d01971
|
oneliner for getting length
|
2020-09-16 11:44:28 +02:00 |
|
Sem van der Hoeven
|
86a5ddfbc4
|
thanks johan
|
2020-09-16 11:43:03 +02:00 |
|
Sem van der Hoeven
|
7edb0ceded
|
fix courtesy of fabian
|
2020-09-16 10:31:24 +02:00 |
|
shinichi
|
b70da1148e
|
added ReadPrefMessage
|
2020-09-16 10:23:35 +02:00 |
|
Sem van der Hoeven
|
934507dd36
|
stuff
|
2020-09-16 10:20:06 +02:00 |
|
shinichi
|
03dcd4c8b0
|
added method to get packetLength
|
2020-09-16 09:59:30 +02:00 |
|
Sem van der Hoeven
|
9dd292dafc
|
added stuff for connecting to vr engine
|
2020-09-16 09:55:13 +02:00 |
|
Sem van der Hoeven
|
34a3e409ab
|
added new project for the vr engine
|
2020-09-16 09:32:41 +02:00 |
|