games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-20 20:23:03 +02:00
Code Issues Releases Activity
8,116 Commits 20 Branches 62 Tags 110 MiB
07ba024201
Commit Graph

8116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
2572744f00 Support brush size 2022-09-03 17:43:20 +04:00
nordsoft
ff6cd104cf Implemented automatic obstacle placement 2022-09-03 16:27:06 +04:00
nordsoft
2a3c603822 Show icons for objects 2022-09-03 14:49:57 +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
8a2864b788 Object movement visualization works somehow 2022-09-01 18:07:36 +04:00
nordsoft
6290274371 Objects are selectable 2022-09-01 17:08:03 +04:00
nordsoft
facc29b6d7 Show objects layer 2022-09-01 15:54:39 +04:00
nordsoft
ec2204715a Redering order was fixed 2022-09-01 15:04:34 +04:00
nordsoft
be6a7d1836 Randomly shuffle required objects to avoid patterns 2022-09-01 13:26:11 +03:00
nordsoft
a63c00a90e Support terrain editing 2022-09-01 05:51:29 +04:00
nordsoft
53d9cb6d00 Merge remote-tracking branch 'upstream/develop' into mod-from-github 2022-08-31 23:41:31 +04:00
nordsoft
c096b8dd00 Passability view and grid view 2022-08-31 22:05:57 +04:00
nordsoft
f3caa3d7bb Progress bar for random map loading 2022-08-31 01:24:12 +04:00
nordsoft
9ac8f5bfda Update link to the mod repo 2022-08-30 21:35:03 +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
nordsoft
80a206116e Merge remote-tracking branch 'origin/check-for-updates' into mod-from-github 2022-08-30 13:46:03 +04:00
Nordsoft91
4f1f9e3c5d
Fix start game button for rmg without templates (#781) 2022-08-30 08:30:21 +03:00
nordsoft
4afa8eb463 Adjust scene size 2022-08-30 07:17:02 +04:00
nordsoft
ab46e8f128 Fix order of objects 2022-08-30 06:56:37 +04:00
nordsoft
3c062bae32 Showing objects 2022-08-30 06:38:24 +04:00
nordsoft
ea3845e8dd Fix flips for terrains 2022-08-30 04:48:44 +04:00
nordsoft
822e6a858b Can draw the terrain 2022-08-30 04:15:54 +04:00
nordsoft
107709d728 Somithing compilable and workable 2022-08-30 02:44:02 +04:00
nordsoft
ff0d6707b6 Load mao 2022-08-29 22:19:05 +04: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