136 Commits

Author	SHA1	Message	Date
Blue (Lukas Rieger)	73c4151ef2	Merge branch 'mc/1.13'	2020-04-20 12:34:53 +02:00
Blue (Lukas Rieger)	ba69d26c85	Fix loading and saving of markers.json to correctly merge changes	2020-04-20 12:33:55 +02:00
Blue (Lukas Rieger)	6acc75674c	Merge branch 'feature/marker' into mc/1.13	2020-04-19 20:13:02 +02:00
Blue (Lukas Rieger)	d8e189528e	Implement MarkerAPI	2020-04-19 20:12:37 +02:00
Blue (Lukas Rieger)	2cbff3ccdb	Complete implementing markers on the web-client	2020-04-17 14:56:30 +02:00
Blue (Lukas Rieger)	cac4aece8b	Merge branch 'mc/1.13'	2020-04-16 15:43:43 +02:00
Blue (Lukas Rieger)	2f79c61d8c	Remove unwanted log	2020-04-16 15:42:20 +02:00
Blue (Lukas Rieger)	7856501001	Merge branch 'mc/1.13'	2020-04-16 15:32:55 +02:00
Blue (Lukas Rieger)	eb93b7d1ab	Fix some issues with rendering with map-limits	2020-04-16 15:31:33 +02:00
Blue (Lukas Rieger)	9a09f39b5a	First part on implementing markers	2020-04-16 12:33:24 +02:00
Blue (Lukas Rieger)	89fa4e6f95	Merge branch 'mc/1.13'	2020-04-09 20:12:44 +02:00
Blue (Lukas Rieger)	677dfcda02	Change the way images are cropped hopefully fixing #32	2020-04-09 17:56:08 +02:00
Blue (Lukas Rieger)	0dfbc96dff	Merge branch 'mc/1.13'	2020-04-07 14:56:13 +02:00
Blue (Lukas Rieger)	8d9220f611	Correct build setups for CLI and Forge implementations	2020-04-06 17:55:35 +02:00
Blue (Lukas Rieger)	88ab4b2eb8	Merge branch 'mc/1.13'	2020-04-06 16:56:35 +02:00
Blue (Lukas Rieger)	24c50c27c6	Revert "Fix loading some chunk formats in 1.12. Fixes #33" ... This reverts commit 1ddc229047.	2020-04-06 14:18:40 +02:00
Blue (Lukas Rieger)	1ddc229047	Fix loading some chunk formats in 1.12. Fixes #33	2020-04-04 15:57:59 +02:00
Blue (Lukas Rieger)	323cb1bc81	Change project setup: split targets into different jars and relocate shadowed libs	2020-03-30 01:45:32 +02:00
Blue (Lukas Rieger)	5f7517a9d6	Merge branch 'mc/1.13'	2020-03-29 11:49:03 +02:00
Blue (Lukas Rieger)	de8031effd	Push version for next release	2020-03-29 11:47:37 +02:00
Blue (Lukas Rieger)	62ce024dc6	Better tentative fix for #24	2020-03-28 16:25:38 +01:00
Blue (Lukas Rieger)	de7b0cba02	Tentative fix for #24	2020-03-27 15:41:09 +01:00
Blue (Lukas Rieger)	eeac5b3125	Merge branch 'mc/1.13'	2020-03-26 12:07:52 +01:00
Blue (Lukas Rieger)	85f5d8947b	Fix empty path resolving	2020-03-26 12:07:17 +01:00
Blue (Lukas Rieger)	3b58874a1c	Merge branch 'mc/1.13'	2020-03-25 22:14:05 +01:00
Blue (Lukas Rieger)	5421f956d2	Fix lighting bug and two bugs with resource-loading	2020-03-25 21:54:59 +01:00
Blue (Lukas Rieger)	cbbcfa6d59	Merge branch 'mc/1.13'	2020-03-17 20:27:18 +01:00
Blue (Lukas Rieger)	46875b9e68	Fix rounding bevore saving does not work correctly	2020-03-17 20:23:59 +01:00
Blue (Lukas Rieger)	eb6fe1164f	Merge branch 'mc/1.13'	2020-03-14 18:22:57 +01:00
Blue (Lukas Rieger)	d21f6baf68	Push version for new release	2020-03-14 18:21:10 +01:00
Blue (Lukas Rieger)	54acd321f9	Fix a bug that prevents map changing via url and add sky color to dimensions	2020-03-14 18:18:02 +01:00
Blue (Lukas Rieger)	1455a5ae01	Merge branch 'mc/1.13'	2020-03-14 17:09:54 +01:00
Blue (Lukas Rieger)	275076bf66	Add menu footer, block-info hightlight and renamed a switch	2020-03-14 17:09:40 +01:00
Blue (Lukas Rieger)	d34628dfdf	Merge branch 'mc/1.13'	2020-03-13 18:22:49 +01:00
Blue (Lukas Rieger)	2ed2fa3e35	Add click menu and debug option to web-app and fix two render-saving bugs that caused corrupted files sometimes	2020-03-13 18:11:31 +01:00
Blue (Lukas Rieger)	3e11b67ed5	Merge branch 'mc/1.13'	2020-03-08 22:03:19 +01:00
Blue (Lukas Rieger)	dde30e932d	Fix a bug with saving tiles sometimes and one with the ui	2020-03-08 22:02:44 +01:00
Blue (Lukas Rieger)	c4e2a4c683	Merge branch 'mc/1.13'	2020-03-08 21:20:36 +01:00
Blue (Lukas Rieger)	33ff579f9b	Fix alert box catching all mouse-events	2020-03-08 21:20:21 +01:00
Blue (Lukas Rieger)	f7f5ca76b2	Merge branch 'mc/1.13'	2020-03-08 20:57:34 +01:00
Blue (Lukas Rieger)	80f1d90cdf	Update configs for lighting changes and finalize ui	2020-03-08 20:56:52 +01:00
Blue (Lukas Rieger)	ba2092b614	Introduce shaders to improve rendering, add night and rework the ui	2020-03-04 20:31:00 +01:00
Blue (Lukas Rieger)	a0ae675af1	Some changes to the shader to enable dynamic day/night changes	2020-02-13 20:27:53 +01:00
Blue (Lukas Rieger)	37ee65e356	Fix indentations	2020-02-11 21:14:22 +01:00
Blue (Lukas Rieger)	27129b0e53	Add shaders in the web-app and process lighting there	2020-02-11 21:10:59 +01:00
Blue (Lukas Rieger)	db208d4b8f	No longer bake the ao and lighting data (breaking change)	2020-02-11 19:35:35 +01:00
Blue (Lukas Rieger)	b6cd0123ea	Fix version after merge	2020-02-09 19:04:44 +01:00
Blue (Lukas Rieger)	04ea7a7a8a	Merge branch 'mc/1.13'	2020-02-09 19:03:51 +01:00
Blue (Lukas Rieger)	fa6c5ea1f5	Push version for new release	2020-02-09 19:02:22 +01:00
Blue (Lukas Rieger)	8aaca521d0	Fix the models for the changed chest textures layout (really now)	2020-02-09 16:42:00 +01:00