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,097 Commits 19 Branches 62 Tags 110 MiB
43a6986ebf
Commit Graph

8097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tomasz Zieliński
43a6986ebf fix warning 2022-09-06 19:17:38 +02: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
Tomasz Zieliński
dad4520b18 Use QObject signals & slots for Layers 2022-09-06 13:20:11 +02:00
nordsoft
e716ef3f3a Fix build 2022-09-06 14:13:01 +04:00
nordsoft
65b168c53b Fix build 2022-09-06 13:26:20 +04:00
nordsoft
e06f8ab0d3 Fix build 2022-09-06 12:36:52 +04:00
nordsoft
fc75c7a97e add branch for actions 2022-09-06 12:08:22 +04:00
nordsoft
9c27709bb9 Maybe this can fix build 2022-09-06 12:06:05 +04: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
nordsoft
667f05843a Implemented properties for some object types, player settings supported 2022-09-06 05:46:22 +04:00
nordsoft
dcef991b84 Fix filename for loaded map 2022-09-05 22:50:09 +04:00
nordsoft
c9ee5ab2f6 [833] Fix spell scroll sound 2022-09-05 22:08:46 +04:00
nordsoft
cb4a4298c1 Support placement of spell scrolls 2022-09-05 22:02:50 +04:00
nordsoft
e20b1e275b [832] Fix water ambient sound 2022-09-05 21:43:07 +04:00
nordsoft
355df51033 Speedup generating empty map 2022-09-05 21:42:33 +04:00
Nordsoft91
2aab315f9c
Merge pull request #25 from Nordsoft91/Actions 
Undo / redo
 2022-09-05 21:06:11 +04:00
Nordsoft91
4793ed9679
Merge branch 'cpp-map-editor' into Actions 2022-09-05 21:04:38 +04:00
nordsoft
f87117b581 Fix saving bug and window modality bug 2022-09-05 20:55:30 +04:00
nordsoft
8903d2edaf Fix crash in rmg 2022-09-05 20:54:24 +04:00
Tomasz Zieliński
d0a6bf9521 Cleaned up some warnings 
Signed-off-by: Tomasz Zieliński <tomaszzielinskijedenzwielu@gmail.com>
 2022-09-05 18:27:43 +02: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
f0f0a1567d Minimap camera controls 2022-09-05 16:28:47 +04:00
nordsoft
1e15a7c9c8 Minimap implemented 2022-09-05 14:10:39 +04:00
Tomasz Zieliński
d1471fb3ed Need std::string to compile on Windows in first place. 2022-09-05 09:45:15 +02:00
nordsoft
3430edba22 Few more fixes 2022-09-05 06:18:38 +04:00
nordsoft
5839ba4ce8 Minor fixes 2022-09-05 05:50:21 +04:00
nordsoft
eb501f2222 Refactoring 2022-09-05 04:19:21 +04:00
nordsoft
28f0abd545 Flags coloring 2022-09-04 22:29:56 +04:00
nordsoft
d6e8d7965c Player settings 2022-09-04 22:01:49 +04:00
nordsoft
49a6422d20 Editor for map name and description 2022-09-04 20:16:36 +04:00
nordsoft
8e953c223e Fix compilation problems 2022-09-04 18:52:24 +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
f0db9f32c9 Revert "Fix tests" 
This reverts commit c8a23e0572.
 2022-09-04 15:47:42 +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
nordsoft
5a78703abc Review and modifying object properties 2022-09-04 04:12:33 +04:00