1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-19 00:17:56 +02:00
Commit Graph

9319 Commits

Author SHA1 Message Date
684fa5c96c Merge branch 'cpp-map-editor' into EraseAction 2022-09-06 20:18:19 +04:00
738fbd77d4 Support for composed erase operation 2022-09-06 17:54:48 +02:00
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
7ad2282b64 Trt to disable editor for mxe 2022-09-06 18:56:43 +04:00
b817e6509b Serialize new field with new save format 2022-09-06 15:53:32 +02:00
a3ae43bd7a [839] update config 2022-09-06 16:12:28 +03:00
345bbda85c [838] update config 2022-09-06 16:12:28 +03:00
cef4b6fadd [837] update config 2022-09-06 16:12:28 +03:00
37ee4a7e50 [833] Fix spell scroll sound 2022-09-06 16:12:28 +03:00
18ba49c1ca [832] Fix water ambient sound 2022-09-06 16:12:28 +03:00
650ab29e50 Fix crash in rmg 2022-09-06 16:12:28 +03:00
e455f66e86 [810] Fix bonus duplication 2022-09-06 16:12:28 +03:00
6a011b5ee0 Mine roads (#808)
* Create dirt roads to mines if there are no roads in a zone.
2022-09-06 16:12:28 +03:00
2ff8c1091b 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-06 16:12:28 +03:00
c33592d01b Randomly shuffle required objects to avoid patterns 2022-09-06 16:12:28 +03:00
ccbc8a1632 Fix problems with water zone (#784) 2022-09-06 16:12:28 +03:00
4844310a89 Fix RMG bug with incorrect town placement (#779)
* Fix RMG bug with incorrect town placement
* Readability tweak
2022-09-06 16:12:28 +03:00
30aaee30b4 Improve treasure placement logic (#775)
Improve treasure placement logic (#775)
2022-09-06 16:12:28 +03:00
967201a68e Fix problem with empty areas (#772)
* Fixes for obstacles and treasures
2022-09-06 16:12:28 +03:00
c47be32b25 Fix for sealed-off treasures (#771)
Fix for sealer-off treasures
2022-09-06 16:12:28 +03:00
6a6605a34e Random map generator refactoring (#762)
random map generator refactoring and improvements
2022-09-06 16:12:28 +03:00
8904a30a68 Fix typo 2022-09-06 16:12:28 +03:00
847f11a6c7 Fix getting battlefield crash 2022-09-06 16:12:28 +03:00
db2a570a4b battlefields in VLC and custom bonuses for terrain patches 2022-09-06 16:12:28 +03:00
dde3d8ed58 allow configurable battleground graphics 2022-09-06 16:12:28 +03:00
c95818bd84 New battlegrounds (#758) 2022-09-06 16:12:28 +03:00
08ecf4cf4c New terrain support - part 1 (#755)
Initial support of new terrains
2022-09-06 16:12:28 +03:00
dad4520b18 Use QObject signals & slots for Layers 2022-09-06 13:20:11 +02:00
e716ef3f3a Fix build 2022-09-06 14:13:01 +04:00
65b168c53b Fix build 2022-09-06 13:26:20 +04:00
e06f8ab0d3 Fix build 2022-09-06 12:36:52 +04:00
fc75c7a97e add branch for actions 2022-09-06 12:08:22 +04:00
9c27709bb9 Maybe this can fix build 2022-09-06 12:06:05 +04:00
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
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
9c1971788b Proper erasing for exception objects 2022-09-06 05:50:00 +04:00
667f05843a Implemented properties for some object types, player settings supported 2022-09-06 05:46:22 +04:00
dcef991b84 Fix filename for loaded map 2022-09-05 22:50:09 +04:00
c9ee5ab2f6 [833] Fix spell scroll sound 2022-09-05 22:08:46 +04:00
cb4a4298c1 Support placement of spell scrolls 2022-09-05 22:02:50 +04:00
e20b1e275b [832] Fix water ambient sound 2022-09-05 21:43:07 +04:00
355df51033 Speedup generating empty map 2022-09-05 21:42:33 +04:00
2aab315f9c Merge pull request #25 from Nordsoft91/Actions
Undo / redo
2022-09-05 21:06:11 +04:00
4793ed9679 Merge branch 'cpp-map-editor' into Actions 2022-09-05 21:04:38 +04:00
f87117b581 Fix saving bug and window modality bug 2022-09-05 20:55:30 +04:00
8903d2edaf Fix crash in rmg 2022-09-05 20:54:24 +04:00
d0a6bf9521 Cleaned up some warnings
Signed-off-by: Tomasz Zieliński <tomaszzielinskijedenzwielu@gmail.com>
2022-09-05 18:27:43 +02:00
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
f0f0a1567d Minimap camera controls 2022-09-05 16:28:47 +04:00
1e15a7c9c8 Minimap implemented 2022-09-05 14:10:39 +04:00