games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Code Issues Releases Activity
8,098 Commits 19 Branches 62 Tags 110 MiB
ca0446c4ee
Commit Graph

3921 Commits

Author SHA1 Message Date
Tomasz Zieliński
ca0446c4ee Fix compilation 2022-09-06 19:17:52 +02:00
Tomasz Zieliński
43a6986ebf fix warning 2022-09-06 19:17:38 +02:00
Tomasz Zieliński
87880e5c6c Split classes into 3 fiiles 2022-09-06 18:47:41 +02:00
Tomasz Zieliński
738fbd77d4 Support for composed erase operation 2022-09-06 17:54:48 +02:00
Tomasz Zieliński
6165bac516 Some preliminary support for object erase. But this will need a major refactor to split basic map data from in-game data. 2022-09-06 17:16:34 +02:00
Tomasz Zieliński
b817e6509b Serialize new field with new save format 2022-09-06 15:53:32 +02:00
Tomasz Zieliński
b826bc00b9 Merge remote-tracking branch 'origin/cpp-map-editor' into EraseAction 
+ Some workaround for View -> LayerSelection communication
 2022-09-06 08:59:28 +02:00
Tomasz Zieliński
d3da75eece - Erase operation (hotkey: DELETE) 
- Interface is updated when there is an object selected or not
- Undo for erase object
 2022-09-06 08:05:34 +02:00
nordsoft
9c1971788b Proper erasing for exception objects 2022-09-06 05:50:00 +04:00
Nordsoft91
4793ed9679
Merge branch 'cpp-map-editor' into Actions 2022-09-05 21:04:38 +04:00
nordsoft
8903d2edaf Fix crash in rmg 2022-09-05 20:54:24 +04:00
Tomasz Zieliński
81ec08b55e First draft of undo/redo. Can move objects and undo new object placement. 
Signed-off-by: Tomasz Zieliński <tomaszzielinskijedenzwielu@gmail.com>
 2022-09-05 18:27:09 +02:00
nordsoft
5839ba4ce8 Minor fixes 2022-09-05 05:50:21 +04:00
nordsoft
149790ad2d Merge remote-tracking branch 'upstream/features/new-terrains' into cpp-map-editor 
# Conflicts:
#	config/randomMap.json
#	config/terrains.json
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ObjectManager.cpp
#	lib/rmg/ObjectManager.h
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
#	lib/rmg/RmgArea.h
#	lib/rmg/RmgMap.cpp
#	lib/rmg/RmgMap.h
#	lib/rmg/RoadPlacer.cpp
#	lib/rmg/RoadPlacer.h
#	lib/rmg/Zone.cpp
#	lib/rmg/Zone.h
 2022-09-04 15:54:37 +04:00
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
DjWarmonger
dac4628c45
Mine roads (#808) 
* Create dirt roads to mines if there are no roads in a zone.
 2022-09-04 09:54:06 +03: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
Nordsoft91
c6c5c07e2d
Final preparations for merge into develop (#780) 
* version updated, change log updated from release draft
* horse sounds for terrains
* Update and freeze essential files
 2022-09-03 19:02:24 +03: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
be6a7d1836 Randomly shuffle required objects to avoid patterns 2022-09-01 13:26:11 +03: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
47d3539f41 Fix problems with water zone (#784) 2022-08-29 08:53:36 +03:00
Nordsoft91
f668c65eb2 Fix RMG bug with incorrect town placement (#779) 
* Fix RMG bug with incorrect town placement
* Readability tweak
 2022-08-29 08:53:36 +03:00
Nordsoft91
f3f1fb8033 Improve treasure placement logic (#775) 
Improve treasure placement logic (#775)
 2022-08-29 08:53:36 +03:00
Nordsoft91
ae63e0c30e Fix problem with empty areas (#772) 
* Fixes for obstacles and treasures
 2022-08-29 08:53:36 +03:00
Nordsoft91
9ec0ca332c Fix for sealed-off treasures (#771) 
Fix for sealer-off treasures
 2022-08-29 08:53:36 +03:00
Nordsoft91
c0db4f1d96 Random map generator refactoring (#762) 
random map generator refactoring and improvements
 2022-08-29 08:53:36 +03:00
Andrii Danylchenko
a454edacea Fix getting battlefield crash 2022-08-29 08:53:35 +03:00
Andrii Danylchenko
ac2bd4f79c battlefields in VLC and custom bonuses for terrain patches 2022-08-29 08:53:35 +03:00
Andrii Danylchenko
2228a6f9bf allow configurable battleground graphics 2022-08-29 08:53:35 +03:00
Nordsoft91
9241cd1e62 New battlegrounds (#758) 2022-08-29 08:53:35 +03:00
Nordsoft91
5151da59a7 New terrain support - part 1 (#755) 
Initial support of new terrains
 2022-08-29 08:53:35 +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