Commit graph

155 commits

Author SHA1 Message Date
SlyVTT
66a66bae91 split map into Background and Foreground layers + added transparency for foreground layer (CG only at present) + split rendering layer by layer 2023-07-10 19:35:22 +02:00
SlyVTT
6ec5895acc corrected a bug on CG that make impossible to reach certain position on screen + added some non walkable tiles on map 2023-07-10 13:11:35 +02:00
mibi88
c7008cc4d1 Player position fix for cg version 2023-07-09 22:20:53 +02:00
mibi88
32d40773ac Merge branch 'master' of gitea.planet-casio.com:Slyvtt/Collab_RPG 2023-07-09 22:05:22 +02:00
mibi88
474aa17573 Collisions are now entirely working, started implementing dialogs (I know currently it is only an animation and a little message that it is not implemented). 2023-07-09 22:02:59 +02:00
SlyVTT
396c9c9bfe code made complaitn with the 'max 80-char per line' rule 2023-07-09 21:53:07 +02:00
SlyVTT
05f3f8ff4f recover Mibi's README.md 2023-07-09 20:55:20 +02:00
SlyVTT
a7d6e8f2d7 added a layer Walkable in Tiled level0.tmx, importation in fxconv + dedicated walkable array in Map struct 2023-07-09 20:27:22 +02:00
mibi88
7913b336b7 Collisions are finally completely working
Fixed collisions, only items in the hard tiles array are missing, but they can be easily filled with Fcalva's list.
2023-07-09 16:17:33 +02:00
mibi88
48854d5108 Merge branch 'master' of gitea.planet-casio.com:Slyvtt/Collab_RPG 2023-07-09 16:15:13 +02:00
mibi88
86430b853a Collisions are now completely working, just need to fill the array of all tiles where the player can't go through. 2023-07-09 15:45:46 +02:00
mibi88
83b37d8abf Merge pull request 'Finition du premier jet du tileset couleur' (#19) from Fcalva/Collab_RPG_Fcalva3:master into master
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/19
2023-07-09 15:08:47 +02:00
d771f2ed39 Finition du premier jet du tileset couleur 2023-07-09 14:00:17 +02:00
mibi88
6afde39af8 \o/ The collisions are working PERFECTLY now except on the borders of the map! \o/ 2023-07-09 13:37:49 +02:00
mibi88
909e0760c5 Collisions are not sticky anymore and the player can't go trough the blocks but he is shaking when you collide with a wall and is not stopped by the borders of the map. 2023-07-09 13:22:20 +02:00
mibi88
9a85dfc20b Tileset en couleur en utilisant la palette EGA64 de Fcalva
Le CMakeLists.txt est fonctionnel et on peut choisir entre le tileset 2b et celui EGA64, j'ai testé les deux sur CG donc ça devrait être bon !
2023-07-09 12:42:19 +02:00
mibi88
50d32811a0 Fixed CMakeLists.txt to be able to choose between the color and the 2b tileset on the CG 2023-07-09 12:39:08 +02:00
mibi88
a1b6a5d697 Merge pull request 'Tileset couleur' (#16) from Fcalva/Collab_RPG_Couleur_CG:master into tileset-couleur
Bon, je merge ça dans une branche séparée pour l'implémenter correctement.
2023-07-09 11:29:52 +02:00
84f2f80cb0 J'avais oublié d'exporter ^^' 2023-07-09 10:42:54 +02:00
0baa26c142 Delete 'assets-cg/tilesetEGA_CG.xcf' 2023-07-09 10:35:34 +02:00
8783e0e796 Tileset couleur 2023-07-09 10:30:27 +02:00
SlyVTT
9666d21ec1 corrected Player struct to avoid char overflow on CG (resolution is 396px wide > 255 (so out of bound for char) 2023-07-08 23:02:57 +02:00
SlyVTT
8258bc7bb8 corrected tile issue with full map 2023-07-08 22:48:46 +02:00
SlyVTT
4b419694fc added a full map 25x14 tiles + start a Tile_Data structure for collision 2023-07-08 22:39:06 +02:00
Sylvain PILLOT
4b27ca950f Merge pull request 'Collision management' (#15) from mibi88/Collab_RPG-collisions:master into master
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/15
2023-07-08 21:24:26 +02:00
mibi88
23dde6593c Improved collisions and CG port. Still need to make the collisions less sticky. 2023-07-08 20:07:34 +02:00
mibi88
3fdc9fffe6 Merge branch 'master' into master 2023-07-08 18:43:47 +02:00
mibi88
cb452383ad Fixed a little filename error 2023-07-08 18:02:05 +02:00
mibi88
c90a80d5c9 Merge branch 'master' into master 2023-07-08 17:46:18 +02:00
mibi88
a16679bcd6 Fixed a bad file name 2023-07-08 17:45:35 +02:00
mibi88
ec5dcf281d Merge branch 'master' into master 2023-07-08 17:27:08 +02:00
mibi88
227e688243 Mise à jour du tileset avec les dernières corrections de Shadow
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/13
2023-07-08 17:25:54 +02:00
Shadow15510
0050c2ddf8 Update Shadow's master branch 2023-07-08 17:24:17 +02:00
mibi88
f40e07d847 Update mibi88-master 2023-07-08 16:59:48 +02:00
mibi88
a857091f74 Merge branch 'master' into master 2023-07-08 16:58:41 +02:00
mibi88
94b2187ad4 Added some comments. 2023-07-08 16:57:04 +02:00
mibi88
8d316d0d0d Collisions are working :D! I only need to add a framerate limit and add some comments, then everything will be good to merge! 2023-07-08 16:40:25 +02:00
mibi88
908b971317 Restructured a lot of things. Collisions are not working properly but I'll fix that 2023-07-08 15:55:06 +02:00
Shadow15510
47190712d5 Fix the right border of the window 2023-07-08 13:58:35 +02:00
SlyVTT
60c26b8c22 merged Shadow's PR - Brand New B&W Tileset 2023-07-08 13:16:49 +02:00
Sylvain PILLOT
1bfaf75a78 Merge pull request '1-bit tileset' (#10) from Shadow/Collab_RPG:master into master
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/10
2023-07-08 12:57:23 +02:00
Shadow15510
b7b602125b Finishing a first proposal of W&B tileset 2023-07-08 11:40:54 +02:00
Shadow15510
70d6dd62b4 Progress of the W&B tileset 2023-07-08 11:14:45 +02:00
SlyVTT
c87580130d added speed parameter for player 2023-07-07 19:26:14 +02:00
SlyVTT
ac9f17bd75 corrected Tileset for CG taht was upscaled with interpolation and was provoking glitches 2023-07-07 18:32:08 +02:00
SlyVTT
f0417bee16 merged MiBi88's work on map movement and rendering + FCalva's work on adding a target for fxCG50 2023-07-07 18:22:39 +02:00
Sylvain PILLOT
78d45a1e78 Merge pull request 'Better map displaying :)' (#7) from mibi88/Collab_RPG-map-displaying:master into master
Reviewed-on: https://gitea.planet-casio.com/Slyvtt/Collab_RPG/pulls/7

This is now merged into master.

Thanks Mb88
2023-07-07 17:04:41 +02:00
mibi88
d3f1e55422 The map displaying is now SUPER fast 2023-07-07 14:50:30 +02:00
Shadow15510
2df10f8d62 Begenning of the W&B tileset redesign 2023-07-07 14:33:51 +02:00
mibi88
9818d835be Restructured some stuff, now the map is scrolling :), but some optimizations are needed! 2023-07-07 14:20:13 +02:00