mibi88
|
e4be83213b
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-08-03 16:02:05 +02:00 |
|
mibi88
|
e15109b220
|
Using doxygen
|
2024-08-03 16:02:01 +02:00 |
|
attilavs2
|
b96e5b6a3f
|
MaJ du design doc
|
2024-08-03 13:59:45 +02:00 |
|
attilavs2
|
98c52fe29e
|
Revert "assets : Suppression de WorldRPG, devenu inutile"
This reverts commit a31beb9ce7 .
|
2024-08-03 12:51:51 +02:00 |
|
attilavs2
|
a31beb9ce7
|
assets : Suppression de WorldRPG, devenu inutile
|
2024-08-03 10:48:47 +02:00 |
|
attilavs2
|
1a652762e3
|
assets-fx : Correction du tileset 1b
|
2024-08-02 23:31:04 +02:00 |
|
attilavs2
|
c003e16729
|
assets-fx : Correction du tileset 2b
|
2024-08-02 23:28:41 +02:00 |
|
mibi88
|
a27ad9a14f
|
Ran clang-format
|
2024-08-02 18:29:56 +02:00 |
|
mibi88
|
fe824d7340
|
Inventory management.
|
2024-08-02 18:29:27 +02:00 |
|
mibi88
|
b26cf53e91
|
Inventory item selection.
|
2024-08-02 16:14:04 +02:00 |
|
mibi88
|
5dab7f9f18
|
Cleaner inventory rendering
|
2024-08-02 12:59:10 +02:00 |
|
mibi88
|
311b7f27df
|
Ran clang-format
|
2024-08-01 23:09:43 +02:00 |
|
mibi88
|
d555c5be6f
|
Started inventory rendering.
|
2024-08-01 23:09:04 +02:00 |
|
mibi88
|
4d2eb2e8de
|
Graphics for the inventory.
|
2024-08-01 20:05:28 +02:00 |
|
mibi88
|
04d4c9e31e
|
Cleaner enums with clang-format.
|
2024-08-01 19:14:29 +02:00 |
|
mibi88
|
771d844bc4
|
Ran clang-format.
|
2024-08-01 19:11:11 +02:00 |
|
mibi88
|
ad902217ea
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-08-01 19:08:51 +02:00 |
|
mibi88
|
cce7209221
|
Starting to add the inventory.
|
2024-08-01 19:08:47 +02:00 |
|
attilavs2
|
b3b31bcfcd
|
assets : Coloriage du tileset intérieur (oubli de sauvegarde)
|
2024-08-01 19:05:50 +02:00 |
|
attilavs2
|
4b636bb428
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-08-01 18:35:43 +02:00 |
|
attilavs2
|
a8ff55c1cf
|
npc : Fix NPC_STACK_SIZE qui était trop gros pour fx
|
2024-08-01 18:34:36 +02:00 |
|
mibi88
|
755ed1a1a8
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-08-01 17:57:35 +02:00 |
|
mibi88
|
6f16556fb4
|
Cleanup + bug fix + assets for fx
|
2024-08-01 17:57:15 +02:00 |
|
attilavs2
|
5cc9216155
|
Fix warnings and clang-format
|
2024-08-01 17:48:10 +02:00 |
|
attilavs2
|
322610d723
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-08-01 17:40:00 +02:00 |
|
attilavs2
|
a86462fdb2
|
npc : Functional npc_stack
|
2024-08-01 17:37:42 +02:00 |
|
mibi88
|
6c5641e5e9
|
Added NPC animation.
|
2024-08-01 17:37:20 +02:00 |
|
mibi88
|
a8294d3542
|
Add animation support
|
2024-08-01 16:47:53 +02:00 |
|
attilavs2
|
0f887ea419
|
rendu : Suppresion de dclear()s non nécéssaires
|
2024-08-01 15:28:49 +02:00 |
|
attilavs2
|
9fc15af523
|
Fix merge issues
|
2024-08-01 15:21:54 +02:00 |
|
attilavs2
|
86bb0a9cfc
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-08-01 15:10:55 +02:00 |
|
attilavs2
|
fd28af1005
|
npc : Ajout de npc_stack et réecriture des fonctions + Résolution de warnings
|
2024-08-01 15:05:42 +02:00 |
|
mibi88
|
3170f25e91
|
Added a NPC to the taverne. Polygons are now valid paths.
|
2024-08-01 13:27:16 +02:00 |
|
mibi88
|
e581fd31b1
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-08-01 13:04:54 +02:00 |
|
mibi88
|
1177626b3c
|
Indoor maps
|
2024-08-01 13:04:20 +02:00 |
|
attilavs2
|
6c47d5d83c
|
Revert "git : Ajout de level*.json au gitignore"
This reverts commit 7eaea821b6 .
|
2024-08-01 00:11:48 +02:00 |
|
attilavs2
|
3f03c37bd2
|
clang-format sur src/* (+ hook clang-format ?)
|
2024-08-01 00:01:34 +02:00 |
|
attilavs2
|
7eaea821b6
|
git : Ajout de level*.json au gitignore
|
2024-07-31 23:53:21 +02:00 |
|
mibi88
|
40bfea66aa
|
Merge pull request 'Add portal support' (#61) from portals into dev
Reviewed-on: https://git.planet-casio.com/Slyvtt/Collab_RPG/pulls/61
|
2024-07-31 22:22:26 +02:00 |
|
mibi88
|
a3d0ca40c1
|
Added portal support
|
2024-07-31 22:21:34 +02:00 |
|
mibi88
|
48f1f44b5b
|
Converting portals. Not tested yet.
|
2024-07-31 21:57:37 +02:00 |
|
mibi88
|
d34398f9b9
|
Added back Fcalva's new assets
|
2024-07-31 20:30:15 +02:00 |
|
mibi88
|
2692b928c3
|
Fixed submodule
|
2024-07-31 20:16:44 +02:00 |
|
mibi88
|
0e46c490ae
|
Restore everything...
|
2024-07-31 20:10:45 +02:00 |
|
mibi88
|
6b1289f46d
|
revert 159e65a1c8
revert revert 84f85e1905
revert Merge branch 'new_converter' into dev
|
2024-07-31 19:52:25 +02:00 |
|
mibi88
|
159e65a1c8
|
revert 84f85e1905
revert Merge branch 'new_converter' into dev
|
2024-07-31 19:38:33 +02:00 |
|
mibi88
|
8758202431
|
Merge branch 'dev' of git.planet-casio.com:Slyvtt/Collab_RPG into dev
|
2024-07-31 19:35:02 +02:00 |
|
mibi88
|
84f85e1905
|
Merge branch 'new_converter' into dev
|
2024-07-31 19:21:32 +02:00 |
|
mibi88
|
a1811da9f1
|
Added some comments.
|
2024-07-31 18:53:46 +02:00 |
|
mibi88
|
e801bb5632
|
Moved tiled lib to a separate repository
|
2024-07-31 18:44:02 +02:00 |
|