Commits · master · Gramann, Claas Janik / Team 4C Blob N Roll

28 Jul, 2020 1 commit
- Link to hof · cfe93726
  Gramann, Claas Janik authored Jul 28, 2020
  
  cfe93726
18 Jun, 2019 25 commits
- Merge branch 'dev_css_refactor' into 'master' · dec2dca7
  Gramann, Claas Janik authored Jun 18, 2019
```
forgot prefix

See merge request webtech/ss2019/team-4c!185
```
  dec2dca7
- forgot prefix · 97464f42
  Gramann, Claas Janik authored Jun 18, 2019
  
  97464f42
- Merge branch 'dev_css_refactor' into 'master' · 5abd42f1
  Hahn, Till authored Jun 18, 2019
```
Moved entity related rule to entity file

See merge request webtech/ss2019/team-4c!183
```
  5abd42f1
- Merge branch 'dev_uml_sequenz' into 'master' · c1e3a955
  Gramann, Claas Janik authored Jun 18, 2019
```
add uml sequence diagramms

See merge request webtech/ss2019/team-4c!184
```
  c1e3a955
- fix uml · 52f1b334
  Hahn, Till authored Jun 18, 2019
  
  52f1b334
- add uml sequence diagramms · 6b3eb09d
  Hahn, Till authored Jun 18, 2019
  
  6b3eb09d
- .static_content_entity and · ef15ab5e
  Gramann, Claas Janik authored Jun 18, 2019
  
  ef15ab5e
- _entity postfix · b4f01a91
  Gramann, Claas Janik authored Jun 18, 2019
  
  b4f01a91
- game screen id · 844518b0
  Gramann, Claas Janik authored Jun 18, 2019
  
  844518b0
- Now with rule context · cc58d6b7
  Gramann, Claas Janik authored Jun 18, 2019
  
  cc58d6b7
- Added #level_editor_screen context to rules · f0d862c8
  Gramann, Claas Janik authored Jun 18, 2019
  
  f0d862c8
- Removed superfluous rule · 7f01b29f
  Gramann, Claas Janik authored Jun 18, 2019
  
  7f01b29f
- Moved entity related rule to entity file · 7a8bb0dd
  Gramann, Claas Janik authored Jun 18, 2019
  
  7a8bb0dd
- Merge branch 'dev_typo' into 'master' · 2dac6f00
  Hahn, Till authored Jun 18, 2019
```
typedef started lower case but should start upper case

See merge request webtech/ss2019/team-4c!182
```
  2dac6f00
- typedef started lower case but should start upper case · 2b690c51
  Gramann, Claas Janik authored Jun 18, 2019
  
  2b690c51
- Merge branch 'dev_level9fix' into 'master' · c1817c45
  Hahn, Till authored Jun 18, 2019
```
swapped the crate type and made it easier to use the buttons whenever the user wants

See merge request webtech/ss2019/team-4c!181
```
  c1817c45
- swapped the crate type and made it easier to use the buttons whenever the user wants · 787d3401
  Strugar, Marc authored Jun 18, 2019
```
Signed-off-by: mstruger <marc.strugar@stud.th-luebeck.de>

Signed-off-by: mstruger <marc.strugar@stud.th-luebeck.de>
```
  787d3401
- Merge branch 'dev_toast_z_fix' into 'master' · 9ffdb333
  Strugar, Marc authored Jun 18, 2019
```
Z index fix

See merge request webtech/ss2019/team-4c!180
```
  9ffdb333
- Z index fix · b05a0e4e
  Gramann, Claas Janik authored Jun 18, 2019
  
  b05a0e4e
- Merge branch 'dev_typo' into 'master' · 4f4e5f55
  Strugar, Marc authored Jun 18, 2019
```
Fixed typo

See merge request webtech/ss2019/team-4c!179
```
  4f4e5f55
- Merge branch 'dev_meta' into 'master' · 116b1c38
  Strugar, Marc authored Jun 18, 2019
```
Updated Meta

See merge request webtech/ss2019/team-4c!178
```
  116b1c38
- Fixed typo · cdc1384d
  Gramann, Claas Janik authored Jun 18, 2019
  
  cdc1384d
- Updated Meta · ae14a891
  Gramann, Claas Janik authored Jun 18, 2019
  
  ae14a891
- Merge branch 'dev_level_swap' into 'master' · 5f23bf18
  Strugar, Marc authored Jun 18, 2019
```
Update level_urls.txt

See merge request webtech/ss2019/team-4c!177
```
  5f23bf18
- Update level_urls.txt · a0ac8d5a
  Gramann, Claas Janik authored Jun 18, 2019
  
  a0ac8d5a
17 Jun, 2019 14 commits
- Merge branch 'dev_level' into 'master' · b363af1d
  Strugar, Marc authored Jun 17, 2019
```
Added last level

See merge request webtech/ss2019/team-4c!176
```
  b363af1d
- Added last level · d90aedc9
  Gramann, Claas Janik authored Jun 17, 2019
  
  d90aedc9
- Merge branch 'master' into 'dev_level' · ab697b64
  Gramann, Claas Janik authored Jun 17, 2019
```
# Conflicts:
#   web/assets/levels/level_urls.txt
```
  ab697b64
- Added last level · 26f5d550
  Gramann, Claas Janik authored Jun 17, 2019
  
  26f5d550
- Merge branch 'dev_level9' into 'master' · 1836945c
  Strugar, Marc authored Jun 17, 2019
```
Add level 9 and Hourglass fix

See merge request webtech/ss2019/team-4c!175
```
  1836945c
- Add level 9 and Hourglass fix · da3f54d5
  Gramann, Claas Janik authored Jun 17, 2019
  
  da3f54d5
- Merge branch 'dev_level9' into 'master' · dc384ce8
  Gramann, Claas Janik authored Jun 17, 2019
```
level 9

See merge request webtech/ss2019/team-4c!174
```
  dc384ce8
- level 9 · ca35cd72
  Strugar, Marc authored Jun 17, 2019
```
Signed-off-by: mstruger <marc.strugar@stud.th-luebeck.de>
```
  ca35cd72
- Merge branch 'dev_level_7' into 'master' · 0c21f5bc
  Strugar, Marc authored Jun 17, 2019
```
Add 7th level

See merge request webtech/ss2019/team-4c!173
```
  0c21f5bc
- Add 7th level · bec3bf59
  Gramann, Claas Janik authored Jun 17, 2019
  
  bec3bf59
- Merge branch 'dev_level_5' into 'master' · 9d017bec
  Hahn, Till authored Jun 17, 2019
```
Added more levels

See merge request webtech/ss2019/team-4c!172
```
  9d017bec
- Added more levels · 2fe21cc6
  Gramann, Claas Janik authored Jun 17, 2019
  
  2fe21cc6
- Merge branch 'dev_level_5' into 'master' · 1c887f79
  Strugar, Marc authored Jun 17, 2019
```
Added HelpFromAbove level

See merge request webtech/ss2019/team-4c!171
```
  1c887f79
- Merge branch 'readme_doku' into 'master' · 133c5e08
  Strugar, Marc authored Jun 17, 2019
```
Update README.md

See merge request webtech/ss2019/team-4c!170
```
  133c5e08