Fcalva/Collab_RPG
1
0
Fork 0
mirror of https://git.planet-casio.com/Slyvtt/Collab_RPG.git synced 2024-12-28 20:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
137 commits 3 branches 8 tags 2.2 MiB
Commit graph

137 commits

This branch
This branch
All branches
Author SHA1 Message Date
SlyVTT
8a7a09d960 Merge remote-tracking branch 'origin/converter-fix' into dev 2023-08-20 10:22:48 +02:00
Lephenixnoir
4eac46ee71
fix alignment of NPC xdata/ydata with fxconv workaround 
fxconv.ptr() should have an alignment parameter
 2023-08-19 23:42:48 +02:00
Fcalva
608c668b00 Merge pull request 'Debug de npc.c/coverters.py' (#35) from Fcalva/Collab_RPG_Fcalva:master into dev 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/35
 2023-08-19 15:57:16 +02:00
attilavs2
e6a677a392 avancées de debug 2023-08-19 15:53:31 +02:00
attilavs2
5b74a5e4b9 Solved TLB miss by changing bytes() to bytes("", "UTF-16") 2023-08-19 15:34:26 +02:00
Fcalva
ea3ffd8fe3 Merge pull request 'MaJ vers dev' (#4) from Slyvtt/Collab_RPG:dev into master 
Reviewed-on: https://gitea.planet-casio.com/Fcalva/Collab_RPG_Fcalva/pulls/4
 2023-08-19 14:22:08 +02:00
SlyVTT
8639a3feed added representation of NPCs + finalized path importation for NPCs - data alignement issue to be solved 2023-08-19 14:18:41 +02:00
SlyVTT
196cbb97ae tuned a bit dialogs (validate with SHIFT) + start working on NPCs path 2023-08-19 11:16:51 +02:00
SlyVTT
f56b6432f2 interaction with items of the map (NPC, INFO, SIGNS, ...) 2023-08-18 20:56:44 +02:00
Fcalva
74f0e3844d Merge pull request 'font and 64x64 icon improvements' (#34) from lephe-art into master 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/34
 2023-08-18 19:24:27 +02:00
Lephenixnoir
7d6945dd16
font and 64x64 icon improvements 2023-08-18 18:23:13 +02:00
Fcalva
07043b9209 Merge pull request 'Icones 2b au lieu de 1b' (#33) from Fcalva/Collab_RPG_Fcalva:master into master 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/33
 2023-08-18 16:46:37 +02:00
Fcalva
4679610643 Merge branch 'master' into master 2023-08-18 16:46:25 +02:00
attilavs2
13d60a6536 Ajout d'icones 2b 2023-08-18 16:44:23 +02:00
mibi88
67816ae2f3 Merge pull request 'Fixed a little displaying error in the dialog code' (#32) from mibi88/Collab_RPG-affichage-dialogues:master into master 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/32
 2023-08-18 16:14:57 +02:00
mibi88
f03281507c Fixed a little displaying error in the dialog code 2023-08-18 15:41:19 +02:00
Fcalva
f55b3b8fbf Merge pull request 'MaJ2 : Le retour' (#3) from Slyvtt/Collab_RPG:master into master 
Reviewed-on: https://gitea.planet-casio.com/Fcalva/Collab_RPG_Fcalva/pulls/3
 2023-08-18 12:44:31 +02:00
SlyVTT
8f5eb159a1 forgot EGA64 tileset in the previous commit 2023-08-18 12:41:22 +02:00
SlyVTT
6040652f92 converted CG images into P8 so save some (few) Kb on ROM 2023-08-18 12:31:03 +02:00
Fcalva
5775488575 Merge pull request 'Nouveaux icones EGA64 pour CG' (#31) from Fcalva/Collab_RPG_Fcalva:master into master 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/31
 2023-08-17 22:37:39 +02:00
attilavs2
fccac648e4 Amélioration + conversion EGA64 des icones 2023-08-17 22:34:04 +02:00
Fcalva
4193026e25 Merge pull request 'MaJ' (#2) from Slyvtt/Collab_RPG:master into master 
Reviewed-on: https://gitea.planet-casio.com/Fcalva/Collab_RPG_Fcalva/pulls/2
 2023-08-17 19:47:41 +02:00
SlyVTT
4786d3cddc major refactoring of folders structure + added new icons for each version of the game 2023-08-17 18:43:55 +02:00
Fcalva
9f9c782c79 Merge pull request 'Ajout de ma fiche de sprites' (#30) from Fcalva/Collab_RPG_Fcalva:master into master 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/30
 2023-08-17 14:30:13 +02:00
attilavs2
6b4d143910 Ajout de mes sprites 2b version fx et cg 2023-08-17 10:49:06 +02:00
Fcalva
e394b69196 Merge pull request 'MaJ de la fork' (#1) from Slyvtt/Collab_RPG:master into master 
Reviewed-on: https://gitea.planet-casio.com/Fcalva/Collab_RPG_Fcalva/pulls/1
 2023-08-17 10:15:14 +02:00
SlyVTT
ad525b8693 Corrected bug regarding interactions with items in maps - used local coordinates instead of world coordinates :( 2023-08-17 07:11:52 +02:00
SlyVTT
9d8464e0d5 added items on all maps - one bug to be corrected with coodinates 2023-08-16 23:12:16 +02:00
SlyVTT
a5328d0be6 Added support for Player actions and interaction with the items within the map 2023-08-16 19:36:31 +02:00
SlyVTT
47b8bfa25a implementing the basis of player action 2023-08-16 19:25:24 +02:00
SlyVTT
c5975889bc Added importation of ExtraData from ObjectLayer in Tiled TMX files 2023-08-16 17:34:45 +02:00
SlyVTT
6075e47ba8 try to import Extra Data from world and maps 2023-08-15 16:50:51 +02:00
SlyVTT
df33d2f090 added a new 1bit (N&B) target for CG to test the maps in the emulator 2023-08-15 12:55:06 +02:00
SlyVTT
217221cd6c added a verification on walkability of the target tile on next map 2023-08-14 21:15:38 +02:00
SlyVTT
f895171e40 Merge branch 'dev' 2023-08-14 20:49:01 +02:00
SlyVTT
cb24bee3f8 implementation of map change during gameplay by crossing map borders 2023-08-14 20:46:51 +02:00
SlyVTT
272d60b0aa preparing stuff for map change when reaching borders during gameplay 2023-08-14 18:40:36 +02:00
mibi88
bbb415df15 Merge pull request 'Fixed a bug when displaying 3 choices.' (#28) from mibi88/Collab_RPG-affichage-dialogues:master into master 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/28
 2023-08-11 12:31:16 +02:00
mibi88
d4fc8db489 Fixed a bug when displaying 3 choices. 2023-08-11 12:23:07 +02:00
SlyVTT
e012e5a428 A loooooooot of refactoring to make the function calls easier and more consistant 2023-08-11 08:54:04 +02:00
SlyVTT
1bf630dfcb refactor structures to pack everything in typedef struct Game 2023-08-11 08:04:17 +02:00
Lephenixnoir
fe2492b7de
fix buggy access to converted map 2023-08-10 18:33:17 +02:00
SlyVTT
16a198bc64 try to find the source of the bug (need to get map data correctly filled) in map with converter.py 2023-08-10 16:22:31 +02:00
SlyVTT
d84fd7f886 Cleaned CMakeLists.txt 2023-08-08 09:52:34 +02:00
SlyVTT
53b0ddf750 converter.py correctly reads and treat maps in world file (importation into data structure in C files not fully working yet 2023-08-08 09:46:07 +02:00
SlyVTT
7d04e62848 corrected maps + start implementing world with multiple maps 2023-08-03 21:55:51 +02:00
SlyVTT
f805cf7b16 added map level3.tmx 2023-08-03 08:11:39 +02:00
SlyVTT
5e0612f7ec corrected maps level1.tmx and level2.tmx to get correct split per layer 2023-08-02 19:37:29 +02:00
SlyVTT
d3684acaed clean mapstruct.h from useless structures 2023-08-01 22:39:21 +02:00
SlyVTT
e0e4140c9b Made map importation from tmx a bit cleaner + map structure slightly lighter 2023-08-01 22:26:59 +02:00