nooahe
fb5ac19230
Final Version?!
2023-01-23 23:04:12 +01:00
nooahe
bba5b59a31
changed some stuff
2023-01-22 21:06:35 +01:00
nooahe
f7cd9e324e
Works all together - lots of updates
2023-01-19 15:19:40 +01:00
nooahe
a42f89e1b7
Merge branch 'marlon' into Noah
...
* marlon:
final merged project marlon + chrigi working sweet and smooth <3
backup before merge with chrigi
final marlon scene before merge with christoph
newest working version marlon 10.0 sheesh
newest version marlon
almost perfect version!
# Conflicts:
# Assets/Assets/00_Shared/05_Scripts/SceneChanger.asset
# Assets/Samples/XR Interaction Toolkit/2.0.3/Starter Assets/XRI Default Input Actions.inputactions
# ProjectSettings/ProjectSettings.asset
# ProjectSettings/TagManager.asset
2023-01-19 09:28:04 +01:00
nooahe
22b5c4ed25
changed XR Origin to XR Origin Noah
2023-01-19 09:24:37 +01:00
nooahe
341b491d60
changed Scene file
2023-01-19 09:12:19 +01:00
Marlon Portmann
d2dc155f53
final merged project marlon + chrigi working sweet and smooth <3
2023-01-18 18:29:30 +01:00
Marlon Portmann
e1cddf3e0d
backup before merge with chrigi
2023-01-18 13:41:22 +01:00
Marlon Portmann
ba955a8824
final marlon scene before merge with christoph
2023-01-18 13:31:15 +01:00
nooahe
3bac025670
Allmost finished
2023-01-14 17:43:37 +01:00
nooahe
689a2fd387
finished overlay
2023-01-11 07:45:04 +01:00
Marlon Portmann
4d0cb713d9
newest working version marlon 10.0 sheesh
2023-01-10 17:11:44 +01:00
nooahe
d9892c4ff7
Commit befor Branch Change
2023-01-09 18:37:06 +01:00
nooahe
f6ecdb8894
overlay Clickable
2023-01-09 18:20:42 +01:00
Marlon Portmann
f52236b8cb
newest version marlon
2023-01-09 17:45:38 +01:00
nooahe
a86e27ed2a
Merge branch 'marlon' into Noah
...
* marlon:
marlon neuster branch. workt!!
fully functioning marlon-branch. sick!
blabla
various additions sick.
a looot of changes!
marlon file setup
Revert "Readme rausgelöscht"
Readme rausgelöscht
neues Readme test
# Conflicts:
# ProjectSettings/ProjectSettings.asset
2023-01-09 15:48:59 +01:00
Marlon Portmann
c4ebf84539
almost perfect version!
2023-01-09 15:03:15 +01:00
nooahe
283ea8b21a
changed aaalooot
2023-01-07 09:37:07 +01:00
Marlon Portmann
f4b7dc9063
marlon neuster branch. workt!!
2023-01-02 16:18:53 +01:00
Marlon Portmann
fd31d29743
fully functioning marlon-branch. sick!
2023-01-02 16:09:25 +01:00
Marlon Portmann
a1f520943f
blabla
2022-12-30 10:38:12 +01:00
nooahe
73fe43117d
added particle systems and changed camera angle
2022-12-28 19:50:07 +01:00
nooahe
90969eeb7e
added particle systems
2022-12-28 17:39:20 +01:00
nooahe
dd1c23da48
generated Lightmaps and added general Logic with Text
2022-12-28 16:18:44 +01:00
Marlon Portmann
4d9dada5e5
various additions sick.
2022-12-27 15:44:03 +01:00
Marlon Portmann
a0f35f43b9
a looot of changes!
2022-12-24 01:31:09 +01:00
Marlon Portmann
b0a43dbddf
marlon file setup
2022-12-20 10:52:21 +01:00
830ae6d960
Merge pull request 'deleted readme kopie' ( #2 ) from Noah into master
...
Reviewed-on: #2
2022-12-06 16:57:22 +01:00
nooahe
b770933d9c
deleted readme kopie
2022-12-06 16:56:26 +01:00
4187d0ba00
Merge pull request 'Test' ( #1 ) from Noah into master
...
Reviewed-on: #1
2022-12-06 16:54:56 +01:00
nooahe
05a9130825
added readme
2022-12-06 16:53:52 +01:00
dc53c8de0f
Revert "Readme rausgelöscht"
...
This reverts commit ef6c5db7c343903f62806b129b3fa61f306191e0.
2022-12-06 16:41:57 +01:00
ef6c5db7c3
Readme rausgelöscht
2022-12-06 16:20:02 +01:00
402deec6e2
neues Readme test
2022-12-06 16:08:40 +01:00
nooahe
b7da35f8a3
init
2022-12-06 15:12:25 +01:00
