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,154 Commits 19 Branches 61 Tags 109 MiB
e64641cf01
Commit Graph

8154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nordsoft
e64641cf01 Merge remote-tracking branch 'upstream/features/new-terrains' into cpp-map-editor 
# Conflicts:
#	launcher/settingsView/csettingsview_moc.ui
#	lib/mapping/CMap.h
#	lib/mapping/CMapEditManager.cpp
#	lib/mapping/CMapEditManager.h
#	lib/rmg/CMapGenerator.cpp
#	lib/rmg/CMapGenerator.h
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/ObstaclePlacer.h
#	lib/rmg/RmgArea.h
#	lib/rmg/RmgMap.cpp
#	lib/rmg/RmgMap.h
#	lib/rmg/Zone.cpp
#	lib/rmg/Zone.h
#	lib/serializer/CSerializer.h
 2022-09-09 11:59:19 +04:00
Andrii Danylchenko
68d052ac5c [844] - fix pathfinding for fly towards guarded tile 2022-09-09 09:01:21 +03:00
nordsoft
40c03ece34 Add creatures amount 2022-09-09 05:00:51 +04:00
nordsoft
e01e7add13 Minor visual tweak 2022-09-09 04:04:27 +04:00
nordsoft
83ed4362db Fix hero generation in main town 2022-09-09 03:59:37 +04:00
nordsoft
702b1b566b Fix dwellings initialization 2022-09-09 03:38:30 +04:00
nordsoft
3f2c82a664 Town buildings settings are implemented 2022-09-09 02:59:49 +04:00
nordsoft
ece811b508 Hotkeys and multiselection 2022-09-08 18:14:13 +04:00
nordsoft
aa1cf5e16c Draft state for terrain update 2022-09-08 15:23:30 +04:00
nordsoft
5bda5c3b44 Update appearance implemented 2022-09-08 05:43:06 +04:00
nordsoft
682bd1b4a3 Start working with appearance 2022-09-08 04:48:54 +04:00
nordsoft
50dbf9a254 Add spell scroll inspector 2022-09-08 04:16:16 +04:00
nordsoft
3f4fa8ec10 More delegates 2022-09-08 03:06:46 +04:00
nordsoft
07ba024201 Delegate for player color is implemented 2022-09-08 02:59:02 +04:00
nordsoft
dab7c41d21 Fix terrain performance 2022-09-07 13:21:02 +04:00
nordsoft
c3355aa976 Support creature setting up 2022-09-07 05:33:48 +04:00
nordsoft
289ae8a1f8 Fix terrain performance 2022-09-07 04:20:02 +04:00
nordsoft
a4686c81ee Fixed obstacles filling and passability view 2022-09-07 03:26:00 +04:00
nordsoft
a2c63e7ed2 Some ideas to fix imported maps 2022-09-07 02:56:40 +04:00
nordsoft
b284652f71 Safety checks 2022-09-07 02:39:28 +04:00
nordsoft
dc65d1c2b6 Fix inconsistency for map format opening 2022-09-07 02:39:07 +04:00
nordsoft
9429cb4340 Add more objects into inspector 2022-09-07 02:39:07 +04:00
nordsoft
0849f93d88 Fix problem with saving 2022-09-07 02:39:06 +04:00
Nordsoft91
59f38fc43a
Merge pull request #30 from Nordsoft91/EraseAction 
- Erase operation (hotkey: DELETE)
 2022-09-07 02:38:07 +04:00
Nordsoft91
ce2ab1a431
Merge branch 'cpp-map-editor' into EraseAction 2022-09-07 01:46:33 +04:00
Tomasz Zieliński
52ddc9e32b Compilation fix. 2022-09-06 21:30:16 +02:00
nordsoft
149afed32b Add map validator 2022-09-06 23:16:30 +04:00
Tomasz Zieliński
0f8adabd71 Merge branch 'EraseAction' of github.com:Nordsoft91/vcmi into EraseAction 2022-09-06 20:53:05 +02:00
Tomasz Zieliński
97b0fa16ae Fill obstacles as one operation (for undo). 
However, it works only for obstacles on one type of terrain.
 2022-09-06 20:51:45 +02:00
Nordsoft91
cb09ea9814
Merge branch 'cpp-map-editor' into EraseAction 2022-09-06 21:24:07 +04:00
Tomasz Zieliński
d790978dbb (almost) unlimited undo, why not? 2022-09-06 19:22:36 +02:00
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
nordsoft
e7de865f26 Implement smart invalidation for objects 2022-09-06 21:15:13 +04:00
Tomasz Zieliński
dc33142139 Merge branch 'EraseAction' of github.com:Nordsoft91/vcmi into EraseAction 2022-09-06 18:48:21 +02:00
Tomasz Zieliński
87880e5c6c Split classes into 3 fiiles 2022-09-06 18:47:41 +02:00
Nordsoft91
684fa5c96c
Merge branch 'cpp-map-editor' into EraseAction 2022-09-06 20:18:19 +04: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
nordsoft
7ad2282b64 Trt to disable editor for mxe 2022-09-06 18:56:43 +04:00
Tomasz Zieliński
b817e6509b Serialize new field with new save format 2022-09-06 15:53:32 +02:00
nordsoft
a3ae43bd7a [839] update config 2022-09-06 16:12:28 +03:00
nordsoft
345bbda85c [838] update config 2022-09-06 16:12:28 +03:00
nordsoft
cef4b6fadd [837] update config 2022-09-06 16:12:28 +03:00
nordsoft
37ee4a7e50 [833] Fix spell scroll sound 2022-09-06 16:12:28 +03:00
nordsoft
18ba49c1ca [832] Fix water ambient sound 2022-09-06 16:12:28 +03:00
nordsoft
650ab29e50 Fix crash in rmg 2022-09-06 16:12:28 +03:00
nordsoft
e455f66e86 [810] Fix bonus duplication 2022-09-06 16:12:28 +03:00
DjWarmonger
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
Nordsoft91
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