Commit Graph

56 Commits

Author SHA1 Message Date
f89c286a9d Updated folder structure, got rid of some garbage code. Changed how scenes are loaded, child nodes are added and removed. Maps are now portable. 2021-11-20 23:48:39 +01:00
47926604fa Game is working again. Map is loaded and (I think) replaces current enty maps. Exporting to android not yet working. 2021-09-04 17:29:04 +02:00
JonathanHerrewijnen
5e684de4c3 Changing back to tiled based maps 2021-08-26 16:52:21 +02:00
JonathanHerrewijnen
52eaa3c498 Added sound 2021-06-04 22:57:48 +02:00
73c763343b Upload files to 'omgeving/vloer32x32' 2021-06-04 10:14:57 +00:00
c2d272d6db Upload files to 'story' 2021-06-04 10:14:20 +00:00
JonathanHerrewijnen
0d8f6c4fc5 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces 2021-05-28 23:43:15 +02:00
JonathanHerrewijnen
578f9111cf +Sound 2021-05-28 23:41:35 +02:00
Eljakim Herrewijnen
d336b228b6 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces 2021-05-28 23:02:12 +02:00
Eljakim Herrewijnen
cc8c7ba477 Added game functions and bubble speech 2021-05-28 23:01:56 +02:00
f0bb7044ef added map and inv icons 2021-05-28 22:00:33 +02:00
Eljakim Herrewijnen
8f3e13e532 Added dynamically loading for inventory 2021-05-26 22:59:30 +02:00
Eljakim Herrewijnen
8b8baeba87 Added castledb plugin 2021-05-26 22:02:51 +02:00
Eljakim Herrewijnen
9163506487 Added dynamically loading and gitignore 2021-04-25 12:36:01 +02:00
Eljakim Herrewijnen
fccf163a4a Prepare for dynamically loading worlds 2021-04-23 22:16:43 +02:00
Eljakim Herrewijnen
7a89f57ee5 added way to load savegames 2021-04-15 22:14:31 +02:00
Eljakim Herrewijnen
bbc1e6f24e Basic saving of inventory works 2021-04-08 22:58:04 +02:00
Eljakim Herrewijnen
285ee79e16 Fixed preloading of add on 2021-04-08 21:43:34 +02:00
0f6876f96f Latest changes. Working on animations. 2021-04-08 21:18:46 +02:00
3d382a9833 Resolving 2 errors 2021-04-05 23:17:34 +02:00
Theamerix
e35ec33079 Added some objects. Changed storage to being in user://storage.db. And cleaned up some mess in the project folder. 2021-04-05 23:02:20 +02:00
285cb8d096 Added some objects. Changed storage to being on user://storage.db. And cleaned up the project folder. 2021-04-05 22:59:49 +02:00
Theamerix
b7631b694f merged 2021-04-03 20:32:38 +02:00
Theamerix
b5cf67a40d Updated cameraview 2021-04-03 20:30:33 +02:00
Theamerix
3e312b70e0 merged 2021-04-03 20:29:34 +02:00
Eljakim Herrewijnen
a86a5ed396 merge 2021-04-03 16:09:02 +02:00
Eljakim Herrewijnen
217d4b27a1 Revert from public gitea to normal one. Also added fps counter 2021-04-03 16:06:23 +02:00
root
a80ce4e53e Changed interaction map and added vegetation layer 2021-04-02 23:24:35 +02:00
root
359613895b Working semi animation when picking berries! 2020-10-23 22:05:47 +02:00
root
a3743007c2 Almost working animations for picking up items 2020-10-19 22:44:21 +02:00
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