Commit graph

Select branches

Hide pull requests

Development

main

#1

#21

#24

#26

#27

#30

#32

#34

#35

#36

#37

#52

#53

#54

#55

#56

#57

#58

#59

#60

#62

#63

#64

#65

#66

#67

#68

#72

#73

#74

#75

#76

#77

#78

#79

#80

#81

#82

#83

#84

#85

#87

#92

Alpha

Mono Color

• d09d6b6e1a Update classes.py Development Jefferson Mousikas 2024-03-13 20:03:10 +00:00
• edbefc0f58 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-13 19:57:54 +00:00
• cfc8643907 Merge pull request 'Fixed fairy and added boss health bar' (#92) from Development into main main Spafi 2024-03-13 10:52:10 +00:00
• dff3b582d7 Merge pull request 'Implemented Boss bar and fixed fairy' (#87) from Spafi/game:main into Development Spafi 2024-03-13 09:43:47 +00:00
• 690a00b718 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game SpagettiFisch 2024-03-13 10:38:09 +01:00
• 368b033aab implemented boss health bar SpagettiFisch 2024-03-13 10:37:44 +01:00
• d01e511739 Merge pull request '0.1 Merge' (#85) from Development into main Alpha Spafi 2024-03-12 21:02:50 +00:00
• 57ffcf133c changed will to live (level) back to non dev Spafi 2024-03-12 21:02:21 +00:00
• 45c18a7713 changed will to live (level) back to non dev Spafi 2024-03-12 21:00:05 +00:00
• e383c8afed Merge pull request 'changed to normal version again (no dev shortcuts)' (#84) from Spafi/game:main into Development Spafi 2024-03-12 20:51:23 +00:00
• 64a3381eb9 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game SpagettiFisch 2024-03-12 21:50:04 +01:00
• a72349f7df changed to normal version again (no dev shortcuts) changed font for Think (because the f looked like a p) uploaded bossbar images SpagettiFisch 2024-03-12 21:45:52 +01:00
• 3448ec4120 Update classes.py Jefferson Mousikas 2024-03-12 17:52:27 +00:00
• c81b3fa355 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-12 16:48:24 +00:00
• 4d90ac3e38 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-12 16:47:40 +00:00
• dfc2ea8086 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-12 16:46:44 +00:00
• b124f8817c Upload files to "art/images/people" Jefferson Mousikas 2024-03-12 16:18:45 +00:00
• d4da02ee8d Delete art/images/people/fairy.png Jefferson Mousikas 2024-03-12 16:18:31 +00:00
• 7a85a049de Delete audio/soundeffects/altefrauspeak.mp3 Jefferson Mousikas 2024-03-12 15:57:10 +00:00
• 5db4df24a0 Delete audio/soundeffects/dorfaeltesterspeak.mp3 Jefferson Mousikas 2024-03-12 15:57:04 +00:00
• 2f8e393c1e Delete viecher.py Jefferson Mousikas 2024-03-12 15:56:39 +00:00
• 08edd05403 Merge pull request 'room update and boss' (#83) from Spafi/game:main into Development Spafi 2024-03-12 11:52:26 +00:00
• fb3ba25b89 managed the room thing, you can now actually switch rooms the boss is killable you get a tbc screen after killing the boss SpagettiFisch 2024-03-12 12:50:13 +01:00
• 04e0b68cd7 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game SpagettiFisch 2024-03-12 07:41:12 +01:00
• d132757717 added new npc started migrating object creation into the room classs SpagettiFisch 2024-03-12 07:39:36 +01:00
• a13042ffdd Upload files to "art/images/weapons" Jefferson Mousikas 2024-03-11 21:49:24 +00:00
• f482a2445c Delete audio/soundeffects/fireball.mp3 Jefferson Mousikas 2024-03-11 21:44:35 +00:00
• df7aff13df Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 21:44:26 +00:00
• e5adb43ec6 Delete audio/soundeffects/fireball.mp3 Jefferson Mousikas 2024-03-11 21:44:05 +00:00
• 6d68ec88e0 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 21:43:51 +00:00
• f458a4e89b Delete audio/soundeffects/fireball.mp3 Jefferson Mousikas 2024-03-11 21:43:30 +00:00
• c9c87da15a Delete audio/soundeffects/door.mp3 Jefferson Mousikas 2024-03-11 21:43:27 +00:00
• 37aee3dfff Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 21:43:13 +00:00
• 38ddb5fbd6 Delete audio/soundeffects/door.mp3 Jefferson Mousikas 2024-03-11 21:42:38 +00:00
• 8198079512 Delete audio/soundeffects/fireball.mp3 Jefferson Mousikas 2024-03-11 21:42:34 +00:00
• 6ee5cba861 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 21:42:12 +00:00
• 89255505ec Upload files to "art/images/people" Jefferson Mousikas 2024-03-11 21:05:33 +00:00
• a35dcfb823 Update main.py Jefferson Mousikas 2024-03-11 19:47:09 +00:00
• d08274c2f6 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 19:27:59 +00:00
• 6601e00318 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 19:22:27 +00:00
• b2ac429eaa Delete audio/soundeffects/a Jefferson Mousikas 2024-03-11 19:17:12 +00:00
• 98b8a2bcb6 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 19:17:07 +00:00
• a7dd1dbf27 Upload files to "audio/music" Jefferson Mousikas 2024-03-11 19:09:46 +00:00
• 9e9ab2156a Delete audio/music/a Jefferson Mousikas 2024-03-11 19:07:23 +00:00
• 3e655a09f3 Upload files to "audio/music" Jefferson Mousikas 2024-03-11 19:07:13 +00:00
• 585d19fb37 Delete audio/soundeffects/fireball.mp3 Jefferson Mousikas 2024-03-11 18:58:17 +00:00
• f755bef435 Upload files to "audio/soundeffects" Jefferson Mousikas 2024-03-11 18:58:10 +00:00
• 065036d430 Add audio/soundeffects/a Jefferson Mousikas 2024-03-11 18:56:13 +00:00
• 46c05a8de5 Delete audio/soundeffects Jefferson Mousikas 2024-03-11 18:55:56 +00:00
• 643e74ab58 Add audio/soundeffects Jefferson Mousikas 2024-03-11 18:55:35 +00:00
• 72f0050055 Add audio/music/a Jefferson Mousikas 2024-03-11 18:55:05 +00:00
• 0dda6fd38c Delete music /a Jefferson Mousikas 2024-03-11 18:50:56 +00:00
• 19f5027b60 Add music /a Jefferson Mousikas 2024-03-11 18:49:44 +00:00
• 74abed824d Merge branch 'main' of https://git.spafi.eu/Spafi/game SpagettiFisch 2024-03-11 11:46:35 +01:00
• 073062ce0c Merge pull request 'Development' (#8) from InfoProjekt/game:Development into main Spafi 2024-03-11 10:46:24 +00:00
• 76ef4f6559 doors can now be passed through SpagettiFisch 2024-03-11 11:44:58 +01:00
• aa83465577 Upload files to "art/images/people" Jefferson Mousikas 2024-03-11 10:39:37 +00:00
• 80ec47143e Merge pull request 'Update viecher.py' (#82) from jaffa-patch-1 into Development Spafi 2024-03-11 06:56:30 +00:00
• a9770aff7e Update viecher.py Jefferson Mousikas 2024-03-10 23:47:22 +00:00
• cc24152e7f Upload files to "art/images/people" Jefferson Mousikas 2024-03-10 23:37:57 +00:00
• 01d91e68c7 Merge pull request 'fied a bug were the game would crash during door creation' (#81) from Spafi/game:main into Development Spafi 2024-03-10 22:07:53 +00:00
• 3883237f91 fied a bug were the game would crash during door creation SpagettiFisch 2024-03-10 23:07:38 +01:00
• 8dd5ad2dc6 Merge pull request 'game icon and room update' (#80) from Spafi/game:main into Development Spafi 2024-03-10 22:03:06 +00:00
• 7709fd52f7 Merge branch 'main' of https://git.spafi.eu/Spafi/game SpagettiFisch 2024-03-10 22:59:55 +01:00
• 0f755996b6 added icon added door sprite addedd startscreen SpagettiFisch 2024-03-10 22:59:46 +01:00
• 229435f682 added room constallations now with useless doors SpagettiFisch 2024-03-10 22:58:58 +01:00
• 67ba9a62a1 Merge pull request 'Development' (#7) from InfoProjekt/game:Development into main Spafi 2024-03-10 21:29:19 +00:00
• 73508253c4 Merge pull request 'storyline' (#79) from Lyzzy/game:main into Development Jefferson Mousikas 2024-03-10 18:02:21 +00:00
• f86f2e5dce added last part of tutorial Lyzzy 2024-03-10 18:42:40 +01:00
• fc3773150a - Lyzzy 2024-03-10 16:19:57 +01:00
• 04547161a3 picture Lyzzy 2024-03-10 16:05:15 +01:00
• 93bbb0eb84 Stoorryy Lyzzy 2024-03-10 16:05:09 +01:00
• 4e976c3895 wuhu Lyzzy 2024-03-10 15:14:21 +01:00
• e540693def story yea yea Lyzzy 2024-03-10 15:06:44 +01:00
• 248fc2a112 fix fix Lyzzy 2024-03-10 14:30:20 +01:00
• 726c5ee2a2 storyline Lyzzy 2024-03-10 14:23:22 +01:00
• bb8ec349dd Merge branch 'main' of https://git.spafi.eu/Lyzzy/game Lyzzy 2024-03-10 13:04:29 +01:00
• 4d40e44e2d starting to add some storyline, added Rat Lyzzy 2024-03-10 12:58:59 +01:00
• 2a2d7b2765 Merge pull request 'Development' (#11) from InfoProjekt/game:Development into main Lyzzy 2024-03-10 11:51:09 +00:00
• 4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development Spafi 2024-03-10 11:46:45 +00:00
• 4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game SpagettiFisch 2024-03-10 12:42:41 +01:00
• 67a0937c4b changed NPC talking key to f SpagettiFisch 2024-03-10 12:42:09 +01:00
• 01c3aeae4a Merge pull request 'Development' (#10) from InfoProjekt/game:Development into main Lyzzy 2024-03-10 09:32:18 +00:00
• 3232096d66 Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development Spafi 2024-03-10 08:27:07 +00:00
• e8d81dfb11 Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main Spafi 2024-03-10 08:26:52 +00:00
• 0032f8b2e1 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3 SpagettiFisch 2024-03-10 09:23:59 +01:00
• b1b7b21aa2 changed stuff SpagettiFisch 2024-03-10 09:17:22 +01:00
• 523b34615b Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development Spafi 2024-03-10 08:16:42 +00:00
• 3fe22ff6ac updated convo, still weird tho Lyzzy 2024-03-09 21:27:54 +01:00
• 9147971be8 added house Lyzzy 2024-03-09 20:14:40 +01:00
• 52d3ec6e8d fixed that herberts attributes stay the same Lyzzy 2024-03-09 16:26:53 +01:00
• c17b65d2f3 added village somehow Lyzzy 2024-03-09 15:54:19 +01:00
• 67f1e081fa added village Lyzzy 2024-03-09 14:00:00 +01:00
• 2970e5cecd fixed Convo Lyzzy 2024-03-09 12:03:59 +01:00
• 614654692f changed Book and Convo, renamed Speech Lyzzy 2024-03-09 11:11:28 +01:00
• 1f38a04004 Merge pull request 'Development' (#9) from InfoProjekt/game:Development into main Lyzzy 2024-03-09 09:06:05 +00:00
• d85c6ec22c Merge pull request 'fixed wall colision' (#74) from Spafi/game:main into Development Spafi 2024-03-08 07:36:57 +00:00
• bd5ff8b3fe fixed wall colision added object collision for mobs SpagettiFisch 2024-03-08 08:36:13 +01:00
• 091726b8ca Merge pull request 'attack now with left mouse click' (#73) from Spafi/game:main into Development Spafi 2024-03-07 20:05:46 +00:00
• 31a9742a9c attack now with left mouse click emter conversaton now with f no change to leave conversation SpagettiFisch 2024-03-07 20:50:09 +01:00