Konstantin
a2d4c72016
vcmi: morale and luck now also IFactionMember
...
Not all bonus bearers have morale and luck, only faction members
2023-05-02 00:53:51 +03:00
Konstantin
e37f798a68
vcmi: split bonus updaters
2023-05-02 00:53:50 +03:00
Konstantin
416faf521e
vcmi: move limiters outside of HeroBonus.cpp
...
This will help for recompilation.
2023-05-02 00:53:50 +03:00
Konstantin
6fa1b2b19f
vcmi: move bonuses to its own folder
2023-05-02 00:53:50 +03:00
Konstantin P
4b2a09dae7
FactionMember: move code around
2023-05-02 00:53:50 +03:00
Ivan Savenko
916b41d9a7
Merge pull request #2078 from IvanSavenko/shortcuts
...
Basic shortcuts system
2023-05-01 21:45:52 +03:00
nordsoft
fdac1d66d8
Fix warnings
2023-05-01 21:49:37 +04:00
nordsoft
32277a007d
Fix compilation after merge
2023-05-01 21:49:37 +04:00
nordsoft
07b2052679
Bit refactoring
2023-05-01 21:49:37 +04:00
nordsoft
68fa7aaf35
Remove limitations for amount of skills
2023-05-01 21:49:37 +04:00
nordsoft
a4fd6c1c92
Move trading window title to config
2023-05-01 21:49:37 +04:00
nordsoft
11840b9f6d
Get rid of hardcoded logic for markets
2023-05-01 21:49:37 +04:00
nordsoft
07f7c318dc
Adjust client part for markets
2023-05-01 21:49:37 +04:00
nordsoft
4b1b58b617
Change Callback to abstract
2023-05-01 21:49:37 +04:00
nordsoft
59bc9326e9
Remove excess pointer from market interface
2023-05-01 21:49:37 +04:00
Ivan Savenko
e9e5355af0
Added commented-out wog campaigns set
2023-05-01 18:00:35 +03:00
Ivan Savenko
0662ad49dd
Fix build
2023-05-01 17:59:21 +03:00
Ivan Savenko
6c637dd8e6
Integrated hotkeys with InterfaceObjectConfigurable
2023-05-01 17:59:21 +03:00
Ivan Savenko
dea10e6091
Use more descriptive names for hotkeys
2023-05-01 17:59:20 +03:00
Ivan Savenko
a654cc2391
Removed vstd::advance. Added vstd::next to handle similar cases.
2023-05-01 17:58:18 +03:00
Ivan Savenko
832e56e005
Implementation of (very basic) shortcuts system
...
- Added EShortcut enumeration that contains all in-game shortcuts
- CIntObject::keyPressed now receive values from hotkey enumeration
- On keypress, SDL key code will be translated to shortcut ID
- Removed access to SDL key codes from most of engine
2023-05-01 17:58:17 +03:00
Ivan Savenko
4aa232a60a
Merge pull request #2055 from SoundSSGood/cartifactholder-rework
...
Artifact related code refactoring part2 (client CArtifactHolder)
2023-05-01 02:33:08 +03:00
SoundSSGood
8b531ca6c4
CArtifactHolder divided into files
2023-05-01 00:34:45 +03:00
Konstantin
86f5d6de69
vcmi: modernize headers
2023-04-30 13:35:54 +03:00
Ivan Savenko
d985ac90d3
Merge master -> develop
2023-04-28 22:57:25 +03:00
Ivan Savenko
76d5b459f1
Fixed music playback on switching between towns
2023-04-28 16:53:45 +03:00
Konstantin P
b472c89276
vcmi: make some CStack properties private
...
There is a getters for this properties already available
2023-04-27 20:58:49 +03:00
Ivan Savenko
fb739e7186
Merge beta -> develop
2023-04-26 22:48:08 +03:00
krs
e348193f7e
Tactics movement is limited to movement range
2023-04-26 21:56:20 +04:00
Ivan Savenko
48abf46824
Merge pull request #2005 from IvanSavenko/advmap_refactor
...
Refactoring of adventure map interface
2023-04-24 17:19:22 +03:00
Ivan Savenko
3ac713d6a8
Fix crash on dereferencing nullptr
2023-04-24 17:17:12 +03:00
Ivan Savenko
d3c1c92a03
Do not update minimap using puzzle map data
2023-04-24 17:16:55 +03:00
Ivan Savenko
fa156568c4
Fixes according to review
2023-04-24 16:58:15 +03:00
Nordsoft91
f39f208e05
Merge pull request #1915 from Nordsoft91/vcmi-campaign
...
VCMI campaigns format
2023-04-23 19:09:59 +04:00
SoundSSGood
dcac8252f3
fixed windows positions
2023-04-23 14:57:45 +03:00
SoundSSGood
a8220c551f
fixed init CArtifactsOfHero
2023-04-23 14:33:47 +03:00
SoundSSGood
177523d972
askToAssemble, askToDisassemble
2023-04-23 14:17:27 +03:00
SoundSSGood
1046964eef
CArtifactHolder
2023-04-23 14:14:24 +03:00
Nordsoft91
a553a4aa66
Merge pull request #2030 from Nordsoft91/boats
2023-04-22 03:27:00 +04:00
Ivan Savenko
80b37a3019
Fixed remaining regressions
2023-04-20 22:19:10 +03:00
Ivan Savenko
bb08a0afc8
Moved selection logic to player state
2023-04-20 22:04:24 +03:00
Ivan Savenko
e8718a46cc
Fix regressions
2023-04-20 22:04:24 +03:00
Ivan Savenko
dd227d24c3
Formatting and cleanup
2023-04-20 22:04:24 +03:00
Ivan Savenko
365f552fa1
Added API for owned towns access
2023-04-20 22:04:24 +03:00
Ivan Savenko
5cbd0f8fc8
API for wandering heroes access
2023-04-20 22:04:24 +03:00
Ivan Savenko
3eac6f323e
added API for sleeping heroes access
2023-04-20 22:04:24 +03:00
Ivan Savenko
6a46138617
Moved current selection to local state class
2023-04-20 22:04:24 +03:00
Ivan Savenko
f6d480cbb2
Moved player-specific heroes & towns information to new class
2023-04-20 22:04:24 +03:00
Ivan Savenko
4a169972f0
Further refactoring to cleanup code of advmap and locplint
2023-04-20 22:04:24 +03:00
Ivan Savenko
20de44d4a5
Reodered methods in file to group similar code
2023-04-20 22:04:24 +03:00
Ivan Savenko
7db67a3101
int3 now has proper hasher function
2023-04-20 22:04:24 +03:00
Ivan Savenko
4ec32e4dcd
Renamed CAdvMapInt to its proper full name
2023-04-20 22:04:24 +03:00
Ivan Savenko
f1902ab247
Initial refactoring to encapsulate adventure map
2023-04-20 22:03:28 +03:00
nordsoft
de159df481
Rename boats
2023-04-20 21:20:51 +04:00
Ivan Savenko
24c6587072
Fixed crash on leaving to main menu from battle in hotseat mode
2023-04-20 19:56:35 +03:00
Ivan Savenko
f245080cba
Fix missing error message on casting spell in hotseat
2023-04-20 19:24:13 +03:00
nordsoft
753b72f96d
Revert "Hidden maps"
...
This reverts commit e669d31d33
2023-04-20 19:50:00 +04:00
Ivan Savenko
6df85be4b3
Fixed death animation of Efreeti killed by petrification attack
2023-04-20 18:13:01 +03:00
Ivan Savenko
5c9ae8aafc
Implemented spell range overlay for Dimension Door and Scuttle Boat
2023-04-20 14:15:08 +03:00
Ivan Savenko
b3207f3465
RMG tab will now show all templates but will block invalid map sizes
2023-04-19 23:14:23 +03:00
Ivan Savenko
b517adfb25
Fixed crash on empty save game list after filtering
2023-04-19 23:12:30 +03:00
Ivan Savenko
3d30e04184
Fixed centering of scenario information window
2023-04-19 23:11:44 +03:00
Ivan Savenko
4bb4d7e7a5
Merge pull request #1989 from SoundSSGood/refactoring-arts-p1
...
Artifact related code refactoring part1 (initial)
2023-04-19 15:31:11 +03:00
nordsoft
f464ca3560
Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
...
# Conflicts:
# lib/mapping/CCampaignHandler.cpp
2023-04-19 02:45:49 +04:00
nordsoft
0a28262c15
Merge remote-tracking branch 'upstream/develop' into boats
...
# Conflicts:
# AI/VCAI/Pathfinding/AINodeStorage.cpp
2023-04-19 02:22:19 +04:00
nordsoft
d1dacd45e2
Animations from config
2023-04-19 00:14:15 +04:00
Ivan Savenko
e8788cf4c4
Merge pull request #1999 from Laserlicht/patch-2
...
Big/Vector Icons
2023-04-18 16:23:00 +03:00
Ivan Savenko
56de0c9f56
Merge pull request #2015 from rilian-la-te/optional-variant-any
...
vcmi: migrate to C++17
2023-04-18 15:44:52 +03:00
nordsoft
ed798b06da
Prepare transport enum
2023-04-18 13:04:49 +04:00
nordsoft
2babb5add5
Fix boat extra animations
2023-04-17 23:39:34 +04:00
nordsoft
80220fda5b
Merge remote-tracking branch 'upstream/develop' into vcmi-campaign
...
# Conflicts:
# lib/mapping/CMap.h
2023-04-17 04:54:57 +04:00
nordsoft
91b4782a2f
Refactor more fields from campaign header
2023-04-17 04:47:54 +04:00
nordsoft
70f4cc5e0f
Refactor campaign regions
2023-04-17 04:26:35 +04:00
krs
91c96b1b68
Fix for merge.
2023-04-17 00:53:25 +03:00
Konstantin
54eb550eb9
vcmi: remove unused functions now
2023-04-17 00:43:13 +03:00
Konstantin
7a5775a9f9
vcmi: use std::optional
2023-04-17 00:43:13 +03:00
Konstantin
0d35606a44
vcmi: use std::variant
2023-04-17 00:43:13 +03:00
krs
14cbdf7ab0
Split Process console commands code into individual functions
...
Extracted functions for each if branch, added one line doc for each function, rearranged the commands to be groupped more logically.
2023-04-16 23:45:37 +03:00
Ivan Savenko
e3ed728193
Merge pull request #1932 from rilian-la-te/proper-teleport
...
VCMI: teleport redesign
2023-04-16 22:52:01 +03:00
nordsoft
954a2abb71
Verifying mods before starting map
2023-04-16 15:38:13 +04:00
Michael
d64106b700
Update generate_icns.py
2023-04-16 12:33:35 +02:00
Ivan Savenko
1704fab3a2
Fix assertion failure on fighting against AI with tactics
2023-04-15 17:20:38 +03:00
Ivan Savenko
cc8c1c769a
Fix duplicated maps in scenario selection screen
2023-04-15 17:20:38 +03:00
Ivan Savenko
de855085f0
Added information on banks, seer hut and monster properties
2023-04-15 17:20:38 +03:00
Ivan Savenko
3738171b21
Refactoring of H3M loader to make HotA format support easier
...
- extracted low-level reader from MapFormatH3M class
- added separate structure to define version-specific values
- cleared up some H3M format edge cases
- replaced witch hut skill vector with set
- converted several fields to enum type
2023-04-15 17:20:38 +03:00
Laserlicht
c6458762ce
fix
2023-04-15 13:15:51 +02:00
Laserlicht
62ccb2d1da
Add different sizes
2023-04-15 13:13:44 +02:00
Laserlicht
6e22663121
new icons
2023-04-15 12:52:11 +02:00
Laserlicht
0c1c7bc24b
ico
2023-04-15 12:38:35 +02:00
Michael
37fb77521b
Update generate_icns.py
2023-04-15 12:33:24 +02:00
Nordsoft91
6b12ee044f
Merge pull request #1969 from Nordsoft91/spectator
...
Single player spectator
2023-04-15 03:33:18 +04:00
SoundSSGood
9a838598a6
arts refactoring part1
2023-04-15 00:10:39 +03:00
Ivan Savenko
b354f99cc3
Merge pull request #1936 from IvanSavenko/cpp_17_upgrade
...
Upgrade c++ standard to c++17
2023-04-14 19:21:17 +03:00
Ivan Savenko
128764b1c9
Merge pull request #1968 from rilian-la-te/fix-caster-tactics
...
Fix caster tactics
2023-04-14 18:59:03 +03:00
Ivan Savenko
44b83b2e11
Merge master -> develop
2023-04-14 16:51:35 +03:00
nordsoft
289259f64a
Unblock spectator interface during AI turns
2023-04-14 00:22:47 +04:00
nordsoft
35fa06008b
Revert "Auxiliary commit to revert individual files from fb4db41891e157f4f7d72ee759141754d2df680c"
...
This reverts commit 129b15a49c911315789721b7e62b93757819519a.
2023-04-14 00:20:51 +04:00
nordsoft
413870d39a
Revert "Single player spectator"
...
This reverts commit b9e5e42647
2023-04-14 00:18:29 +04:00
Ivan Savenko
1978e6f8e8
Do not show unit information on dead creatures
2023-04-13 21:16:55 +03:00
nordsoft
b9e5e42647
Single player spectator
2023-04-13 13:12:00 +04:00
