games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-26 08:41:13 +02:00
Code Issues Releases Activity
11,217 Commits 21 Branches 61 Tags 103 MiB
05eccbc2bb
Commit Graph

1190 Commits

Author SHA1 Message Date
Dydzio
9eccc29e16 Adjust tab positioning 2023-02-19 12:18:54 +01:00
Dydzio
7e409df3cb Apply manual changes from code review 2023-02-18 16:35:07 +01:00
Dydzio
c2ef3331ef Change main settings tabs to toggle group + fix json commas 2023-02-16 21:37:37 +01:00
Dydzio
9cabdfa675 Better position for main settings buttons 2023-02-15 20:34:08 +01:00
Dydzio
775db89241 Fix battle settings UI labels, add "dont show battle intro" setting 2023-02-15 20:29:29 +01:00
Dydzio
1d153f4ee9 "ForceMovementInfo" support + make other settings tab 2023-02-14 23:45:45 +01:00
Dydzio
daa2b63dde Further UI improvements 2023-02-14 22:22:11 +01:00
Dydzio
fb06aca0bb Further progress - UI tweaks, new settings etc 2023-02-14 20:30:06 +01:00
Dydzio
80a5595d6c Adding some settings options, minor UI fixes 2023-02-13 23:53:28 +01:00
Dydzio
b28a16ddd4 Settings UI tweaks 2023-02-12 21:35:30 +01:00
Dydzio
de5138c854 Basic separation of adventure map & general tabs 2023-02-12 19:25:59 +01:00
Dydzio
58bed920b4 Sort out settings files structure 2023-02-12 17:49:41 +01:00
Dydzio
ee186f3839 Conversion of battle settings to configurable interface 2023-02-12 13:51:57 +01:00
Dydzio
11df79dc2a Minor formatting 2023-02-12 11:55:39 +01:00
Dydzio
fc7d2b9778 Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-12 11:55:21 +01:00
Dydzio
8f0da8fe17 Move battle options labels to configurable interface 2023-02-12 11:37:40 +01:00
Dydzio
7095e9d8f9 Allow heroes to start with empty armies if configured properly 2023-02-05 00:36:51 +01:00
Dydzio
3f79a9806c Allow flexible configuration - starter dwellings and max stacks count 2023-02-04 23:40:02 +01:00
Konstantin
7b8aebe4e3 vcmi: deprecate MAXED_SPELL 
It is almost identical to SPECIAL_FIXED_VALUE_ENCHANT.

Replace its usage in JSON and inside deprecated converter
to SPECIAL_FIXED_VALUE_ENCHANT. Remove buggy string inside
getEffectLevel.
 2023-02-04 16:23:03 +03:00
Dydzio
28eed7047c Hardcoded feature to allow default towns always have 2nd dwelling 2023-02-02 22:50:08 +01:00
Dydzio
4f4660e82d Hardcoded feature to allow new heroes always have 3 stacks like in HotA 2023-02-02 22:28:14 +01:00
Dydzio
5a08ec04fe Initial split of BattleOptionsWindow 2023-02-02 17:17:16 +01:00
Dydzio
d04c53e7e0 Merge branch 'develop' into settings-rework 2023-02-02 11:55:13 +01:00
Ivan Savenko
0ba74fea73
Merge pull request #1515 from IvanSavenko/time_based_animations 
Time based animations
 2023-02-01 12:25:54 +02:00
Ivan Savenko
c5508d33fc
Merge pull request #1514 from IvanSavenko/rewardable_fixes 
Minor fixes to rewardable objects
 2023-01-31 12:47:24 +02:00
Dydzio
88744633de Move buttons from mainOptions to SystemOptionsWindow 2023-01-30 23:26:33 +01:00
Dydzio
cc9d65a341 Make battle settings callable without battle, save last settings tab 2023-01-30 22:15:37 +01:00
Dydzio
9dd692cea4 Initial draft of tabbed settings window 2023-01-30 20:18:59 +01:00
Dydzio
1898b8218c Merge remote-tracking branch 'origin/develop' into settings-rework 2023-01-29 17:36:56 +01:00
Ivan Savenko
57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00
Dydzio
0fdfd8bdcb Configurable interface for game settings, change sound/music sliders 2023-01-29 16:49:47 +01:00
Ivan Savenko
3749074a4d Renamed speed setting name to force-reset it to new scale 2023-01-28 16:49:35 +02:00
Ivan Savenko
a853045509 Removed unused value from creature config 2023-01-28 13:56:51 +02:00
Ivan Savenko
d34efaeb81 All battle effects now use time-based timings 2023-01-28 13:19:35 +02:00
Ivan Savenko
a2cd17197e Fix Campfire Gold reward amount. Now always one of 400/500/600 2023-01-28 13:12:03 +02:00
Ivan Savenko
8b2d336562 Fix initialization of visitDir in templates 2023-01-26 23:32:56 +02:00
Ivan Savenko
bc27faea57 All objects will register single name per object type 2023-01-26 23:32:55 +02:00
Ivan Savenko
49d0459412 Remove unused code 2023-01-26 23:27:26 +02:00
Ivan Savenko
f71cbc5d9b Fixed loading of object names 2023-01-26 23:27:26 +02:00
Ivan Savenko
d0fe875cc6 Removed wog object 2023-01-26 23:27:26 +02:00
Ivan Savenko
6f324216db Bugfixing 2023-01-26 23:27:24 +02:00
Ivan Savenko
6c472339ce Refactoring of ObjectClassesHandler 2023-01-26 23:26:49 +02:00
DjWarmonger
25ef065dbe
Merge pull request #1486 from IvanSavenko/configurable_rewardables 
Well, it works for my brand new objects with arbitrary bonus, so likely will work with everything else.
 2023-01-26 17:01:01 +01:00
Ivan Savenko
35775b90f8 Moved bonus names to translation 2023-01-25 12:36:02 +02:00
Ivan Savenko
39131eba3e Added translation support for mods. VCMI translations are now in mod. 
Moved existing (English) translation to vcmi mod
Added translations for:
- German
- Polish
- Ukrainian
 2023-01-25 12:33:54 +02:00
Ivan Savenko
52ab0f9b5b
Merge pull request #1446 from dydzio0614/movement-points-show 
Implement movement points info on ALT hold + tile mouse hover
 2023-01-25 12:30:34 +02:00
Ivan Savenko
7a9e5e4e30 Cleanup & consistency changes 2023-01-25 00:38:50 +02:00
Ivan Savenko
44bdd2cbf3 Implemented selectable messages for visited & empty state 2023-01-24 23:31:07 +02:00
Ivan Savenko
3ba8d708f8 Partially fixed bonuses descriptions (affected by separate old bug) 2023-01-24 17:34:48 +02:00
Ivan Savenko
c793527b44 Added "days since start of the game" limiter. Fixes Water Wheel 2023-01-24 16:54:14 +02:00
Ivan Savenko
c9dcb921ab Implemented "changeCreatures" option for Stables 2023-01-24 16:18:59 +02:00
Ivan Savenko
ecbcafefbc It is now possible to configure what exactly will be reset in object 2023-01-24 13:54:03 +02:00
Ivan Savenko
0c70822928 Implemented logical expression (allOf/anyOf/noneOf) for limiters 2023-01-23 23:54:54 +02:00
Ivan Savenko
f8f6df02f3 Removed remaining hardcoded objects 2023-01-23 15:27:27 +02:00
Ivan Savenko
62e127fb59 Bonusing objects are now configured in json 2023-01-23 01:05:10 +02:00
Ivan Savenko
bfd6c40f25 Moved all once-per-hero visitable (sans Tree) to config 2023-01-22 22:58:53 +02:00
Ivan Savenko
a6bda58276 Moved CGOnceVisitable to config 2023-01-22 20:26:19 +02:00
Ivan Savenko
0e1b309edc Moved pickable objects into a separate file 2023-01-22 18:53:01 +02:00
Ivan Savenko
fcb455b7f4 Fixed remaining bugs with converted objects 2023-01-22 18:37:26 +02:00
Ivan Savenko
695a94c3c8 Fixed all major bugs with newly converted objects 2023-01-22 18:17:26 +02:00
Dydzio
426246dc7e Add missing entries for new "limited shooting range" bonus 2023-01-22 10:30:53 +01:00
Ivan Savenko
9f3f9cc563 Added some missing functionality for configurable object 2023-01-22 02:08:58 +02:00
Ivan Savenko
83bb70cd8a All CGPickable objects are now fully configurable 2023-01-21 16:45:04 +02:00
Dydzio
192a97bc05 Extract method and make customizable movement points string 2023-01-21 15:30:32 +01:00
Ivan Savenko
f33d7d4f90 Fixed petrify & paralyze damage calculation 2023-01-20 15:18:10 +02:00
Ivan Savenko
03ca4b54c0 Fixed damage to opposite elementals 2023-01-20 15:18:10 +02:00
Ivan Savenko
1f38f27741 Fixed Bless and Curse damage calculation 2023-01-20 15:18:10 +02:00
Ivan Savenko
8149cd6173 Fix missing obstacles on subterranean terrain 2023-01-20 15:16:42 +02:00
Ivan Savenko
f5a7f5173f Cursor type is now configurable in Launcher 2023-01-20 15:15:19 +02:00
Ivan Savenko
e684300715 Fix mod validation for terrains 2023-01-18 15:48:10 +02:00
Andrii Danylchenko
6c843bce0b SDL relative pointer for android 2023-01-18 10:38:55 +02:00
Ivan Savenko
c400416058
Merge pull request #1409 from IvanSavenko/translate_terrain 
Refactoring of terrain handlers
 2023-01-18 00:12:31 +02:00
Ivan Savenko
bafe0c42ce
Merge pull request #1293 from IvanSavenko/translate_launcher 
Translations support - Launcher
 2023-01-17 23:05:14 +02:00
Ivan Savenko
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
Ivan Savenko
633b9ef3be Native terrain is now required for faction, opt-out with value "none" 2023-01-17 22:59:14 +02:00
Andrii Danylchenko
b3f6250f4e
Merge pull request #1439 from dydzio0614/castle-shipyard-animation-fix 
Fix wrong rendering of castle shipyard
 2023-01-16 14:23:37 +02:00
Ivan Savenko
96141f010b Merge remote-tracking branch 'vcmi/develop' into translate_launcher 2023-01-15 23:55:49 +02:00
Ivan Savenko
6985f2e050 Cursor type can now be set in settings.json 2023-01-15 21:18:34 +02:00
Dydzio
6572f5697e Fix wrong rendering of castle shipyard 2023-01-15 19:10:40 +01:00
Ivan Savenko
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
Ivan Savenko
bec894c348 Implemented automatic detection of H3 files language/encoding 2023-01-15 17:32:39 +02:00
Andrey Filipenkov
efbed6000b fix typo 2023-01-15 17:28:09 +02:00
Ivan Savenko
192e856797 merge with vcmi/develop 2023-01-11 16:47:53 +02:00
Ivan Savenko
76540bd960 Fix tactics buttons positioning 2023-01-11 15:10:30 +02:00
Ivan Savenko
668aee71ff Added schemas for rivers & roads, updated terrain schema 2023-01-10 00:01:35 +02:00
Ivan Savenko
c6d62c6297 Added translatable strings for roads & rivers, for use in editor 2023-01-10 00:01:35 +02:00
Ivan Savenko
7c7ae26e67 Map/Road/River identifiers are now private members 2023-01-10 00:01:35 +02:00
Ivan Savenko
f3985d205b Added horseSoundPenalty for terrains (for movement outside of roads) 2023-01-10 00:01:35 +02:00
Ivan Savenko
64885bdf6b Better names for terrain parameters. Support for new movement sounds. 2023-01-10 00:01:35 +02:00
Ivan Savenko
99745b5c3c Fix rivers & roads loading 2023-01-10 00:01:35 +02:00
Ivan Savenko
2de3178158 Fixed game startup 2023-01-10 00:01:35 +02:00
Ivan Savenko
e1799379dd Terrain/Road/River handler are now in compileable state 2023-01-10 00:01:35 +02:00
Ivan Savenko
1468f6aded Converted terrainTypeHandler into proper handler class 2023-01-10 00:01:35 +02:00
Ivan Savenko
4b3782b5cf Post-merge fix 2023-01-09 23:22:59 +02:00
Ivan Savenko
1fece0ce18
Merge pull request #1229 from IvanSavenko/battle_improvements 
Battle: Fixing bugs & Implementation of missing features
 2023-01-09 22:07:13 +02:00
Ivan Savenko
d9aab0a847
Merge pull request #1318 from IvanSavenko/translate_mapeditor 
Translate mapeditor
 2023-01-09 21:25:09 +02:00
Ivan Savenko
bde988ca43
Merge pull request #1329 from IvanSavenko/translate_game 
Translations support - base functionality for main game texts
 2023-01-09 20:33:56 +02:00
Ivan Savenko
84aefc3362 Changed log file format: print timestamp instead of thread ID 2023-01-09 18:34:37 +02:00
Ivan Savenko
f155a35378 Fix positioning of UI elements in BattleWindow 2023-01-09 17:25:49 +02:00
Dydzio
b02948d073 Update defaultMods.json 2023-01-08 01:32:42 +02:00
Ivan Savenko
67f7e5d042 Apply review suggestions 2023-01-07 16:15:45 +02:00
Dydzio
a83c7eb00f Add configurable damage and defense parameters 2023-01-05 17:31:30 +02:00
Ivan Savenko
32cee1414f Use correct visual effect for weakness 2023-01-04 17:40:53 +02:00
Ivan Savenko
ffb37f067a Support for player-colored images in configurable UI 2023-01-04 16:40:15 +02:00
Ivan Savenko
d3ecd43aba Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2023-01-04 16:20:53 +02:00
nordsoft
660d25a335 Make control panel configurable 2023-01-03 13:02:54 +04:00
Ivan Savenko
01d0cd4f7a Changed configurable UI to match text refactoring: 
- help.txt strings are now loaded as (hover, help) pairs
- renamed string pairs from translate.json to use (hover, help) form
- interface builder will always load label texts via unified ID
- interface builder way of loading buttons text has been changed:
- - field has been renamed "zelp" -> "help" for consistency
- - "help" field now only accepts string or object json type
 2023-01-01 14:56:45 +02:00
Ivan Savenko
cb4f5edae9 All Heroes 3 texts are now passed through translator 2023-01-01 14:56:45 +02:00
Ivan Savenko
bdb8e0ee5c Introduced string identifiers for H3 texts, still WIP 2023-01-01 14:56:44 +02:00
Ivan Savenko
5d80457eda Merge with vcmi/develop branch 2022-12-30 00:52:23 +02:00
Ivan Savenko
b275d9de72 merge beta branch into develop 2022-12-29 22:08:53 +02:00
Ivan Savenko
986c0c534d Main menu buttons are now defined using position of their center 
Fixes positioning of main menu buttons in localized versions of the game
 2022-12-29 21:50:04 +02:00
Ivan Savenko
e19dc41295 Support Polish version of H3 data files 2022-12-29 21:50:04 +02:00
Ivan Savenko
f9575d6690 Added languages validation to settings schema 2022-12-28 17:57:03 +02:00
Ivan Savenko
abc7c890bf Backported required changes from Launcher branch 2022-12-26 23:26:19 +02:00
Ivan Savenko
bb65246aa3 Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2022-12-26 01:15:44 +02:00
Ivan Savenko
9d2704adc3 Updated mod.json schema to include localization support 2022-12-26 00:03:00 +02:00
Ivan Savenko
e4e5278f60 Merge with vcmi/develop 2022-12-25 23:10:52 +02:00
Ivan Savenko
4cd91ffbed Save & load language selection 2022-12-25 23:06:22 +02:00
Ivan Savenko
063b8732ff Save compatibility with main branch 2022-12-25 18:07:08 +02:00
Nordsoft91
785787e454
Merge branch 'develop' into interface-builder 2022-12-24 21:56:29 +04:00
Ivan Savenko
325c29da0d Merge remote-tracking branch 'vcmi/develop' into battle_improvements 2022-12-23 14:51:34 +02:00
Ivan Savenko
f073c676f9 Merge 1.1 release into develop 2022-12-23 14:17:18 +02:00
Ivan Savenko
9248e06ae0 Demon summon is now a spell. DEMON_SUMMONING bonus has been removed 2022-12-22 23:11:55 +02:00
Ivan Savenko
4e190b95cc Slighty better color effect for Bloodlust 2022-12-22 00:40:24 +02:00
Ivan Savenko
bab5922951 Spells can now define color muxer effect (e.g. Bloodlust & Petrify) 2022-12-22 00:25:35 +02:00
Ivan Savenko
41b87088d5 Color muxer effects can now be (partially) configured by user. 
TODO: move color muxer effects from spells into spell config
 2022-12-21 23:29:56 +02:00
Ivan Savenko
3cf1e3b4d4 Restored neutral faction ID, changed warnings related to H3 ID's 2022-12-20 01:55:59 +04:00
Ivan Savenko
01e8a83c56 Expanded schema accoring to Nordsoft info 2022-12-20 01:55:59 +04:00
Ivan Savenko
5ae17cb1ff Moved tower shooters info to "vcmi" mod 
Required for file presence validation checks to pass since tower shooter
icons reside in vcmi mod
 2022-12-20 01:55:59 +04:00
Ivan Savenko
e2cc73d67b Fix fire shield sounds 2022-12-18 22:43:13 +02:00
Ivan Savenko
52fc5b3c39 Exploded mines now send ACTIVATE flag to client to play effect 2022-12-17 19:37:00 +02:00
Ivan Savenko
2e22b04c4a Fixes #1045 - Berserk now lasts until attack 2022-12-17 12:55:34 +02:00
nordsoft
b1f2c7aed4 Team alignments implemented 2022-12-17 08:19:16 +04:00
nordsoft
4f5fab702e Support roads selection in random map tab 2022-12-17 04:54:37 +04:00
nordsoft
d93e844609 Use roads names instead of their filenames 2022-12-17 04:54:01 +04:00
Ivan Savenko
39a54ff8ff Fixes #1139 - Unicorns now cast blind at expert level 2022-12-16 21:46:52 +02:00
nordsoft
8f089b3302 Rename folder 2022-12-16 02:19:23 +04:00
nordsoft
2fe951f819 Merge remote-tracking branch 'upstream/develop' into interface-builder 
# Conflicts:
#	client/lobby/RandomMapTab.cpp
 2022-12-15 04:47:11 +04:00
Ivan Savenko
fb3a08e0a6 Added fading animation for fade-in effect for summons 2022-12-14 12:04:37 +02:00
Ivan Savenko
e791323502 Implemented placement sound for obstacles 2022-12-13 21:31:49 +02:00
nordsoft
5e3504f578 Add improvements 2022-12-12 11:38:27 +04:00
nordsoft
8dbc5c1c1f Make each windows coniguration in separate file 2022-12-12 04:52:44 +04:00
nordsoft
0104c77d61 Interface builder for random map tab 2022-12-12 03:27:59 +04:00
Ivan Savenko
15051c33ce Remove casting sound from quick sands - should be applied on obstacle 
creation
 2022-12-02 01:57:04 +02:00
Ivan Savenko
495e0b3657 Merge remote-tracking branch 'vcmi/develop' into battleint_refactor 2022-12-01 23:58:01 +02:00
Andrii Danylchenko
82179a9cdb
Merge pull request #1176 from IvanSavenko/tower_shooter_icons 
Tower shooter icons fix
 2022-12-01 12:30:24 +02:00
nordsoft
b7cab0e01d Merge remote-tracking branch 'upstream/develop' into battle-dialog 2022-11-30 01:03:57 +04:00
Nordsoft91
89b8b87a6b
Merge pull request #1156 from vcmi/features/online 
Online mode
 2022-11-29 20:43:39 +04:00
Ivan Savenko
26a2ac72b8 Added default tower shooter icons to all standard factions 2022-11-29 15:14:57 +02:00
Ivan Savenko
8b7ca176f8 Updated schema 2022-11-29 15:14:10 +02:00
Ivan Savenko
3d1f6df0e2 Added simple icon for tower shooter creature, fixes #791 2022-11-29 12:18:27 +02:00
Ivan Savenko
3e58d1e3c5 Merge remote-tracking branch 'refs/remotes/vcmi/develop' into battleint_refactor 2022-11-28 16:10:13 +02:00
Ivan Savenko
9f21569a79 Next batch of siege fixes 2022-11-27 22:50:18 +02:00
Ivan Savenko
35576834c9 Fixing sieges, part 1 2022-11-27 20:21:51 +02:00
Ivan Savenko
0cae259f53 Most of rendering in BattleInt is done via canvas 
- refactoring of CBattleStacksController.cpp
- moved EAlignment enum to Geometries.h from CIntObject
- renamed EAlignment to ETextAlignment, to avoid conflict with good/evil
alignemt
- ETextAlignment is now enum class
 2022-11-26 23:12:20 +02:00
nordsoft
44e469a2c7 Merge branch 'develop-upstream' into battle-dialog 2022-11-25 14:38:49 +04:00
nordsoft
8f938c7c9b Change default value for DWELLINGS_ACCUMULATE_CREATURES 2022-11-25 03:41:14 +04:00
Nordsoft91
3133c238b8 Merge pull request #1146 from IvanSavenko/ray_projectile 
Implemented ray-like projectiles for shooters
 2022-11-22 03:36:50 +04:00
Ivan Savenko
0b7edd471c
Merge pull request #1128 from IvanSavenko/movement_fix 
Fix #1088 - Refactoring of hero movement animation code
 2022-11-17 13:05:15 +02:00
Ivan Savenko
9afc1eed49 Expanded schema to validate ray configuration 2022-11-16 12:26:56 +02:00
nordsoft
15ba4cda70 Cosmetic improvements for lobby 2022-11-16 04:22:48 +04:00
nordsoft
b253b19dc3 Support draw scenario (doesnt work properly) 2022-11-16 02:50:47 +04:00
Ivan Savenko
6678a747bb Implemented ray-like projectiles for shooters 
- Added missing support for ray-like projectiles
- Archmages, Evil Eyes and Beholders now use ray for shooting
- New method to draw 1 pixel-wide line with color gradient at arbitrary
angle
- fixed incorrect attackClimaxFrame field for Archmages
 2022-11-15 21:42:16 +02:00
nordsoft
e7a8466e2b Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-15 22:09:46 +04:00
Ivan Savenko
153315e8c3 Refactoring of hero movement animation code 
Replaced ancient and obscure code that had separate routines for each
possible movement direction with generic version.
Fixes #1088 which apparently was due to bug in one of these routines
 2022-11-14 12:32:40 +02:00
Nordsoft91
072e2d72bb
Merge branch 'develop' into battle-dialog 2022-11-12 17:14:15 +04:00
nordsoft
97e5fc8a07 Lobby works 2022-11-08 04:44:34 +04:00
nordsoft
dcda359567 Enable quick combat by default 2022-11-05 22:51:02 +04:00
krs
aab394ff93 #1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json 2022-11-04 00:06:15 +02:00
nordsoft
1c84cc4521 Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-01 16:30:27 +04:00
nordsoft
dd45d1a9cf Develop game part 2022-10-25 05:27:53 +04:00
nordsoft
aac859a030 Store settings 2022-10-23 23:24:33 +04:00
Andrii Danylchenko
b43e0ff9e4
Merge pull request #972 from vcmi/cpp-map-editor 
Cpp map editor
 2022-10-22 12:42:27 +03:00
nordsoft
5743310aec Revert settings.json 2022-10-09 00:13:39 +04:00
nordsoft
4cb31ea912 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-08 23:24:57 +04:00
nordsoft
ea49b8cf40 Cleanup code 2022-10-06 17:56:54 +04:00
nordsoft
0ea5a8fbe7 Merge remote-tracking branch 'upstream/develop' into mp-disconnection 
# Conflicts:
#	server/CVCMIServer.cpp
 2022-10-04 17:41:43 +04:00
nordsoft
16a5414247 Reconnection partially works 2022-10-04 05:09:03 +04:00
nordsoft
512cf014aa Freeze current state 2022-10-03 20:47:00 +04:00
Andrii Danylchenko
a2dbb6c8ac
Merge pull request #978 from kambala-decapitator/hide-unsupported-resolutions 
Hide unsupported resolutions
 2022-09-30 17:34:07 +03:00
DjWarmonger
58a3abb643
Merge pull request #963 from vcmi/terrain-rewrite 
Terrain rewrite
 2022-09-29 18:24:05 +02:00
Andrey Filipenkov
90eeb41618 fix healing from Elixir of Life 2022-09-27 14:03:36 +03:00
Andrey Filipenkov
e8396401f9 fetch Extra Resolutions mod path from the settings schema 2022-09-27 11:56:13 +03:00
Tomasz Zieliński
f386f42166 Merge remote-tracking branch 'origin/develop' into terrain-rewrite 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
 2022-09-27 07:50:17 +02:00
Nordsoft91
d4f97aadf0
Merge branch 'develop' into incomatibility-response 2022-09-25 13:26:07 +04:00
nordsoft
d32898b39b Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 
# Conflicts:
#	CMakeLists.txt
 2022-09-25 00:58:43 +04:00
Andrii Danylchenko
4205701f96 #973 - use ship battleground for favorable winds 2022-09-24 17:43:37 +03:00
Nordsoft91
824aec8416
Apply suggestions from code review 
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
 2022-09-24 13:03:46 +04:00
Tomasz Zieliński
a5077245a8 Merge remote-tracking branch 'origin/develop' into terrain-rewrite 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
 2022-09-23 20:01:13 +02:00
Tomasz Zieliński
09931b6c9d Moved roads and rivers to config files. 
This also allows adding new ones via mods.
 2022-09-23 18:57:16 +02:00
nordsoft
8f6f9707a6 Read error message from translate.json 2022-09-23 15:20:11 +04:00
Andrii Danylchenko
1c62f9db1a
Merge pull request #970 from Nordsoft91/srv-healthcheck 
Add simple server healthcheck
 2022-09-23 14:00:45 +03:00
Tomasz Zieliński
6aaf77812b Changed logic for zone placement. 
Now every zone can be surface, underground, or both. This is separate from water <-> land distinction.

Iand type is now a combination of flags and can take multiple values: "type": ["LAND", "WATER", "SURFACE", "SUB", "ROCK"]. In nothing is specified, terrains get LAND | SURFACE flags by default.

Non-surface zones will default to DIRT, and non-underground zones will default to SUBTERRA.
 2022-09-22 18:23:31 +02:00
nordsoft
7de4d94aff Move text string to translations.json 2022-09-22 20:06:14 +04:00
nordsoft
89d0de53da Merge remote-tracking branch 'upstream/develop' into features/cpp-map-editor 
# Conflicts:
#	.github/workflows/github.yml
#	launcher/modManager/cmodlist.cpp
#	lib/CModHandler.cpp
#	lib/CModHandler.h
 2022-09-22 17:09:47 +04:00
Tomasz Zieliński
97c17c6294 - Terrain config 
- Fix for underground terrains
 2022-09-21 14:11:32 +02:00
Tomasz Zieliński
494b0f0226 First version that compiles 2022-09-21 11:34:23 +02:00
Andrey Filipenkov
0163190ac5 move hardcoded strings to JSON file 2022-09-18 17:43:37 +03:00
nordsoft
0b9f601d2c Squashing editor 2022-09-18 03:23:17 +04:00