Commit Graph

20 Commits (f6ecdb8894803be26ed139c4e892e0070dfffc57)

Author SHA1 Message Date
nooahe f6ecdb8894 overlay Clickable 2023-01-09 18:20:42 +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
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
Noah Eckert 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
Noah Eckert 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
Christoph Blank dc53c8de0f Revert "Readme rausgelöscht"
This reverts commit ef6c5db7c3.
2022-12-06 16:41:57 +01:00
Christoph Blank ef6c5db7c3 Readme rausgelöscht 2022-12-06 16:20:02 +01:00
Christoph Blank 402deec6e2 neues Readme test 2022-12-06 16:08:40 +01:00
nooahe b7da35f8a3 init 2022-12-06 15:12:25 +01:00