games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Code Issues Releases Activity
8,042 Commits 19 Branches 61 Tags 109 MiB
0e849b1cef
Commit Graph

3893 Commits

Author SHA1 Message Date
nordsoft
0e849b1cef Revert "First compilable commit for obstacles" 
This reverts commit 756793992f.
 2022-09-04 15:48:04 +04:00
nordsoft
3cc8afc046 Revert "Game runs without crash" 
This reverts commit 9bb8f2a971.
 2022-09-04 15:47:58 +04:00
nordsoft
1a78df69f2 Revert "Obstacles works fine without regression" 
This reverts commit c3276f2276.
 2022-09-04 15:47:53 +04:00
nordsoft
b68220d1c3 Revert "Minor fixes" 
This reverts commit 108470471e.
 2022-09-04 15:47:47 +04:00
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
ff6cd104cf Implemented automatic obstacle placement 2022-09-03 16:27:06 +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
f3caa3d7bb Progress bar for random map loading 2022-08-31 01:24:12 +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
Nordsoft91
4f1f9e3c5d
Fix start game button for rmg without templates (#781) 2022-08-30 08:30:21 +03:00
Nordsoft91
b664f9a128
Fix for #3218 (#777) 2022-08-28 12:55:37 +03: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
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
b0526ca51b Refactoring 2022-08-27 21:25:24 +04:00
nordsoft
035857c190 Fix problems with water zone 2022-08-27 03:21:27 +04:00
nordsoft
92dc902748 Fix for #3228 and #3042 2022-08-24 14:58:56 +03:00
Nordsoft91
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
Nordsoft91
d79d788e6f
Improve treasure placement logic (#775) 
Improve treasure placement logic (#775)
 2022-08-20 13:17:27 +03:00
Nordsoft91
3fa22ebcb0
Fix problem with empty areas (#772) 
* Fixes for obstacles and treasures
 2022-08-11 14:29:39 +03:00
Nordsoft91
457def94ae
Fix for sealed-off treasures (#771) 
Fix for sealer-off treasures
 2022-08-09 15:12:58 +03:00
Nordsoft91
6da7c9ccb5
Random map generator refactoring (#762) 
random map generator refactoring and improvements
 2022-08-09 08:54:32 +03:00
Andrii Danylchenko
25183142e6 Fix getting battlefield crash 2022-07-09 19:00:03 +03:00
Andrii Danylchenko
232010c5de battlefields in VLC and custom bonuses for terrain patches 2022-07-02 14:47:40 +03:00
Andrii Danylchenko
8b8e837495 allow configurable battleground graphics 2022-06-26 10:21:05 +03:00
Nordsoft91
d8f552006a
New battlegrounds (#758) 2022-06-22 11:41:02 +03:00
Nordsoft91
5f1c5c6731
New terrain support - part 1 (#755) 
Initial support of new terrains
 2022-06-20 17:39:50 +03:00
Andrii Danylchenko
c4dec67acc Fix movement freeze after battle in teleport 2022-06-20 09:05:05 +03:00
Soar Qin
188607b05f Replace cotire with CMake builtin precompiled headers support (Requires CMake version >= 3.16) 2022-06-17 17:20:08 +03:00
Soar Qin
c87df8e704
Fix warnings/errors on MSVC (#753) 
* Fix warnings/errors on MSVC
1. update googletest to tag release-1.11.0 to make googletest and
   googlemock compile on MSVC2022.
2. set gtest_force_shared_crt to ON in test cmake project to make tests
   compile on MSVC.
3. add /wd4251 and /wd4275 to MSVC compile flags to ignore DLL related
   warnings for class exports.
4. fix some other warnings and errors while compiling on MSVC2022.
 2022-06-11 18:45:34 +03:00
Nordsoft91
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
Nordsoft91
5c1a66ab69 Rmg water support (#745) 
* RMG: water support and refactoring
* Fix seers hut bug
 2022-06-11 18:40:24 +03:00
Andrii Danylchenko
31c9d6e28d Fix performance issue related to TurnInfo construction 2022-06-06 09:47:37 +03:00
Nordsoft91
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
Konstantin
8fc14369a4
CMake presets. (#744) 
* CI: use single build action
* CMake: use imported targets
* CI: do not build boost for linux
* CMake: add FORCE_BUNDLED_MINIZIP option
* linux: use external minizip and fuzzylite
* CMake: add presets
* .gitignore: ignore cmake build dirs
* github: use cmake presets
 2022-05-26 08:55:20 +03:00
Nordsoft91
a8265c7052
[0002285] Implement feature with extra resources near mines (#742) 
* RMG: clear start position
* [0002285] some heaps of resources are placed nearby mines
* Fix leak in case of inability to place resource
* Fix indentation according to vcmi style
* Add constant for random amount of resources
* Code review fixes
 2022-05-23 13:08:36 +03:00
Konstantin
c6b198ce14
Warning fix (I moved C++17 and CI to another branch) (#739) 
* clang warning fixes
* use CMake 3.10 due to MXE CI does not have 3.13 yet

Co-authored-by: Konstantin <rilian@niisi.ras.ru>
 2022-05-19 15:14:50 +03:00
Andrii Danylchenko
e220918230 full crash dump 2022-05-14 13:23:09 +03:00
Andrii Danylchenko
0d15089dd4 Do not remove hero if left only with commander 2022-05-01 09:30:30 +03:00
Andrii Danylchenko
e0e3787748 When the battle is won with only summoned creatures - defeat 2022-05-01 09:30:30 +03:00
Andrii Danylchenko
fa9a420f99 Fix a few crashes 2022-04-17 09:10:53 +03:00
Andrii Danylchenko
8b11b42aaf Fix RMG to place special dwellings like elemental conflux 2022-04-09 10:57:24 +03:00
Dmitry Orlov
d98f240164 Fix: Crash on startup when mod dependency is not found 2022-03-21 09:43:06 +02:00