8037 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
nordsoft	958fe2f256	Revert "update cmakelists" ... This reverts commit 4c8a2685f5.	2022-09-04 15:47:36 +04:00
nordsoft	18dae7deca	Revert "Fix linker problem" ... This reverts commit 1bbb2f420c.	2022-09-04 15:47:29 +04:00
nordsoft	adde2e6b30	Merge branch 'mod-from-github' into cpp-map-editor ... # Conflicts: # .github/workflows/github.yml # CI/mac/before_install.sh	2022-09-04 04:13:52 +04:00
nordsoft	5a78703abc	Review and modifying object properties	2022-09-04 04:12:33 +04:00
nordsoft	2572744f00	Support brush size	2022-09-03 17:43:20 +04:00
nordsoft	ff6cd104cf	Implemented automatic obstacle placement	2022-09-03 16:27:06 +04:00
nordsoft	2a3c603822	Show icons for objects	2022-09-03 14:49:57 +04:00
nordsoft	0fffa846b4	Implemented object placement and filtering	2022-09-03 08:12:07 +04:00
nordsoft	c17b1f909d	Show objects preview	2022-09-03 01:04:28 +04:00
nordsoft	8a2864b788	Object movement visualization works somehow	2022-09-01 18:07:36 +04:00
nordsoft	6290274371	Objects are selectable	2022-09-01 17:08:03 +04:00
nordsoft	facc29b6d7	Show objects layer	2022-09-01 15:54:39 +04:00
nordsoft	ec2204715a	Redering order was fixed	2022-09-01 15:04:34 +04:00
nordsoft	a63c00a90e	Support terrain editing	2022-09-01 05:51:29 +04:00
nordsoft	53d9cb6d00	Merge remote-tracking branch 'upstream/develop' into mod-from-github	2022-08-31 23:41:31 +04:00
nordsoft	c096b8dd00	Passability view and grid view	2022-08-31 22:05:57 +04:00
nordsoft	f3caa3d7bb	Progress bar for random map loading	2022-08-31 01:24:12 +04:00
nordsoft	9ac8f5bfda	Update link to the mod repo	2022-08-30 21:35:03 +04:00
Andrey Filipenkov	d7650ce9c0	use Conan to make macOS CI builds for both Intel and ARM (#782) ... * [CI] append platform to output artifact name if it's given	2022-08-30 17:29:00 +03:00
nordsoft	68b106fdc1	Generate random maps from map editor	2022-08-30 17:08:33 +04:00
nordsoft	80a206116e	Merge remote-tracking branch 'origin/check-for-updates' into mod-from-github	2022-08-30 13:46:03 +04:00
Nordsoft91	4f1f9e3c5d	Fix start game button for rmg without templates (#781)	2022-08-30 08:30:21 +03:00
nordsoft	4afa8eb463	Adjust scene size	2022-08-30 07:17:02 +04:00
nordsoft	ab46e8f128	Fix order of objects	2022-08-30 06:56:37 +04:00
nordsoft	3c062bae32	Showing objects	2022-08-30 06:38:24 +04:00
nordsoft	ea3845e8dd	Fix flips for terrains	2022-08-30 04:48:44 +04:00
nordsoft	822e6a858b	Can draw the terrain	2022-08-30 04:15:54 +04:00
nordsoft	107709d728	Somithing compilable and workable	2022-08-30 02:44:02 +04:00
nordsoft	ff0d6707b6	Load mao	2022-08-29 22:19:05 +04:00
nordsoft	d8822eaaaa	Initial commit for new map editor	2022-08-29 01:28:36 +04:00
Nordsoft91	b664f9a128	Fix for #3218 (#777)	2022-08-28 12:55:37 +03:00
nordsoft	e547b468b6	Update only historical builds	2022-08-28 12:41:36 +04:00
nordsoft	1bbb2f420c	Fix linker problem	2022-08-28 12:23:45 +04:00
nordsoft	4c8a2685f5	update cmakelists	2022-08-28 07:23:36 +04:00
nordsoft	c8a23e0572	Fix tests	2022-08-28 06:31:51 +04:00
nordsoft	108470471e	Minor fixes	2022-08-28 06:31:45 +04:00
nordsoft	c3276f2276	Obstacles works fine without regression	2022-08-28 06:31:39 +04:00
nordsoft	9bb8f2a971	Game runs without crash	2022-08-28 06:31:33 +04:00
nordsoft	756793992f	First compilable commit for obstacles	2022-08-28 06:31:26 +04:00
nordsoft	b8243b3858	Merge remote-tracking branch 'origin/check-for-updates' into mod-from-github ... # Conflicts: # config/schemas/settings.json	2022-08-28 04:16:43 +04:00
nordsoft	b0526ca51b	Refactoring	2022-08-27 21:25:24 +04:00
nordsoft	e5c49f7980	Fix default path to mods repo	2022-08-27 20:45:39 +04:00
nordsoft	559d3f5daf	Final changes	2022-08-27 20:15:48 +04:00
nordsoft	7412432111	Fix folder naming from github	2022-08-27 20:02:50 +04:00
nordsoft	03e7b5d39f	Support redirecting downloads	2022-08-27 19:59:50 +04:00
nordsoft	035857c190	Fix problems with water zone	2022-08-27 03:21:27 +04:00
nordsoft	e4ac496c07	Try to fix compilation	2022-08-26 22:58:46 +04:00
nordsoft	bb3c1879b7	Final fixeds	2022-08-26 22:26:56 +04:00
nordsoft	5cb1097053	Code review	2022-08-26 03:11:35 +04:00
nordsoft	fd25c76664	Code review fixes	2022-08-26 03:07:07 +04:00