Skip to content

Commit

Permalink
Merge branch 'tmm-dev' of github.com:hpi-swa-teaching/GameMecha into …
Browse files Browse the repository at this point in the history
…tmm-dev
  • Loading branch information
ivozilkenat committed Jun 24, 2024
2 parents 1972e88 + 86b2d18 commit ce05b29
Show file tree
Hide file tree
Showing 21 changed files with 144 additions and 114 deletions.
238 changes: 128 additions & 110 deletions .squot-materialize
Original file line number Diff line number Diff line change
@@ -1,32 +1,33 @@
[
SquotCypressMapper {
#package : MCPackage {
#name : 'GM-UtilitiesTest'
},
SquotPlaintextMapper {
#path : FSAbsolutePath [
'source'
]
'.github',
'workflows',
'main.yml'
],
#encoding : 'TXT'
},
SquotTonelMapper {
SquotCypressMapper {
#package : MCPackage {
#name : 'GM-TilemapMakerGui'
#name : 'GM-Test'
},
#path : FSAbsolutePath [
'source'
]
},
SquotCypressMapper {
#package : MCPackage {
#name : 'GM-Test'
},
#path : @7
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'eye.png'
],
#encoding : Class [ #PNGReadWriter ]
},
SquotImageMapper {
#path : FSAbsolutePath [
'testingResources',
'squeak2.gif'
'GMTEIcons',
'up.png'
],
#encoding : Class [ #GIFReadWriter ]
#encoding : @9
},
SquotCypressMapper {
#package : MCPackage {
Expand All @@ -36,48 +37,57 @@
'source'
]
},
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'merge.png'
],
#encoding : @9
},
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-ToolBuilder'
#name : 'GM-TilemapMakerCore'
},
#path : @6
},
SquotCypressMapper {
#package : MCPackage {
#name : 'GM-UtilitiesTest'
},
#path : FSAbsolutePath [
'source'
]
},
SquotImageMapper {
SquotTonelMapper {
#package : MCPackage {
#name : 'ToolBuilder-Morphic'
},
#path : @6
},
SquotBlobMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'trash.png'
'map.morph'
],
#encoding : Class [ #PNGReadWriter ]
#encoding : 'bin'
},
SquotPlaintextMapper {
#path : FSAbsolutePath [
'.github',
'workflows',
'main.yml'
'LICENSE'
],
#encoding : 'TXT'
},
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'up.png'
],
#encoding : @21
},
SquotTonelMapper {
#package : MCPackage {
#name : 'ToolBuilder-Kernel'
},
#path : @7
#path : @6
},
SquotImageMapper {
#path : FSAbsolutePath [
'testingResources',
'squeak.png'
'GMTEIcons',
'rename.png'
],
#encoding : @21
#encoding : @9
},
SquotCypressMapper {
#package : MCPackage {
Expand All @@ -87,74 +97,75 @@
'source'
]
},
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'rename.png'
],
#encoding : @21
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-TE-UI'
},
#path : @6
},
SquotPlaintextMapper {
SquotCypressMapper {
#package : MCPackage {
#name : 'GM-TestFixtures'
},
#path : FSAbsolutePath [
'.gitignore'
],
#encoding : 'TXT'
'source'
]
},
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'down.png'
'add.png'
],
#encoding : @21
#encoding : @9
},
SquotPlaintextMapper {
#path : FSAbsolutePath [
'.squot'
'testingResources',
'test.txt'
],
#encoding : 'TXT'
},
SquotCypressMapper {
#package : MCPackage {
#name : 'GM-TestFixtures'
#name : 'GM-Core'
},
#path : FSAbsolutePath [
'source'
]
},
SquotCypressMapper {
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-Core'
#name : 'GM-ToolBuilder'
},
#path : FSAbsolutePath [
'source'
]
},
SquotTonelMapper {
#package : MCPackage {
#name : 'ToolBuilder-Morphic'
},
#path : @7
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'trash.png'
],
#encoding : @9
},
SquotSoundMapper {
SquotPlaintextMapper {
#path : FSAbsolutePath [
'testingResources',
'squeak.aiff'
'.gitignore'
],
#encoding : 'AIFF'
#encoding : 'TXT'
},
SquotImageMapper {
SquotPlaintextMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'merge.png'
'README.md'
],
#encoding : @21
#encoding : 'TXT'
},
SquotSoundMapper {
SquotImageMapper {
#path : FSAbsolutePath [
'testingResources',
'squeak.wav'
'squeak.png'
],
#encoding : 'WAV'
#encoding : @9
},
SquotCypressMapper {
#package : MCPackage {
Expand All @@ -164,89 +175,96 @@
'source'
]
},
SquotPlaintextMapper {
SquotBlobMapper {
#path : FSAbsolutePath [
'README.md'
'testMapFile.morph'
],
#encoding : 'TXT'
#encoding : 'bin'
},
SquotCypressMapper {
#package : MCPackage {
#name : 'GM-AcceptanceTest'
},
#path : FSAbsolutePath [
'source'
]
},
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-TE'
#name : 'GM-TE-Core'
},
#path : @4
#path : @6
},
SquotPlaintextMapper {
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-TE-Math'
},
#path : @6
},
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-TE-TileMap'
},
#path : @6
},
SquotImageMapper {
#path : FSAbsolutePath [
'testingResources',
'test'
'squeak2.gif'
],
#encoding : 'TXT'
#encoding : Class [ #GIFReadWriter ]
},
SquotImageMapper {
SquotPlaintextMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'broom.png'
'.squot'
],
#encoding : @21
#encoding : 'TXT'
},
SquotPlaintextMapper {
#path : FSAbsolutePath [
'.smalltalk.ston'
],
#encoding : 'TXT'
},
SquotBlobMapper {
SquotSoundMapper {
#path : FSAbsolutePath [
'map.morph'
'testingResources',
'squeak.aiff'
],
#encoding : 'bin'
#encoding : 'AIFF'
},
SquotBlobMapper {
SquotPlaintextMapper {
#path : FSAbsolutePath [
'testMapFile.morph'
'testingResources',
'test'
],
#encoding : 'bin'
#encoding : 'TXT'
},
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'eye.png'
'broom.png'
],
#encoding : @21
#encoding : @9
},
SquotCypressMapper {
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-AcceptanceTest'
#name : 'GM-TilemapMakerGui'
},
#path : FSAbsolutePath [
'source'
]
#path : @6
},
SquotPlaintextMapper {
SquotSoundMapper {
#path : FSAbsolutePath [
'LICENSE'
'testingResources',
'squeak.wav'
],
#encoding : 'TXT'
#encoding : 'WAV'
},
SquotImageMapper {
#path : FSAbsolutePath [
'GMTEIcons',
'add.png'
],
#encoding : @21
},
SquotTonelMapper {
#package : MCPackage {
#name : 'GM-TilemapMakerCore'
},
#path : @7
},
SquotPlaintextMapper {
#path : FSAbsolutePath [
'testingResources',
'test.txt'
'down.png'
],
#encoding : 'TXT'
#encoding : @9
}
]
File renamed without changes.
4 changes: 4 additions & 0 deletions source/GM-TE-Core/package.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Package {
#'squeak_changestamp' : true,
#name : #'GM-TE-Core'
}
File renamed without changes.
4 changes: 4 additions & 0 deletions source/GM-TE-Math/package.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Package {
#'squeak_changestamp' : true,
#name : #'GM-TE-Math'
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions source/GM-TE-TileMap/package.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Package {
#'squeak_changestamp' : true,
#name : #'GM-TE-TileMap'
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions source/GM-TE-UI/package.st
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Package {
#'squeak_changestamp' : true,
#name : #'GM-TE-UI'
}
Loading

0 comments on commit ce05b29

Please sign in to comment.