Commit Graph
73 Commits
Author SHA1 Message Date
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
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
Nordsoft91andGitHub 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
Nordsoft91andGitHub 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
nordsoft 79f0dd7d22 Update headings and fix typo 2022-08-25 07:34:23 +04:00
nordsoft 79fc8d60fb Message for network error 2022-08-25 07:30:50 +04:00
nordsoft fffab5dcd5 code cleanup 2022-08-25 07:21:03 +04:00
nordsoft 1c94f73e78 Do not show dialog if version is up to date 2022-08-25 06:45:31 +04:00
nordsoft f434c4d112 Autoscale for the dialog 2022-08-25 06:18:55 +04:00
nordsoft 4f93929c43 All necessary functionality work 2022-08-25 05:34:36 +04:00
nordsoft 744afdbde2 Implemented auto-update 2022-08-25 05:09:20 +04:00
nordsoft 28063cfcf3 update on startup 2022-08-25 03:43:58 +04:00
nordsoft 9eeab608f3 Make new dialog for checking updates 2022-08-25 03:14:12 +04:00
nordsoftandAndrii Danylchenko 92dc902748 Fix for #3228 and #3042 2022-08-24 14:58:56 +03:00
Nordsoft91andGitHub 4458cdf6c9 Fix RMG bug with incorrect town placement (#779)
* Fix RMG bug with incorrect town placement
* Readability tweak
2022-08-22 14:32:54 +03:00
Nordsoft91andGitHub d79d788e6f Improve treasure placement logic (#775)
Improve treasure placement logic (#775)
2022-08-20 13:17:27 +03:00
Nordsoft91andGitHub 3fa22ebcb0 Fix problem with empty areas (#772)
* Fixes for obstacles and treasures
2022-08-11 14:29:39 +03:00
Nordsoft91andGitHub 457def94ae Fix for sealed-off treasures (#771)
Fix for sealer-off treasures
2022-08-09 15:12:58 +03:00
Nordsoft91andGitHub 6da7c9ccb5 Random map generator refactoring (#762)
random map generator refactoring and improvements
2022-08-09 08:54:32 +03:00
nordsoftandAndrii Danylchenko 53b9434a22 Fix crash 2022-07-29 11:08:38 +03:00
nordsoftandAndrii Danylchenko 1644a19053 Fix typo 2022-07-12 15:19:40 +03:00
Nordsoft91andGitHub d8f552006a New battlegrounds (#758) 2022-06-22 11:41:02 +03:00
Nordsoft91andGitHub 54fab9f0f8 Freeze macos build version to ensure compatibility with older macos v… (#759) 2022-06-21 16:52:49 +03:00
Nordsoft91andGitHub 5f1c5c6731 New terrain support - part 1 (#755)
Initial support of new terrains
2022-06-20 17:39:50 +03:00
Nordsoft91andAndrii Danylchenko 0b29fec63c Rmg water support (#754)
* Final changes before merge
2022-06-11 18:40:24 +03:00
Nordsoft91andAndrii Danylchenko 5054ee011a Rmg water support (#751)
* Roads added to shipyard
* Load general rmg parameters from config
* Fix issue with default zone guard
* Move magic numbers related to balance to randomMap.json
2022-06-11 18:40:24 +03:00
Nordsoft91andAndrii Danylchenko 5c1a66ab69 Rmg water support (#745)
* RMG: water support and refactoring
* Fix seers hut bug
2022-06-11 18:40:24 +03:00
Nordsoft91andGitHub 9d06e51631 Place proper towns in underground (#743)
Implement feature of proper town selection in underground and surface
* Some minor refactoring of rmg
2022-05-28 16:03:50 +03:00
nordsoftandAndrii Danylchenko d92356f085 Fixed game crash: divide by zero due to threads racing 2022-05-28 14:34:36 +03:00