Commit Graph

109 Commits (5847c52400e5f2c36ccc73a0f5ce78284cf1cd4e)
 

Author SHA1 Message Date
lihell 5847c52400 Merge remote-tracking branch 'origin/main' 2 years ago
lihell 6e293e366c fix teleport nicht in baum 2 years ago
trivernis 6baea0f2a0
Merge branch 'main' of github.com:Trivernis/gamejam-22 2 years ago
trivernis d99c4cb609
Fix win prompt 2 years ago
MehdiAyadi 0c107434dd removed println for volume 2 years ago
MehdiAyadi bd6286bc9f merge and added settings can now modify soundengine 2 years ago
MehdiAyadi 198855360f Merge remote-tracking branch 'origin/main' into main 2 years ago
trivernis 88d7fed3d9
Merge remote-tracking branch 'origin/main' 2 years ago
trivernis 5c834e82cb
Add introduction to story and keybindings 2 years ago
MehdiAyadi 88314e1320 Merge remote-tracking branch 'origin/main' into main 2 years ago
lihell 602ccf1084 Merge remote-tracking branch 'origin/main' 2 years ago
lihell 086059db32 fix teleport in wände und teleporter name in Herbst Map 2 years ago
trivernis ca7ac1f5fd
Add teleport description 2 years ago
trivernis ce9b2b0128
Merge branch 'main' of github.com:Trivernis/gamejam-22 2 years ago
trivernis 2d47d57039
Add victory condition check and screen 2 years ago
lihell d98a16ffe7 fix 2 years ago
lihell bf6c1a75f7 fix texture in game and winter teleporter 2 years ago
Matthias 221ef50e2c add referenced items
iphone, ipod, screwdriver
2 years ago
Matthias 9766bacc23 add referenced items
knife, ram
2 years ago
lihell cfd51597cf Merge remote-tracking branch 'origin/main'
# Conflicts:
#	assets/tiled/level_herbst.tmx
2 years ago
lihell 0c5c00b89a update all levels: teleporter und level design 2 years ago
MehdiAyadi 799aafbc88 Added Viewport scaling for Settings.kt 2 years ago
trivernis c5db7ca5ac
Fix scaling of dialog in dialog stage 2 years ago
trivernis 5113f58ab5
Merge remote-tracking branch 'origin/main' 2 years ago
trivernis 20c4e15251
Fix player rotation 2 years ago
trivernis 2922510994
Fix viewport issue in ui stage 2 years ago
Matthias 4d108068b3 add inventory check
items can only be used once
2 years ago
trivernis 1d4da585ed
Fix viewport issues 2 years ago
Matthias 739cebf937 show dialog when door is closed 2 years ago
Matthias e0ca135712 add option to show message 2 years ago
Matthias f6a7cfaafb remove noisy logs 2 years ago
trivernis f768723d88
Add removal of collectible from map after collecting it 2 years ago
trivernis d977560644
Merge 2 years ago
trivernis 451b202775
Merge remote-tracking branch 'origin/main'
# Conflicts:
#	core/src/main/kotlin/com/last/commit/map/Collectible.kt
#	core/src/main/kotlin/com/last/commit/map/TimeMap.kt
2 years ago
trivernis 4afb0cd3fb
Add map state 2 years ago
MehdiAyadi 26bdc1e9b5 cleanup and filled gamesettings with life:
TODO viewport, connection to soundengine and keybinding
2 years ago
Matthias 9c5447e3b3 remove unnecessary layer 2 years ago
Matthias 5cd5d807cd fix entrance tile on all maps 2 years ago
Matthias a7f1a9cfef fix broken teleport 2 years ago
Matthias d9081f5d83 add usable key 2 years ago
lihell 1b00a5fc0f update level_sommer und level_winter: teleporter to other maps added 2 years ago
lihell 486707853c Merge remote-tracking branch 'origin/main' 2 years ago
lihell 0ad40aefc7 update level_sommer und level_winter: teleporter to other maps added 2 years ago
Matthias a68ad86112 update maps
add SFX layer
add collectible key
2 years ago
Matthias 63a3f10f0d fix teleporters 2 years ago
trivernis 4c508a2e55
Merge branch 'main' of github.com:Trivernis/gamejam-22 2 years ago
Matthias 77e664dd98 fix map loading
log map name when loading map
2 years ago
trivernis 09b464c1cb
Merge branch 'main' of github.com:Trivernis/gamejam-22 2 years ago
trivernis 7266742b33
Meerge 2 years ago
MehdiAyadi 8175149540 fix stuff 2 years ago