Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• d6213796b1 Updating to godot 4 - v1 master JonathanHerrewijnen 2023-03-25 21:42:54 +0100
• 3ddb5c526a Trying to pick up project again Jonathan Herrewijnen 2022-12-07 22:15:07 +0100
• d275f97bf7 Again reworking map loading system. Some progress Jonathan Herrewijnen 2022-10-27 22:34:41 +0200
• eb513f9db9 Children are not added Jonathan Herrewijnen 2022-10-17 23:29:08 +0200
• 91d651b3f3 Have not figured out the tile map interaction part.. Jonathan Herrewijnen 2022-10-17 21:02:44 +0200
• 7ee29cbe98 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces Jonathan Herrewijnen 2022-10-15 21:34:12 +0200
• 6a9483042b Working on tilemap Jonathan Herrewijnen 2022-10-15 21:33:54 +0200
• 95b05c3603 Test commit Jonathan Herrewijnen 2022-10-15 13:30:39 +0200
• 4d6ac271c0 Fixing bug Jonathan Herrewijnen 2022-10-13 17:35:43 +0200
• 645b252da9 Adding global variables Jonathan Herrewijnen 2022-10-13 17:09:42 +0200
• 57b312a3a5 Working on tilemap Jonathan Herrewijnen 2022-10-12 22:52:13 +0200
• ca715ff994 Working on tilemap Jonathan Herrewijnen 2022-10-12 20:06:51 +0200
• 6529ed8b65 Changed sound behaviour. Working on interaction map. Jonathan Herrewijnen 2022-10-11 19:21:46 +0200
• 22b3c5a53f Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces Jonathan Herrewijnen 2022-10-10 22:13:49 +0200
• 4b4306f6d5 Testing commits for activity tracker Jonathan Herrewijnen 2022-10-10 22:13:22 +0200
• e5d410d3ea 'MiscCodes/loading_ring.gd' updaten Jonathan Herrewijnen 2022-10-10 19:44:10 +0000
• 79387ea1dd Testing commits for activity tracker Jonathan Herrewijnen 2022-10-10 21:37:48 +0200
• a7eb33d3b4 Testing commit on herreweb to see if username is right Jonathan Herrewijnen 2022-10-10 21:15:51 +0200
• ed06c37822 Cleaning up. Changed tile and scene loading. Still not able to pick up items from vegetation/interaction layer. Jonathan Herrewijnen 2022-10-08 20:42:29 +0200
• c9394f7813 Cleanup101, see wiki for more details Jonathan Herrewijnen 2022-01-15 22:25:42 +0100
• 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. Jonathan Herrewijnen 2021-11-20 23:48:39 +0100
• 47926604fa Game is working again. Map is loaded and (I think) replaces current enty maps. Exporting to android not yet working. Jonathan Herrewijnen 2021-09-04 17:29:04 +0200
• 5e684de4c3 Changing back to tiled based maps JonathanHerrewijnen 2021-08-26 16:52:21 +0200
• 52eaa3c498 Added sound JonathanHerrewijnen 2021-06-04 22:57:48 +0200
• 73c763343b Upload files to 'omgeving/vloer32x32' IthamarHerrewijnen 2021-06-04 10:14:57 +0000
• c2d272d6db Upload files to 'story' IthamarHerrewijnen 2021-06-04 10:14:20 +0000
• 0d8f6c4fc5 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces JonathanHerrewijnen 2021-05-28 23:43:15 +0200
• 578f9111cf +Sound JonathanHerrewijnen 2021-05-28 23:41:35 +0200
• d336b228b6 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces Eljakim Herrewijnen 2021-05-28 23:02:12 +0200
• cc8c7ba477 Added game functions and bubble speech Eljakim Herrewijnen 2021-05-28 23:01:56 +0200
• f0bb7044ef added map and inv icons IthamarHerrewijnen 2021-05-28 22:00:33 +0200
• 8f3e13e532 Added dynamically loading for inventory Eljakim Herrewijnen 2021-05-26 22:59:30 +0200
• 8b8baeba87 Added castledb plugin Eljakim Herrewijnen 2021-05-26 22:02:51 +0200
• 9163506487 Added dynamically loading and gitignore Eljakim Herrewijnen 2021-04-25 12:36:01 +0200
• fccf163a4a Prepare for dynamically loading worlds Eljakim Herrewijnen 2021-04-23 22:16:43 +0200
• 7a89f57ee5 added way to load savegames Eljakim Herrewijnen 2021-04-15 22:14:31 +0200
• bbc1e6f24e Basic saving of inventory works Eljakim Herrewijnen 2021-04-08 22:58:04 +0200
• 285ee79e16 Fixed preloading of add on Eljakim Herrewijnen 2021-04-08 21:43:34 +0200
• 0f6876f96f Latest changes. Working on animations. Jonathan Herrewijnen 2021-04-08 21:18:46 +0200
• 3d382a9833 Resolving 2 errors Jonathan Herrewijnen 2021-04-05 23:17:34 +0200
• e35ec33079 Added some objects. Changed storage to being in user://storage.db. And cleaned up some mess in the project folder. Theamerix 2021-04-05 23:02:20 +0200
• 285cb8d096 Added some objects. Changed storage to being on user://storage.db. And cleaned up the project folder. Jonathan Herrewijnen 2021-04-05 22:59:49 +0200
• b7631b694f merged Theamerix 2021-04-03 20:32:38 +0200
• b5cf67a40d Updated cameraview Theamerix 2021-04-03 20:30:33 +0200
• 3e312b70e0 merged Theamerix 2021-04-03 20:29:34 +0200
• a86a5ed396 merge Eljakim Herrewijnen 2021-04-03 16:09:02 +0200
• 217d4b27a1 Revert from public gitea to normal one. Also added fps counter Eljakim Herrewijnen 2021-04-03 16:06:23 +0200
• a80ce4e53e Changed interaction map and added vegetation layer root 2021-04-02 23:24:35 +0200
• 359613895b Working semi animation when picking berries! root 2020-10-23 22:05:47 +0200
• a3743007c2 Almost working animations for picking up items root 2020-10-19 22:44:21 +0200
• 2efdaf8aee Added a logic to add items to the inventory Eljakim Herrewijnen 2020-10-10 22:23:11 +0200
• 7ae1e86f9d basic scene switching added EljakimHerrewijnen 2020-10-08 21:56:03 +0200
• bf2a5b8cf1 Started working on DB interaction EljakimHerrewijnen 2020-10-07 22:24:10 +0200
• 8c9cc7e31d Inventory now interactive Jonathan Herrewijnen 2020-10-06 15:19:38 +0200
• 0a1ea67500 Works again EljakimHerrewijnen 2020-10-06 14:05:40 +0200
• be32ae730c Fixed unresolved merge conflicts EljakimHerrewijnen 2020-10-06 14:03:54 +0200
• 658bad4ddf Faulty push, Home2.tscn probably broken? Jonathan Herrewijnen 2020-10-06 13:27:43 +0200
• ce2887b89f Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces Jonathan Herrewijnen 2020-10-06 13:26:46 +0200
• 70f2ae010a Started Inventory screen EljakimHerrewijnen 2020-10-03 19:01:48 +0200
• ea1793a270 Trying to fix merge Jonathan Herrewijnen 2020-10-03 16:07:27 +0200
• 0d089b391c Semi working inventory, part 2 still to do. Changed all textures to without filter, to increase pixelated look of the pixel art. Jonathan Herrewijnen 2020-10-03 16:00:15 +0200
• 9841ce41a7 Added interaction map EljakimHerrewijnen 2020-10-03 14:49:11 +0200
• a6fc79e22d Added buttons, pushing before cleanup EljakimHerrewijnen 2020-10-03 14:13:19 +0200
• 07c7e435d5 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces Jonathan Herrewijnen 2020-10-03 12:31:50 +0200
• 8a90a39292 Press your spacebar Eljakim Herrewijnen 2020-10-02 22:55:51 +0200
• e2f492cb2f Letterlijk enkel de knoppen recht gezet =) Jonathan Herrewijnen 2020-09-26 21:52:06 +0200
• 8999e2e4a8 No major updates EljakimHerrewijnen 2020-09-24 21:34:34 +0200
• fee3de7544 camera update EljakimHerrewijnen 2020-09-23 10:50:07 +0200
• bc2be621c7 Merge branch 'master' of https://git.herreweb.nl/JonathanHerrewijnen/RingOfRaces Merging work from 21 September. root 2020-09-22 10:07:54 +0200
• d79aab7a7e Changed font, added loading tumbling ring root 2020-09-22 10:07:03 +0200
• d3fa1a41b0 Update to camera movement Eljakim Herrewijnen 2020-09-21 23:13:11 +0200
• c5aa58c16d Camera Animation works now EljakimHerrewijnen 2020-09-21 21:25:56 +0200
• 5e5547f4a2 Seperated camera from player EljakimHerrewijnen 2020-09-21 20:45:28 +0200
• b65ed88772 Added menu EljakimHerrewijnen 2020-09-21 15:18:10 +0200
• 58ffd327a8 Started Inventory. CharacterUI mainly done root 2020-08-31 09:35:52 +0200
• a4abb2a452 first commit Theamerix 2020-08-29 16:36:49 +0200