InfoProjekt-Development3 #6

Merged

Spafi merged 25 commits from InfoProjekt-Development3 into main 2024-03-10 09:26:52 +01:00

Conversation 0 Commits 25 Files changed 8 +249 -64

Spafi commented 2024-03-10 09:26:37 +01:00

Owner

Copy link

No description provided.

Spafi added 25 commits 2024-03-10 09:26:37 +01:00

Merge pull request 'doubled image size' (#65) from Spafi/game:main into Development ... f21d980352

Reviewed-on: InfoProjekt/game#65

Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main ... 1fd852e31e

Reviewed-on: jaffa/game#1

Upload files to "art/sprite files" 47c93f61dc

Merge pull request 'main' (#66) from jaffa/game:main into Development ... a41ee41fba

Reviewed-on: InfoProjekt/game#66

Merge pull request 'new river sprite file added' (#67) from Spafi/game:main into Development ... 1d03d60ac2

Reviewed-on: InfoProjekt/game#67

wrong location ... 9c36e8d570

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

wrong location ... 11c7a9037b

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

wrong location ... abfa24ced8

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

wrong location ... 321dac7cca

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Merge pull request 'main' (#72) from Spafi/game:main into Development ... 9396218a11

Reviewed-on: InfoProjekt/game#72

Merge pull request 'Development' (#8) from InfoProjekt/game:Development into main ... 569b3394a0

Reviewed-on: Lyzzy/game#8

test 956c25769c

test2 4d228bf6e0

Merge pull request 'attack now with left mouse click' (#73) from Spafi/game:main into Development ... 091726b8ca

Reviewed-on: InfoProjekt/game#73

Merge pull request 'fixed wall colision' (#74) from Spafi/game:main into Development ... d85c6ec22c

Reviewed-on: InfoProjekt/game#74

Merge pull request 'Development' (#9) from InfoProjekt/game:Development into main ... 1f38a04004

Reviewed-on: Lyzzy/game#9

changed Book and Convo, renamed Speech 614654692f

fixed Convo 2970e5cecd

added village 67f1e081fa

added village somehow c17b65d2f3

fixed that herberts attributes stay the same 52d3ec6e8d

added house 9147971be8

updated convo, still weird tho 3fe22ff6ac

Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development ... 523b34615b

Reviewed-on: InfoProjekt/game#75

Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3 ... 0032f8b2e1

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Spafi merged commit e8d81dfb11 into main 2024-03-10 09:26:52 +01:00

Spafi deleted branch InfoProjekt-Development3 2024-03-10 09:26:52 +01:00

Spafi referenced this pull request from a commit 2024-03-10 09:26:54 +01:00

Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Spafi/game#6

No description provided.