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

156 commits

This branch
This branch
All branches
Author SHA1 Message Date
attilavs2
3ddb6d60bc Ajout du design document au repo pour les nouveaux contributeurs 2023-12-05 20:37:47 +01:00
Fcalva
8309b67ac6 Merge pull request 'Sync PR' (#3) from Slyvtt/Collab_RPG:master into master 
Reviewed-on: https://gitea.planet-casio.com/Fcalva/Collab_RPG_Fcalva/pulls/3
 2023-12-05 20:33:23 +01:00
SlyVTT
f6b8b792fd finished solving all the last warmings (unused parameters) to make the situation clear 2023-10-01 10:42:04 +02:00
Fcalva
37f9eb213b Merge pull request 'Merge' (#40) from Fcalva/Collab_RPG_Fcalva:master into master 
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/40
 2023-09-30 17:00:52 +02:00
attilavs2
1b00ef67d8 Suppresion de warnings 2023-09-30 15:18:57 +02:00
Fcalva
baf40d040e Merge pull request 'master' (#1) from Slyvtt/Collab_RPG:master into master 
Reviewed-on: https://gitea.planet-casio.com/Fcalva/Collab_RPG_Fcalva/pulls/1
 2023-09-17 13:40:46 +02:00
SlyVTT
32d364e117 corrected one remaining typo in a dialog 2023-08-26 17:15:11 +02:00
SlyVTT
53663f61ec added NPCs movement along paths + adjusted interraction system to work with moving positions 2023-08-26 17:13:05 +02:00
SlyVTT
126bd87d6e corrected some dialogs with special accentued characters and two question that were too long for fx version 2023-08-23 21:30:54 +02:00
SlyVTT
2a71edf947 adjusted .gitignore and README.md 2023-08-22 11:21:37 +02:00
SlyVTT
fd182b5f3c Some minor tuning on dialogs sequence + remove/adjust DEBUGMODE infos 2023-08-22 10:48:01 +02:00
SlyVTT
d81616ad38 separated dialogs into 1 file per map with link in tmx + created dialog sequence/kinkage system + adjusted all maps data accordingly 2023-08-22 10:39:37 +02:00
SlyVTT
4a81853505 Ok, bugs are fixed - need now to implement dialog sequence and automatic story mode 2023-08-21 22:53:33 +02:00
SlyVTT
35e173f838 first attempt of external dialogs with level0.tmx only - currently buggy - not compiling 2023-08-21 21:35:49 +02:00
SlyVTT
9c38862507 corrected a little bug in path (forgot to take the last point of the track + edited a bit maps for aesthetic reasons :D 2023-08-21 14:05:22 +02:00
SlyVTT
4dec9677ff adjusted some images to get correct upscaling on CG versions 2023-08-20 11:02:00 +02:00
SlyVTT
311ee090b0 Merge remote-tracking branch 'origin/lephe-art' into dev 2023-08-20 10:52:03 +02:00
SlyVTT
db2880dc8f Fixed NPCs path alignement and importation (thanks Lephé) 2023-08-20 10:29:10 +02:00
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
Lephenixnoir
b196419d5c
some art/font improvements + auto scaling 2023-08-19 17:33:00 +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