Commit Graph

26 Commits

Author SHA1 Message Date
Eljakim Herrewijnen
2efdaf8aee Added a logic to add items to the inventory 2020-10-10 22:23:11 +02:00
EljakimHerrewijnen
7ae1e86f9d basic scene switching added 2020-10-08 21:56:03 +02:00
EljakimHerrewijnen
bf2a5b8cf1 Started working on DB interaction 2020-10-07 22:24:10 +02:00
Jonathan Herrewijnen
8c9cc7e31d Inventory now interactive 2020-10-06 15:19:38 +02:00
EljakimHerrewijnen
0a1ea67500 Works again 2020-10-06 14:05:40 +02:00
EljakimHerrewijnen
be32ae730c Fixed unresolved merge conflicts 2020-10-06 14:03:54 +02:00
Jonathan Herrewijnen
658bad4ddf Faulty push, Home2.tscn probably broken? 2020-10-06 13:27:43 +02:00
Jonathan Herrewijnen
ce2887b89f Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces 2020-10-06 13:26:46 +02:00
EljakimHerrewijnen
70f2ae010a Started Inventory screen 2020-10-03 19:01:48 +02:00
Jonathan Herrewijnen
ea1793a270 Trying to fix merge 2020-10-03 16:07:27 +02:00
Jonathan Herrewijnen
0d089b391c Semi working inventory, part 2 still to do. Changed all textures to without filter, to increase pixelated look of the pixel art. 2020-10-03 16:00:15 +02:00
EljakimHerrewijnen
9841ce41a7 Added interaction map 2020-10-03 14:49:11 +02:00
EljakimHerrewijnen
a6fc79e22d Added buttons, pushing before cleanup 2020-10-03 14:13:19 +02:00
Jonathan Herrewijnen
07c7e435d5 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces 2020-10-03 12:31:50 +02:00
Eljakim Herrewijnen
8a90a39292 Press your spacebar 2020-10-02 22:55:51 +02:00
Jonathan Herrewijnen
e2f492cb2f Letterlijk enkel de knoppen recht gezet =) 2020-09-26 21:52:06 +02:00
EljakimHerrewijnen
8999e2e4a8 No major updates 2020-09-24 21:34:34 +02:00
EljakimHerrewijnen
fee3de7544 camera update 2020-09-23 10:50:07 +02:00
root
bc2be621c7 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces
Merging work from 21 September.
2020-09-22 10:07:54 +02:00
root
d79aab7a7e Changed font, added loading tumbling ring 2020-09-22 10:07:03 +02:00
Eljakim Herrewijnen
d3fa1a41b0 Update to camera movement 2020-09-21 23:13:11 +02:00
EljakimHerrewijnen
c5aa58c16d Camera Animation works now 2020-09-21 21:25:56 +02:00
EljakimHerrewijnen
5e5547f4a2 Seperated camera from player 2020-09-21 20:45:28 +02:00
EljakimHerrewijnen
b65ed88772 Added menu 2020-09-21 15:18:10 +02:00
root
58ffd327a8 Started Inventory. CharacterUI mainly done 2020-08-31 09:35:52 +02:00
Theamerix
a4abb2a452 first commit 2020-08-29 16:36:49 +02:00