• Joined on 2024-01-09
Spafi merged pull request InfoProjekt/game#80 2024-03-10 23:03:07 +01:00
game icon and room update
Spafi created pull request InfoProjekt/game#80 2024-03-10 23:03:03 +01:00
game icon and room update
Spafi pushed to main at Spafi/game 2024-03-10 22:29:20 +01:00
67ba9a62a1 Merge pull request 'Development' (#7) from InfoProjekt/game:Development into main
73508253c4 Merge pull request 'storyline' (#79) from Lyzzy/game:main into Development
f86f2e5dce added last part of tutorial
04547161a3 picture
Compare 16 commits »
Spafi merged pull request Spafi/game#7 2024-03-10 22:29:20 +01:00
Development
Spafi created pull request Spafi/game#7 2024-03-10 22:29:15 +01:00
Development
Spafi pushed to Development at InfoProjekt/game 2024-03-10 12:46:46 +01:00
4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development
67a0937c4b changed NPC talking key to f
Compare 3 commits »
Spafi merged pull request InfoProjekt/game#77 2024-03-10 12:46:45 +01:00
changed NPC talk key to f and resolved merge conflicts
Spafi created pull request InfoProjekt/game#77 2024-03-10 12:46:10 +01:00
changed NPC talk key to f
Spafi pushed to Development at InfoProjekt/game 2024-03-10 09:27:09 +01:00
3232096d66 Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development
e8d81dfb11 Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main
0032f8b2e1 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3
b1b7b21aa2 changed stuff
Compare 4 commits »
Spafi merged pull request InfoProjekt/game#76 2024-03-10 09:27:08 +01:00
changed stuff
Spafi deleted branch InfoProjekt-Development3 from Spafi/game 2024-03-10 09:26:54 +01:00
Spafi pushed to main at Spafi/game 2024-03-10 09:26:54 +01:00
e8d81dfb11 Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main
0032f8b2e1 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3
523b34615b Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development
3fe22ff6ac updated convo, still weird tho
9147971be8 added house
Compare 26 commits »
Spafi merged pull request Spafi/game#6 2024-03-10 09:26:52 +01:00
InfoProjekt-Development3
Spafi created pull request Spafi/game#6 2024-03-10 09:26:37 +01:00
InfoProjekt-Development3
Spafi closed pull request Spafi/game#5 2024-03-10 09:26:20 +01:00
Development
Spafi created pull request Spafi/game#5 2024-03-10 09:22:04 +01:00
Development
Spafi created pull request InfoProjekt/game#76 2024-03-10 09:17:42 +01:00
changed stuff
Spafi merged pull request InfoProjekt/game#75 2024-03-10 09:16:42 +01:00
Changed Book and fixed NPC convo
Spafi pushed to Development at InfoProjekt/game 2024-03-10 09:16:42 +01:00
523b34615b Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development
3fe22ff6ac updated convo, still weird tho
9147971be8 added house
52d3ec6e8d fixed that herberts attributes stay the same
c17b65d2f3 added village somehow
Compare 12 commits »
Spafi pushed to Development at InfoProjekt/game 2024-03-08 08:36:59 +01:00
d85c6ec22c Merge pull request 'fixed wall colision' (#74) from Spafi/game:main into Development
bd5ff8b3fe fixed wall colision
Compare 2 commits »