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

17 Jun, 2019 2 commits
- Added more levels · 2fe21cc6
  Gramann, Claas Janik authored Jun 17, 2019
  
  2fe21cc6
- Added HelpFromAbove level · c5f0bd60
  Gramann, Claas Janik authored Jun 17, 2019
  
  c5f0bd60
15 Jun, 2019 15 commits
- Merge branch 'dev_wrong_comment' into 'master' · 5fab2778
  Strugar, Marc authored Jun 15, 2019
```
Fixed comment, copy and paste error

See merge request webtech/ss2019/team-4c!152
```
  5fab2778
- Merge branch 'uml_model_entities' into 'master' · a7868977
  Gramann, Claas Janik authored Jun 15, 2019
```
Added static content entity uml

See merge request webtech/ss2019/team-4c!153
```
  a7868977
- Added static content entity uml · 752fbfcf
  Gramann, Claas Janik authored Jun 15, 2019
  
  752fbfcf
- Fixed comment, copy and paste error · 96e5af11
  Gramann, Claas Janik authored Jun 15, 2019
  
  96e5af11
- Merge branch 'uml_model_entities' into 'master' · be35a32e
  Gramann, Claas Janik authored Jun 15, 2019
```
Finish sink uml

See merge request webtech/ss2019/team-4c!151
```
  be35a32e
- Finish sink uml · 87956210
  Gramann, Claas Janik authored Jun 15, 2019
  
  87956210
- Merge branch 'dev_editor_trigger_region' into 'master' · 6b4a0619
  Hahn, Till authored Jun 15, 2019
```
Dev editor trigger region

See merge request webtech/ss2019/team-4c!148
```
  6b4a0619
- Revert: logic pipe icons · 968e1041
  Gramann, Claas Janik authored Jun 15, 2019
  
  968e1041
- Merge branch 'uml_model_entities' into 'master' · ea2fec76
  Gramann, Claas Janik authored Jun 15, 2019
```
Added DoorSinkEntity

See merge request webtech/ss2019/team-4c!150
```
  ea2fec76
- Added DoorSinkEntity · 24c85e98
  Gramann, Claas Janik authored Jun 15, 2019
  
  24c85e98
- Merge branch 'uml_model_entities' into 'master' · cecef1f8
  Gramann, Claas Janik authored Jun 15, 2019
```
Added ButtonSourceEntityUml

See merge request webtech/ss2019/team-4c!149
```
  cecef1f8
- Added ButtonSourceEntityUml · 19c254ce
  Gramann, Claas Janik authored Jun 15, 2019
  
  19c254ce
- Merge remote-tracking branch 'origin/master' into dev_editor_trigger_region · 543b9b35
  Gramann, Claas Janik authored Jun 15, 2019
```
# Conflicts:
#	lib/src/model/leveleditor/LevelEditorModel.dart
#	tool/level_creators/getting_started_levels/PlaceHolder.dart
#	tool/level_creators/getting_started_levels/Splitting.dart
#	web/assets/levels/getting_started_levels/3_Splitting.bnrl
#	web/assets/levels/getting_started_levels/4_Merging.bnrl
#	web/assets/levels/getting_started_levels/5_PlaceHolder.bnrl
#	web/styles/entities_editor.css
#	web/styles/entities_static.css
#	web/styles/level_editor.css
```
  543b9b35
- Remove light sink entity · ea35dc7b
  Gramann, Claas Janik authored Jun 15, 2019
  
  ea35dc7b
- A trigger region can now be added and the distance can be configured. · d1d3eb19
  Gramann, Claas Janik authored Jun 15, 2019
  
  d1d3eb19
14 Jun, 2019 2 commits
- Merge branch 'dev_editor_flag' into 'master' · 5833c3db
  Hahn, Till authored Jun 14, 2019
```
Added flag to editor

See merge request webtech/ss2019/team-4c!146
```
  5833c3db
- Merge branch 'dev_fix_load_level_in_editor' into 'master' · e46f45e0
  Hahn, Till authored Jun 14, 2019
```
LevelEditor now loads the level properly and now can be edited. Levels will...

See merge request webtech/ss2019/team-4c!147
```
  e46f45e0
12 Jun, 2019 21 commits
- Added Error toast in case of inputing the wrong file · a0d90fe4
  Strugar, Marc authored Jun 12, 2019
```
Signed-off-by: mstruger <marc.strugar@stud.th-luebeck.de>
```
  a0d90fe4
- Added two other flag types · bffed8e0
  Gramann, Claas Janik authored Jun 12, 2019
  
  bffed8e0
- Updated levels to connect the flags · ee20cbdc
  Gramann, Claas Janik authored Jun 12, 2019
  
  ee20cbdc
- Formatter fix · d5201900
  Strugar, Marc authored Jun 12, 2019
```
Signed-off-by: mstruger <marc.strugar@stud.th-luebeck.de>
```
  d5201900
- Added flag which goes up and down · 27e98e7b
  Gramann, Claas Janik authored Jun 12, 2019
  
  27e98e7b
- Removed the check if the level to be saved changed after the previous save as... · de7dc4f3
  Strugar, Marc authored Jun 12, 2019
```
Removed the check if the level to be saved changed after the previous save as it was deemed unnecessary

Signed-off-by: mstruger <marc.strugar@stud.th-luebeck.de>
```
  de7dc4f3
- Merge remote-tracking branch 'origin/master' into dev_fix_load_level_in_editor · a260e6bf
  Strugar, Marc authored Jun 12, 2019
  
  a260e6bf
- Merge branch 'dev_editor_lock_to_grid' into 'master' · d22e2f84
  Hahn, Till authored Jun 12, 2019
```
Dev editor lock to grid

See merge request webtech/ss2019/team-4c!145
```
  d22e2f84
- LevelEditor now loads the level properly and now can be edited. Levels will... · 7a2f3366
  Strugar, Marc authored Jun 12, 2019
```
LevelEditor now loads the level properly and now can be edited. Levels will only be saved if the world was updated after the last save

Signed-off-by: mstruger <marc.strugar@stud.th-luebeck.de>
```
  7a2f3366
- Added flag to editor · 85ab0534
  Gramann, Claas Janik authored Jun 12, 2019
  
  85ab0534
- Lock to grid in editor · 728b999a
  Gramann, Claas Janik authored Jun 12, 2019
  
  728b999a
- Merge branch 'uml_model_entities' into 'master' · a5d9a5e8
  Gramann, Claas Janik authored Jun 12, 2019
```
blob and crate overview

See merge request webtech/ss2019/team-4c!144
```
  a5d9a5e8
- blob and crate overview · 96f5674a
  Gramann, Claas Janik authored Jun 12, 2019
  
  96f5674a
- Merge branch 'uml_model_entities' into 'master' · bf21d903
  Gramann, Claas Janik authored Jun 12, 2019
```
inverse

See merge request webtech/ss2019/team-4c!143
```
  bf21d903
- inverse · c37e63d8
  Gramann, Claas Janik authored Jun 12, 2019
  
  c37e63d8
- Merge branch 'uml_sink_source_name' into 'master' · 27d0f8ba
  Gramann, Claas Janik authored Jun 12, 2019
```
Renamed Entity-Sink-Source.plantuml

See merge request webtech/ss2019/team-4c!142
```
  27d0f8ba
- Renamed Entity-Sink-Source.plantuml · be41010f
  Gramann, Claas Janik authored Jun 12, 2019
  
  be41010f
- Merge branch 'uml_model_entities' into 'master' · c2af66e8
  Gramann, Claas Janik authored Jun 12, 2019
```
Added UML Diagram for Sinks and Sources

See merge request webtech/ss2019/team-4c!141
```
  c2af66e8
- Added UML Diagram for Sinks and Sources · 2fffb17c
  Gramann, Claas Janik authored Jun 12, 2019
  
  2fffb17c
- Merge branch 'uml_sink_source' into 'master' · 54f9f018
  Gramann, Claas Janik authored Jun 12, 2019
```
Added UML Diagram for Sinks and Sources

See merge request webtech/ss2019/team-4c!140
```
  54f9f018
- Added UML Diagram for Sinks and Sources · 379e4efd
  Gramann, Claas Janik authored Jun 12, 2019
  
  379e4efd