Skip to content

Commit e9e0ba9

Browse files
authored
Merge pull request #15 from iss2022-BCR/sprint1
update MapEditor v1.2
2 parents 25eb19f + 83f1f59 commit e9e0ba9

File tree

10 files changed

+399
-186
lines changed

10 files changed

+399
-186
lines changed

Sprint1/Sprint1_Project/sprint1_map_editor/.idea/artifacts/map_editor_bcr_jar2.xml

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sprint1/Sprint1_Project/sprint1_map_editor/.idea/artifacts/map_editor_bcr_jar3.xml

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"darkTheme": false,
2+
"roomMapFile": "",
3+
"mapConfigFile": "",
34
"logLevel": {
45
"toStandardOutput": true,
56
"toFile": false,
67
"directory": ""
78
},
8-
"roomMapFile": "",
9-
"mapConfigFile": "mapConfig",
10-
"confirmBeforeSaving": true,
9+
"confirmations": true,
10+
"darkTheme": false,
1111
"coordinateColor": "0x000000ff"
1212
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"roomMapFile": "D:\\Michele Righi\\Programmi\\GitHub\\WasteService\\Sprint1\\Sprint1_Project\\sprint1_map_editor\\mapRoomEmpty.bin",
3+
"mapConfigFile": "D:\\Michele Righi\\Programmi\\GitHub\\WasteService\\Sprint1\\Sprint1_Project\\sprint1_map_editor\\mapConfigTest.bin",
4+
"logLevel": {
5+
"toStandardOutput": true,
6+
"toFile": false,
7+
"directory": ""
8+
},
9+
"confirmations": true,
10+
"darkTheme": false,
11+
"coordinateColor": "0x000000ff"
12+
}

0 commit comments

Comments
 (0)