259 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
mibi88	b5759bd95d	Merge remote-tracking branch 'origin/dev'	2024-08-01 11:02:17 +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
attilavs2	b46545b562	Unlock level0 and restore visibility of layers	2024-07-31 18:32:49 +02:00
attilavs2	766c222320	Improve tileset, polish maps	2024-07-31 18:30:15 +02:00
mibi88	5d4a862620	Running clang-format	2024-07-31 17:27:23 +02:00
mibi88	3dbf00f53d	Bug fixes	2024-07-31 17:26:08 +02:00
mibi88	bbf366ed6e	Running clang-format	2024-07-31 17:12:12 +02:00
mibi88	3dd4b6466a	Map change working	2024-07-31 17:11:29 +02:00
mibi88	aa448c4dc6	Smoother NPC movement	2024-07-31 14:46:39 +02:00
mibi88	490fceca25	Running clang-format	2024-07-31 14:39:09 +02:00
mibi88	6cfe0ab687	Got NPCs working again!	2024-07-31 14:38:29 +02:00
mibi88	6ab37ee4fb	NPCs nearly working	2024-07-31 14:12:55 +02:00
mibi88	dfb61f18fe	Started adding NPCs back to the game	2024-07-31 13:53:47 +02:00
mibi88	da63b8ce06	Added sign support back	2024-07-31 12:54:40 +02:00
mibi88	563ed47753	Moved parts of the converter to another file	2024-07-31 12:06:00 +02:00
mibi88	ea50bed171	Running clang-format	2024-07-30 22:47:40 +02:00
mibi88	91e0e4b74d	Adding back dialog support. Not tested yet, because NPCs are not added back yet.	2024-07-30 22:37:04 +02:00
mibi88	efde68f9c7	Got map rendering back working	2024-07-30 20:15:39 +02:00
mibi88	537e4d5e96	Run clang format	2024-07-30 18:21:22 +02:00
mibi88	2202ec6d38	Merge dev into new_converter	2024-07-30 18:19:49 +02:00
attilavs2	1daa58723c	Optimisation du rendu	2024-07-30 17:49:40 +02:00
mibi88	bc8382ac65	Started writing a new converter	2024-07-30 17:44:12 +02:00
mibi88	5eb1d18ea7	Small improvement	2024-07-29 21:08:55 +02:00
mibi88	2ca939430d	Better .clang-format (maybe I added some useless things: I don't know what the LLVM style sets the settings to)	2024-07-29 21:04:23 +02:00
mibi88	84d83d85c0	Update styles	2024-07-29 11:39:58 +02:00
mibi88	dafe7032f3	Using clang-format	2024-07-29 11:36:11 +02:00
attilavs2	a06977469c	Remove debug hint breaking everything	2024-07-29 10:59:58 +02:00
attilavs2	9efb47c3b6	Revert "Continue debugging of converters.py" ... This reverts commit 499856e38c.	2024-07-28 23:20:19 +02:00
attilavs2	499856e38c	Continue debugging of converters.py	2024-07-28 23:19:44 +02:00
attilavs2	522f6d25a8	Remove silly goofy string breaking everything	2024-07-28 23:08:56 +02:00
attilavs2	f29fbf73de	Add gdb support if DEBUGMODE is enabled	2024-07-28 22:08:32 +02:00
mibi88	eb6cd35830	Small fix.	2024-07-28 22:06:54 +02:00
mibi88	18ee9bcffe	Updated styles.	2024-07-28 22:05:49 +02:00
attilavs2	32764e675a	Alignement entre converters.py et game.h	2024-07-28 22:03:11 +02:00
attilavs2	82a519659d	Debug de ExtraData 2.0	2024-07-28 21:04:26 +02:00
mibi88	cac86e35ff	Added level4 to the game	2024-07-28 16:20:04 +02:00