Ivan Savenko
de5227142b
Implemented message receiving / broadcasting
2024-01-19 23:49:59 +02:00
Ivan Savenko
f10b6df989
Implemented messages sending and storing in database
2024-01-19 23:49:59 +02:00
Ivan Savenko
c2c43602ea
Initial version of global lobby server available in client
2024-01-19 23:49:59 +02:00
Ivan Savenko
339fad6e27
Merge pull request #3528 from vcmi/master
...
Merge master -> develop
2024-01-19 21:19:20 +02:00
luk3Z
3fe8872abd
Update difficulty.json
2024-01-19 19:15:19 +01:00
Dydzio
d27c51ae76
Update bonuses.json
2024-01-19 18:13:05 +01:00
Ivan Savenko
44d3629028
Fix schema
2024-01-19 16:30:15 +02:00
Ivan Savenko
bd5682ecc3
Merge remote-tracking branch 'vcmi/master' into develop
2024-01-19 13:49:54 +02:00
Laserlicht
a1f4fcb78a
hide adventuremap
2024-01-18 00:47:18 +01:00
Ivan Savenko
03675e1c48
Remove incorrect bonus - Black Dragons dont hate Giants
2024-01-15 21:09:22 +02:00
Ivan Savenko
a32ef673f7
Merge pull request #3482 from IvanSavenko/extend_hota_bonuses
...
Extend hota bonuses
2024-01-15 13:47:13 +02:00
Ivan Savenko
9acd436a09
Review suggestion
2024-01-15 13:18:27 +02:00
Ivan Savenko
b4a1a755a4
Merge pull request #3498 from IvanSavenko/simturns_pathfinder
...
[1.4.3] Fixes for simultaneous turns
2024-01-15 12:00:54 +02:00
Ivan Savenko
c940bf226e
Merge pull request #3499 from IvanSavenko/bugfixing
...
[1.4.3] Bugfixing
2024-01-15 12:00:31 +02:00
Ivan Savenko
cc6d4fae4c
Show tooltip on simturns AI option right-click
2024-01-14 16:02:57 +02:00
Ivan Savenko
b08462d555
Change default SDL driver name from opengl to empty (autoselection)
2024-01-14 14:29:13 +02:00
Ivan Savenko
8303ce5d13
Added option to ignore guards in pathfinder
...
Used for simturns contact detection, by default disabled for player
pathfinding
2024-01-13 19:44:37 +02:00
Ivan Savenko
f6e0f46040
Merge pull request #3467 from dydzio0614/hota-fixes
...
Fix HotA creature abilities (add bonuses allowing implementing them)
2024-01-12 21:55:18 +02:00
M
67f18729fa
REVENGE bonus that matches HotA haspid ability
2024-01-09 19:10:43 +01:00
Loki Laufeyjarson
0ac844e958
Fixed Reverse-Assignment of Dungeon Hero Classes
...
For example making a custom dungeon here and giving him warlock made him an overlord and vice versa
2024-01-09 02:21:14 +01:00
Dydzio
675f9b11fa
Add ENEMY_ATTACK_REDUCTION bonus - fixes HotA Nix
2024-01-08 19:37:04 +01:00
Ivan Savenko
51b7de4b98
Fix double off-by-one bug with CREATURE_GROWTH bonus
2024-01-05 16:57:44 +02:00
Dydzio
97977c06dc
Merge remote-tracking branch 'origin/beta' into hota-fixes
2024-01-04 23:33:56 +01:00
Dydzio
7283a4861e
Initial version of ACCURATE_SHOT implementation
2024-01-04 22:27:51 +01:00
Dydzio
898b8f3c71
Add initial version of Ferocity ability (for Ayssids)
2024-01-01 19:58:32 +01:00
Dydzio
9dd1dbfe37
Fix wrong comment
2024-01-01 17:53:05 +01:00
Laserlicht
2e7ac8d02d
small config fixes
2023-12-28 20:55:37 +01:00
Laserlicht
cb9c4bbaf0
unlimited replay option
2023-12-28 20:48:19 +01:00
Laserlicht
a3e27b859e
extra option tab
2023-12-28 19:41:01 +01:00
Laserlicht
fc4827c89c
option for allowing cheats
2023-12-27 14:39:35 +01:00
Dydzio
046d3abee4
Add new setting for instant adventure map fade in / fadeout effects
2023-12-24 17:18:48 +01:00
Ivan Savenko
85d930bbd0
Merge pull request #3374 from dydzio0614/default-large-spellbook
...
Default large spellbook
2023-12-24 16:23:29 +02:00
Laserlicht
39c58a9d94
disable animation button
2023-12-24 00:41:29 +01:00
Ivan Savenko
822677af77
More correct frenzy spell creature immunities
2023-12-24 01:09:10 +02:00
Dydzio
896f3108ee
Large spellbook by default
2023-12-23 17:53:06 +01:00
Tomasz Zieliński
47915e02fa
Ban Armageddon's Blade and Vial of Dragon Blood by default
2023-12-23 13:12:09 +01:00
Ivan Savenko
20ede710c2
Merge pull request #3362 from IvanSavenko/terrain_decorations
...
Terrain decorations level
2023-12-22 23:39:32 +02:00
Ivan Savenko
c4b8cc877b
Remove no longer used file
2023-12-22 18:40:28 +02:00
Ivan Savenko
19e851ddff
Implemented configurable level of decorations for terrains
2023-12-22 17:41:30 +02:00
Dydzio
fe39faf36c
Add UNTIL_OWN_ATTACK bonus duration and use for berserk
2023-12-19 19:52:40 +01:00
Dydzio
661e5295f1
Change infoBarCreatureManagement setting: true by default
2023-12-17 16:31:49 +01:00
Ivan Savenko
543ee597b8
Fix localization-related error messages
2023-12-11 18:23:52 +02:00
Ivan Savenko
828077c18b
Added special object "nothing" to handle unknown map objects on some
...
custom maps
2023-12-11 17:25:19 +02:00
Ivan Savenko
4fa33c8d2e
Merge pull request #3279 from Laserlicht/smooth_scroll_fix
...
smooth scroll fix and gui option to disable
2023-12-10 22:49:43 +02:00
Laserlicht
df2a5f05d8
audio mute on focus lost setting
2023-12-10 14:49:27 +01:00
Laserlicht
76bd3dde7f
missed hover
2023-12-10 14:29:11 +01:00
Laserlicht
e74c2262c3
add option to gui to disable smooth dragging
2023-12-10 13:38:58 +01:00
Ivan Savenko
c9de10ea74
Merge pull request #3259 from vcmi/fix_corpse
...
Fix corpse
2023-12-07 23:55:07 +02:00
Ivan Savenko
edbe25b33a
Updated layout and localizations
2023-12-07 16:36:44 +02:00
Tomasz Zieliński
960697873a
Fix object configs
2023-12-07 14:54:05 +01:00
Ivan Savenko
861c53059e
Added callbacks for preset dropdowns
2023-12-07 13:57:16 +02:00
Ivan Savenko
cb8e9e633a
Implemented layout for simturn/timer presets
2023-12-07 13:57:16 +02:00
Tomasz Zieliński
6cd19b81dd
Working fir for Corpse issue:
...
- Do not place guard next to blockVis object, if possible
- Do not place two blockVis objects next to each other
2023-12-06 20:49:28 +01:00
Ivan Savenko
d919cb0eac
Merge pull request #3240 from IvanSavenko/bugfixing
...
[1.4.0] Bugfixing for beta
2023-12-02 12:20:37 +02:00
Dydzio
fc035b1b55
Change large spellbook config section to gameTweaks
2023-11-28 22:30:50 +01:00
Ivan Savenko
d326c53b9a
AI will now respect current value of "Use spells in autocombat" setting
2023-11-28 15:48:35 +02:00
Ivan Savenko
6cfa21466c
Fixed Gundula specialty: offence specialist, not sorcery
2023-11-28 15:47:55 +02:00
Dydzio
a4d76b2529
Split large spellbook from UI enhancements setting
2023-11-26 19:16:53 +01:00
Ivan Savenko
26d22d0d9d
Fix guards composition of Pyramids
2023-11-21 21:24:06 +02:00
Ivan Savenko
845a259619
Disable quick combat by default to avoid confusing players
2023-11-20 14:39:19 +02:00
Ivan Savenko
f7ef474201
Fix format of custom win/loss conditions for h3 campaigns
2023-11-19 23:59:49 +02:00
Ivan Savenko
c0e54b338a
Merge pull request #3190 from gamestales/gamestales/962-map-object-morale-description
...
Use arraytxt for object bonus description
2023-11-16 17:28:09 +02:00
gamestales-com
faea00a7e1
Use arraytxt for object bonus description
2023-11-15 14:32:40 +01:00
Ivan Savenko
f65f4b1285
Disable new UI if enhancements are off
2023-11-13 19:49:41 +02:00
Ivan Savenko
d1ae5bbee5
Implement AI simturns checkbox
2023-11-13 19:06:56 +02:00
Ivan Savenko
c5eeaa6526
Added non-linear slider for better simturn duration selection
2023-11-13 19:06:56 +02:00
Ivan Savenko
7391f2a6ee
Added custom-made blue version of checkbox
2023-11-13 19:06:56 +02:00
Ivan Savenko
e160b8557b
Implement min/max simturns callbacks
2023-11-13 19:06:56 +02:00
Ivan Savenko
1f045ab128
Layout improvements for turn options tab
2023-11-13 19:06:56 +02:00
Ivan Savenko
32633d5f52
Initial version of Turn Options tab screen
2023-11-13 19:06:56 +02:00
Ivan Savenko
0b7c61e53f
Fix Tree of Knowledge config
2023-11-12 16:58:02 +02:00
Ivan Savenko
2835044282
Merge pull request #3159 from IvanSavenko/beta
...
Merge beta -> develop (rebased)
2023-11-07 22:49:29 +02:00
Dydzio
aa96a53f37
Fix comment
2023-11-07 20:11:18 +02:00
Dydzio
66110d7bac
Fix commanders levelup bonus to match WoG
2023-11-07 20:10:55 +02:00
Tomasz Zieliński
ec0bf05163
Rename "cpu" parameter to correct "humans"
2023-10-30 17:21:03 +01:00
krs
ab7caa0777
Removed space after Torosar hero name
2023-10-23 23:57:37 +02:00
Ivan Savenko
3880ea58b9
Merge branch 'josch/dos2unix' into develop
2023-10-22 18:39:03 +03:00
Ivan Savenko
3867e512f7
Merge pull request #3064 from IvanSavenko/bonus_metaidentifier
...
Type-safe bonus system
2023-10-22 18:34:12 +03:00
Ivan Savenko
b0a67a66e4
Merge pull request #3092 from IvanSavenko/compatibility_mods
...
Better support for compatibility mods
2023-10-22 18:02:45 +03:00
Ivan Savenko
36a1d6c415
Removed remaining integer bonus subtypes from configs
2023-10-22 16:55:19 +03:00
Ivan Savenko
0a10fc30b8
(lib) Bonus subtype is now stored as metaidentifier that can store any
...
other identifier inside it
2023-10-22 16:54:43 +03:00
Ivan Savenko
b50ebba1ba
Added mod type "Compatibility" that is hidden in launcher
2023-10-21 23:55:20 +03:00
Ivan Savenko
b9540fa507
Split object jsons into smaller files
2023-10-21 00:31:48 +03:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix)
...
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.
This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.
Files that are Windows specific like *.vcxproj and *.props files were
not converted.
Closes : #3073
2023-10-19 16:23:21 +02:00
Ivan Savenko
01920bb74e
Fix treasure chests
2023-10-19 15:41:41 +03:00
Ivan Savenko
8f4791914e
Show content preview only for Witch Huts / Shrines / Tree
2023-10-19 15:17:58 +03:00
Ivan Savenko
530c70c282
Added object descriptions present in H3
2023-10-19 13:34:15 +03:00
Ivan Savenko
ce480c8c84
Fixed Scholar handling
2023-10-18 17:14:22 +03:00
Ivan Savenko
48eba6c362
Fix Witch Hut messages to match H3
2023-10-17 16:52:57 +03:00
Ivan Savenko
eedaa63f5f
Hnadling of Shrine messages now matches H3
2023-10-17 16:35:34 +03:00
Ivan Savenko
850d0ff8eb
Show (mostly) correct messages in Shrines
2023-10-16 18:16:15 +03:00
Ivan Savenko
0ea44520fd
Fix build
2023-10-16 00:12:39 +03:00
Ivan Savenko
e10de0594e
Scholar is now configurable object (partial)
2023-10-16 00:12:39 +03:00
Ivan Savenko
ca368f606f
Added new files
2023-10-16 00:12:39 +03:00
Ivan Savenko
bb05c2dea5
Implemented configurable shrine
2023-10-16 00:12:39 +03:00
Ivan Savenko
98fd939ed6
Cartographer/Observatory is now configurable object
2023-10-16 00:12:38 +03:00
Ivan Savenko
f3ed589e35
Use same fow radius calculation as in H3
2023-10-16 00:12:38 +03:00
Ivan Savenko
c0a31b716a
Added new version of witch hut config
2023-10-16 00:12:38 +03:00
Ivan Savenko
fd01a25352
Implemented basic version of configurable Witch Hut
2023-10-16 00:12:38 +03:00
Ivan Savenko
f72a106e30
Overwrite Catherine / Kendal portraits in AB+ correctly
2023-10-04 23:23:09 +03:00
Ivan Savenko
037efdf5fc
Improvements to type safety of Identifier class
...
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework
2023-10-02 21:03:16 +02:00
Nordsoft91
041ffceb07
Merge pull request #2952 from Alexander-Wilms/develop
...
Enable VSync to prevent screen tearing while scrolling across map
2023-10-01 14:08:00 +02:00
Laserlicht
7f4361eb10
name -> path
2023-10-01 01:11:11 +02:00
Laserlicht
648a37310f
description
2023-10-01 00:35:11 +02:00
Laserlicht
65c21064b5
added var
2023-10-01 00:18:25 +02:00
Laserlicht
61aae7bccc
code review
2023-09-30 22:49:22 +02:00
Laserlicht
2eb4413978
fix height
2023-09-30 20:44:46 +02:00
Laserlicht
73a05d82e1
fix
2023-09-30 20:18:12 +02:00
Laserlicht
c6adcc40f5
add date; cleanup
2023-09-30 17:56:51 +02:00
Laserlicht
79e66c38df
layout
2023-09-30 17:14:22 +02:00
Ivan Savenko
71a1ed816a
Merge pull request #2892 from Laserlicht/highscore_menu
...
Highscore Menu & end video
2023-09-27 15:48:47 +03:00
Ivan Savenko
efe3393408
Merge pull request #2947 from Laserlicht/enableUiEnhancements_button
...
enableUiEnhancements button
2023-09-27 15:47:25 +03:00
Ivan Savenko
94dbde05a0
Merge pull request #2868 from IvanSavenko/simultaneous_turns
...
Simultaneous turns
2023-09-27 15:45:02 +03:00
Laserlicht
bb358148d8
Update generalOptionsTab.json
2023-09-26 20:58:24 +02:00
Laserlicht
012f4b91b2
Update generalOptionsTab.json
2023-09-26 20:43:47 +02:00
Alexander Wilms
23d1638d70
Add VSync to settings
2023-09-26 18:55:25 +02:00
Ivan Savenko
0ab766479d
One more documentation update iteration
2023-09-26 15:55:27 +03:00
Ivan Savenko
8210a2cafd
Added list of all identifiers from base game
2023-09-26 15:55:27 +03:00
Ivan Savenko
403acc0cf1
Update spell docs
2023-09-26 15:55:27 +03:00
Ivan Savenko
9f894d6ca0
Updated RMG template schema
2023-09-26 15:55:27 +03:00
Ivan Savenko
9710a6b7b3
Updated terrain/river/road schema, added docs
2023-09-26 15:55:27 +03:00
Ivan Savenko
7b8ca9fd40
Add missing schema for "rmg" section of object description
2023-09-26 15:55:27 +03:00
Ivan Savenko
dfc72134f2
Removed unused property
2023-09-26 15:55:27 +03:00
Ivan Savenko
52cb4505e1
RMG schema now actually works
2023-09-26 15:55:27 +03:00
Ivan Savenko
43020c8108
Added value missing from schema
2023-09-26 15:55:27 +03:00
Ivan Savenko
27b75dbbea
Fixed silent errors on invalid Json references in schemas
2023-09-26 15:55:27 +03:00
Ivan Savenko
54adeef29f
Added temporary UI for simturns testing
2023-09-26 13:42:20 +03:00
Laserlicht
5061792cce
enableUiEnhancements button
2023-09-25 13:11:08 +02:00
Laserlicht
f3e1943aaf
Merge branch 'develop' into highscore_menu
2023-09-23 21:38:17 +02:00
Nordsoft91
a36450e2d1
Merge pull request #2882 from Nordsoft91/ai-cheating
...
Add basic system to give more advantages for ai player
2023-09-23 03:21:19 +02:00
Laserlicht
1a0f5cf159
calc preperation
2023-09-23 00:21:36 +02:00
Laserlicht
a4cb74f0dc
highscore input window
2023-09-22 20:39:20 +02:00
Ivan Savenko
455c13164e
Merge pull request #2886 from IvanSavenko/h3m_parser_fixes
...
H3m parser fixes
2023-09-22 18:53:51 +03:00
Laserlicht
909b06f7c1
draw images
2023-09-22 02:19:31 +02:00
Laserlicht
92b0e2b400
initial highscore support
2023-09-22 01:39:35 +02:00
Laserlicht
4d8414bd3d
unlock functionality
2023-09-20 23:06:32 +02:00
Ivan Savenko
921569e02e
Fixed "Long Live the King", 1st scenario victory condition
2023-09-20 21:58:47 +03:00
nordsoft
cb3bbc6680
Restructured difficulty config
2023-09-20 16:12:26 +02:00
nordsoft
0de912e67b
Add basic system to add more advantages for ai player
2023-09-20 03:50:35 +02:00
Nordsoft91
86b0804be3
Merge pull request #2841 from krs0/quickfix/fix_market_of_time_missing_template
...
Fix Market of Time missing Template
2023-09-18 01:49:41 +02:00
Nordsoft91
717a765123
Merge pull request #2813 from Laserlicht/textcolor
...
Textcolor support
2023-09-16 14:12:17 +02:00
Ivan Savenko
a669cc3829
Merge pull request #2839 from krs0/feature/fix_skill_schema
...
Fix broken skill schema
2023-09-16 12:02:47 +03:00
krs
f80f594688
Fix Market of Time missing Template
2023-09-15 23:13:43 +03:00
krs
6c9b65c391
Fix adventure map widget json
2023-09-15 22:15:10 +03:00
krs
ffaf4c5b01
Fix broken skill schema
2023-09-15 22:03:23 +03:00
Laserlicht
621d463694
color are now html color names
2023-09-15 15:27:26 +02:00
Laserlicht
f5505c9f6d
support for predefined colors
2023-09-15 15:27:26 +02:00
Ivan Savenko
f8541d0ae4
Merge branch 'vcmi/master' into 'vcmi/develop'
2023-09-15 13:59:02 +03:00
Ivan Savenko
feb272e102
Updated map object and bonuses documentations
2023-09-13 21:55:36 +03:00
Ivan Savenko
c6588e0bd1
Updated schemas & docs for several game entities
2023-09-13 21:55:36 +03:00
Ivan Savenko
a09147a433
Do not block map layer toggles in world view mode
2023-09-12 21:15:14 +03:00
Nordsoft91
d011e1ff0d
Update mod.json schema
2023-09-09 15:24:52 +02:00
nordsoft
2b3f211659
Enable quick combat by default
2023-09-09 14:42:13 +02:00
Ivan Savenko
e8453916cf
Merge remote-tracking branch 'vcmi/beta' into develop
2023-09-08 18:49:06 +03:00
Ivan Savenko
fccd564d8d
Merge pull request #2769 from IvanSavenko/touch_tolerance
...
(1.3.2) Implemented tolerance for touch events
2023-09-08 16:45:04 +03:00
Ivan Savenko
8112b8082e
Add new option to settings
2023-09-08 13:23:18 +03:00
nordsoft
8c94d082c8
Merge remote-tracking branch 'upstream/develop' into launcher-size-support
2023-09-08 01:51:52 +02:00
nordsoft
40ea45498f
Rename
2023-09-07 19:57:57 +02:00
Andrii Danylchenko
55af9ed5a0
Fix market of time, crashes game
2023-09-05 23:31:32 +03:00
nordsoft
1ef407ea9f
Fixes
2023-09-02 14:10:50 +04:00
Ivan Savenko
cab2bddf7e
Merge pull request #2712 from Laserlicht/dim_map
...
Dim adventuremap
2023-09-01 22:37:10 +03:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer
...
Turn timer fixes
2023-09-01 00:31:52 +04:00
Michael
e650f0100b
setting + all non popups
2023-08-30 21:41:28 +02:00
Ivan Savenko
695a51d8c8
Merge remote-tracking branch 'vcmi/beta' into develop
2023-08-28 21:19:53 +03:00
Ivan Savenko
5be87b30c1
Merge pull request #2625 from dydzio0614/artifacts-backpack-gui
...
Artifacts backpack GUI
2023-08-28 19:59:11 +03:00
nordsoft
432ed18579
Fix overlap of timer and fps widgets
2023-08-28 19:46:09 +04:00
nordsoft
44791b6665
Revert "Auxiliary commit to revert individual files from c7390a921e3871102292f589978e9e9010eface9"
...
This reverts commit e749954761facf4a760c6b4ef361f2ebce7b1f01.
2023-08-28 17:21:38 +04:00
nordsoft
6380a02e10
Upgrade launcher default repo
2023-08-28 17:10:52 +04:00
nordsoft
1e527a6942
Minor changes
2023-08-28 17:10:52 +04:00
nordsoft
d758727c23
Basic timer ui is almost complete
2023-08-28 17:10:52 +04:00
Nordsoft91
ffc4b989f0
Merge pull request #2679 from Laserlicht/smooth_scroll
...
Smooth scroll
2023-08-28 17:08:57 +04:00
Andrii Danylchenko
2fef0e8d40
Fix market of time, crashes game
2023-08-27 21:01:32 +03:00
Michael
bbd69fd430
added setting
2023-08-27 00:33:52 +02:00
Ivan Savenko
b0eec85aca
Merge pull request #2632 from rilian-la-te/resist-rework-pt1
...
Spell resistance rework: part 1
2023-08-25 01:13:57 +03:00
Nordsoft91
979cf129bc
Merge pull request #2637 from Laserlicht/autosave
2023-08-25 00:09:49 +04:00
Michael
b22a9ff2d0
Merge branch 'develop' into autosave
2023-08-23 21:39:04 +02:00
nordsoft
b8ab64f448
Make options tab configurable
2023-08-23 19:29:50 +04:00
Konstantin
d20711bcd6
immunities: polishing
2023-08-23 17:53:09 +03:00
Nordsoft91
1bad0e96ef
Merge pull request #2635 from Nordsoft91/loading-bar
...
Loading progress bar
2023-08-23 17:28:19 +04:00
Michael
fed9ae5157
Merge branch 'develop' into autosave
2023-08-23 00:37:15 +02:00
Michael
65884b15d0
Update settings.json
...
best setting as default (subfolder with map-name)
2023-08-22 20:51:28 +02:00
nordsoft
d50edc28ab
Merge remote-tracking branch 'upstream/develop' into turn-timer
...
# Conflicts:
# server/CGameHandler.cpp
# server/CGameHandler.h
2023-08-22 00:54:38 +04:00
nordsoft
dbc3a93013
Merge remote-tracking branch 'upstream/develop' into loading-bar
...
# Conflicts:
# server/CGameHandler.h
2023-08-22 00:46:54 +04:00
nordsoft
45f13c7964
Progress update on client side
2023-08-21 19:21:27 +04:00
Nordsoft91
4edee00a97
Merge pull request #2605 from Laserlicht/map_preview
...
Map preview
2023-08-21 14:56:21 +04:00
Dydzio
cab6fb76aa
Draft version of backpack button + new setting for original H3 UI mode
2023-08-20 17:45:43 +02:00
Michael
e3a4c65100
code review
2023-08-20 14:14:47 +02:00
nordsoft
314a17cdd9
Paint timer color into player color
2023-08-19 19:45:25 +04:00
Dydzio
6bfbe80cc9
Allow toggling quick combat spells usage
2023-08-19 17:23:55 +02:00
nordsoft
647c7c15a3
Add sound notification for timer
2023-08-17 01:10:03 +04:00
krs
5207ba7e00
Removed WoG artifacts from core. Replaced with unused to avoid crashes.
2023-08-14 15:06:48 +03:00
nordsoft
f01973a4f0
Configurable turn timer
2023-08-14 01:13:37 +04:00
Ivan Savenko
59c599cbf9
Reverted FPS limit change on mobile systems
2023-08-05 13:35:58 +03:00
Ivan Savenko
ac4282bf31
Merge pull request #2456 from IvanSavenko/outdated_extras_workaround
...
Added workaround for running game with outdated extras mod from 1.2
2023-08-02 21:27:10 +03:00
Ivan Savenko
791eb1a37b
Added workaround for running game with outdated extras mod from 1.2
2023-08-01 14:47:17 +03:00
Andrii Danylchenko
f1a9ae99ee
NKAI: various behavior fixes, undo max_gold_preasure
2023-07-31 22:01:12 +03:00
Andrii Danylchenko
6490c65490
nkai: fix freezes
2023-07-31 22:01:12 +03:00
Andrii Danylchenko
c93bb0a502
nkai: fixes and skill rewards
2023-07-31 22:01:11 +03:00
Andrii Danylchenko
69ceee5dd6
NKAI: penalty for extra chains
2023-07-31 22:01:11 +03:00
Andrii Danylchenko
0fd118d3ce
NKAI: gold reward
2023-07-31 22:01:11 +03:00
Andrii Danylchenko
b19ac01bf9
Fuzzy rework, added more defence and gather army routines
2023-07-31 22:01:10 +03:00
Andrii Danylchenko
b1ca663eb6
Fuzzy rework
2023-07-31 22:01:10 +03:00
Ivan Savenko
d9e7a8f88a
Merge pull request #2446 from IvanSavenko/bugfixing
...
(1.3.0) Bugfixing
2023-07-31 16:21:43 +03:00
Ivan Savenko
986c8799a8
Move checkboxes 2 slots above to avoid overflowing below window border
2023-07-31 13:31:44 +03:00
Ivan Savenko
5776e171c4
Fix list of possible resources given by some objects, e.g. windmills
2023-07-30 12:31:35 +03:00
Ivan Savenko
6c52293dd9
Merge pull request #2425 from IvanSavenko/fix_combat_replay
...
Attempt to fix combat replay queries
2023-07-29 00:03:44 +03:00
heroesiiifan
648f7344c7
Update mod.json
2023-07-28 00:34:28 +00:00
heroesiiifan
ddfeeb152d
Update settings.json
2023-07-28 00:33:42 +00:00
Ivan Savenko
aed8c411fc
Minor rework & cleanup of combat replays
2023-07-27 19:25:55 +03:00
Dydzio
e4303c63ce
Add json entries for missing bonuses
2023-07-25 17:13:02 +02:00
krs
4ce774a380
Wrong placement of onlyOnWaterMap in spells schema.
2023-07-22 13:42:57 +03:00
Ivan Savenko
8456f92bf7
Merge pull request #2292 from IvanSavenko/radial_wheel_garrison
...
Radial wheel for army management
2023-07-21 20:54:49 +03:00
DjWarmonger
377bec277d
Merge pull request #2350 from vcmi/ban_stuff_on_water_maps
...
Ban objects on maps without water
2023-07-21 15:48:13 +02:00
Ivan Savenko
6cd219738b
Added option to disable radial wheel in config (no UI)
2023-07-21 15:47:42 +03:00
Ivan Savenko
cefbe5152e
Merge pull request #2359 from IvanSavenko/crashfixing
...
Fix crashes from 1.2.1 statistics on Google Play
2023-07-21 15:44:37 +03:00
Ivan Savenko
3c6839722a
Merge pull request #2362 from IvanSavenko/banks_guard_preview
...
Implemented support for showing amount of guards in banks
2023-07-21 15:44:11 +03:00
Ivan Savenko
f320d88ce7
Merge pull request #2361 from dydzio0614/missing-setting-label
...
Add missing label for new setting
2023-07-19 14:46:29 +03:00
Ivan Savenko
ddda46a7fd
Merge pull request #2358 from dydzio0614/persistent-hero-info-window
...
Add option for persistent hero info window as in HD mod
2023-07-19 14:46:16 +03:00
Ivan Savenko
07a8c75bec
Merge pull request #2305 from dydzio0614/unlimited-autosave
...
Ability to change autosave limit + set autosave prefix
2023-07-19 14:45:51 +03:00
Ivan Savenko
7f1b982264
Implemented support for showing amount of guards in banks
2023-07-19 13:17:50 +03:00
Tomasz Zieliński
ad5081f9fe
Merge remote-tracking branch 'origin/develop' into ban_stuff_on_water_maps
2023-07-19 12:05:30 +02:00
Tomasz Zieliński
147f0bce8a
Fix description
2023-07-19 08:27:43 +02:00
Dydzio
d18e5b3351
Add missing label for new setting
2023-07-18 22:35:45 +02:00
Tomasz Zieliński
f3d2a50d2e
Update schemas with new properties
2023-07-18 19:24:45 +02:00
Ivan Savenko
f520043c46
Fix typo
2023-07-18 17:31:21 +03:00
Ivan Savenko
317183e00d
Merge branch 'develop' into info-box-army-management
2023-07-18 16:05:09 +03:00
Ivan Savenko
e0977693b0
Merge pull request #2336 from IvanSavenko/left_button_map_drag
...
Left button map drag
2023-07-18 16:03:05 +03:00
Tomasz Zieliński
03b3771f19
Ban Navigation on maps without water
2023-07-18 10:54:36 +02:00
Dydzio
48a72f90f7
Add option for persistent hero info window as in HD mod
2023-07-17 23:25:16 +02:00
Tomasz Zieliński
025b0814c8
+ Handled banning spells and artifacts
...
+ Rename allowedSpell => allowedSpells
2023-07-17 17:21:28 +02:00
Dydzio
5882cbae78
Merge branch 'develop' into unlimited-autosave
2023-07-16 15:19:04 +02:00
Dydzio
fe26ab4501
Add settings entry, immediately refresh info bar on setting toggle
2023-07-16 14:52:43 +02:00
heroesiiifan
b09e50f29a
adding missing lang to mod.json
2023-07-16 09:13:32 +00:00
heroesiiifan
4b4b73d374
added missing lang in settings.json
2023-07-16 09:10:32 +00:00
Ivan Savenko
61750d30c2
Implemented dragging map via left mouse click (off by default)
2023-07-16 12:00:40 +03:00
Dydzio
ea0ee87299
Interactable hero status - alternative infobox component
2023-07-15 23:14:59 +02:00
Ivan Savenko
d931ff75fc
Fixed positioning of units in tight formation to match H3
2023-07-15 16:09:44 +03:00
Ivan Savenko
8a92941681
Allow merging stack on recruitment to give place for recruited unit
2023-07-15 16:09:44 +03:00
Ivan Savenko
57e7db7fdf
Add missing language entry
2023-07-15 16:09:44 +03:00
Ivan Savenko
f61cc4c8f6
Change battle speed settings from 400/800 to 300/600
2023-07-15 16:09:44 +03:00
Ivan Savenko
cc6e8e8c7e
Fix corrupted artifact lock slot in Polish version of H3
2023-07-15 16:09:44 +03:00
Dydzio
ad66acdd79
End turn autosave support + making it default
2023-07-13 22:07:42 +02:00
Dydzio
bcb061b58f
Merge branch 'develop' into unlimited-autosave
2023-07-13 20:53:10 +02:00
Ivan Savenko
b30db5fc1f
Merge pull request #2301 from Laserlicht/haptic_feedback
...
Haptic feedback
2023-07-13 12:56:54 +03:00
Michael
11bcedc2bf
Update config/widgets/settings/generalOptionsTab.json
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-07-12 22:56:23 +02:00
Ivan Savenko
78415c573b
Merge pull request #2289 from IvanSavenko/resolution_fixes
...
Fix issues with changing game resolution
2023-07-11 14:35:07 +03:00
Dydzio
fbf0bf78d6
Configurable autosave limit and prefix - ingame handling
2023-07-08 23:04:01 +02:00
Michael
70b7f992de
fix
2023-07-08 20:34:11 +02:00
Michael
ff51b8f46b
Setting for haptic feedback
2023-07-08 18:47:38 +02:00
heroesiiifan
108e768ae2
fix language syntax error
2023-07-07 22:59:40 +00:00
Ivan Savenko
0c83e34093
Implemented reserved area for iOS notch / cutout
2023-07-07 14:29:03 +03:00
Ivan Savenko
fa4a0004b2
Merge pull request #2291 from IvanSavenko/terrain_animations_config
...
Moved hardcoded terrain palette-cycling animations to config
2023-07-07 14:28:39 +03:00
DjWarmonger
f9e1a70ab8
Merge pull request #2278 from vcmi/rmg_factions
...
Rmg factions
2023-07-06 22:15:36 +02:00
Tomasz Zieliński
fcf7a29f45
Update schemat for RMG template
2023-07-06 17:39:09 +02:00
Ivan Savenko
3bce245780
Moved hardcoded terrain palette-cycling animations to config
2023-07-05 22:07:20 +03:00
Ivan Savenko
02f23086b6
Updated according to review
2023-07-03 14:34:53 +03:00
Ivan Savenko
8ac56f06b0
Added Hungarian
2023-07-03 14:34:53 +03:00
Ivan Savenko
4b366e1fe8
Added new languages: Czech, Italian, Korean
2023-07-03 14:34:53 +03:00
Ivan Savenko
21c45bd84f
Added new settings to Launcher:
...
- UI Scaling selection
- Allied AI selection
- Separate main/secondary mod repo
2023-07-03 14:34:53 +03:00
Mike
75820c3bdf
Fixed overlapped text display in adventure map settings
2023-06-25 16:27:00 -07:00
Ivan Savenko
e0ea994656
Moved some pathfinding options to game settings
2023-06-25 17:42:36 +03:00
Ivan Savenko
f7b27da00e
Implemented support for "coast visitable" objects:
...
- objects marked as coast visitable can be visited from land even when
placed in water
- added isBlockedVisitable and isCoastVisitable method to
CGObjectInstance
- implemented json config for these properties in banks
2023-06-25 17:42:33 +03:00
krs
afe0146021
Renamed settings option to reflect that same option is used for both ranges.
2023-06-23 19:50:39 +03:00
Ivan Savenko
56680e102d
Merge pull request #2245 from IvanSavenko/platform_settings
...
Allow defining default values of settings per platform
2023-06-23 13:32:30 +03:00
Ivan Savenko
69dc95c3c8
Merge pull request #2235 from IvanSavenko/hota_h3m_support
...
Hota h3m support
2023-06-23 13:32:10 +03:00
Mike
fe535ec470
Updated settings.json
...
Corrected comma related formatting errors
2023-06-21 16:05:29 -07:00
Ivan Savenko
8f602b2ef6
Allow defining default values of settings per platform
2023-06-21 10:55:30 +03:00
Ivan Savenko
ffdac314e9
Added selection of long touch duration
2023-06-20 19:58:05 +03:00
Ivan Savenko
d1917898a9
Update validation schemas
2023-06-20 19:37:27 +03:00
Ivan Savenko
3913b8e98c
Heroes placed on water in map will be automatically given boat
2023-06-20 19:37:27 +03:00
Ivan Savenko
d4728f78ce
Support for hota victory conditions
2023-06-20 19:37:27 +03:00
Ivan Savenko
c43783db58
Use string ID's instead of raw strings for win/loss conditions
2023-06-20 19:37:27 +03:00
Ivan Savenko
5118a642bc
Fix duplicated randomResource object
2023-06-16 18:00:19 +03:00
Ivan Savenko
77b58bc66d
Cleaned up object constructors to reduce duplicated code
2023-06-16 17:59:50 +03:00
Ivan Savenko
4d947be287
Adventure map shipyard nwo has configurable boat type
2023-06-16 17:59:50 +03:00
Ivan Savenko
487f441f47
Implemented boat selection for town shipyards
2023-06-16 17:59:49 +03:00
Ivan Savenko
a94b68e6aa
Hill fort upgrade costs are now loaded from json
2023-06-16 17:59:10 +03:00
Ivan Savenko
2e7c382612
Moved creature upgrade logic to CGObjectInstance inheritors
2023-06-16 17:59:10 +03:00
Ivan Savenko
fc190b14bb
Spell shrines can now be configured in json
2023-06-16 17:59:10 +03:00
Ivan Savenko
8614419954
Merge pull request #2208 from IvanSavenko/obstacles_foreground
...
Implemented foreground/background obstacles
2023-06-14 15:49:08 +03:00
DjWarmonger
3be7720868
Merge pull request #2218 from vcmi/pregenerate_treasures
...
Okay, merging this for PvP feedback.
2023-06-13 20:46:34 +02:00
krs
9496cb4058
rangedFullDamageLimitHighlightOnHover is now turned off by default
2023-06-11 19:36:46 +03:00
krs
5158a5f7db
Fix After Merge
2023-06-11 19:31:50 +03:00
krs
d622bc613a
Fix after options merge.
2023-06-11 18:42:58 +03:00
krs
c0591573bf
Working Version
2023-06-11 18:40:47 +03:00
Tomasz Zieliński
f4dc8e6529
Limit morale / bonusing objects to one per zone
2023-06-10 14:58:50 +02:00
Tomasz Zieliński
6ed1dab3fb
Add random resource to RMG pool
2023-06-08 19:04:44 +02:00
Ivan Savenko
428fb832c6
Implemented foreground/background obstacles:
...
- obstacles now have "foreground" field
- if "foreground" field set, obstacle will appear on top of other
objects, such as units
- if "foreground" is not set, obstacle will appear below units
- updated schema and cleared up obstacles config
2023-06-06 15:53:14 +03:00
Ivan Savenko
18105aa96d
Minor fixes for settings window
2023-06-05 21:19:10 +03:00
Ivan Savenko
238a02eb5e
It is now possible to cancel attack-via-swiping by moving finger away
2023-06-05 19:20:20 +03:00
Ivan Savenko
6283329aeb
Added option to disable edge scrolling
2023-06-05 19:20:20 +03:00
Ivan Savenko
a08ff1e6ef
Removed no longer used touchscreen option
2023-06-05 19:20:08 +03:00
Ivan Savenko
b20109c830
Test version of swipe gesture for in-combat attacks
2023-06-05 19:20:08 +03:00
Ivan Savenko
70155b48e1
Only show touchscreen options on systems that have one
2023-06-05 19:20:08 +03:00
Ivan Savenko
2c7b94d17f
Remove unused map swipe option
2023-06-05 19:20:08 +03:00
Ivan Savenko
526ce1b546
Merge pull request #2177 from krs0/feature/Move_battle_fake_lables_into_separate_group
...
Move battle fake labels into separate group, and small fixes
2023-06-05 18:56:38 +03:00
Ivan Savenko
3519fd8302
Added view patterns for hota terrains
2023-05-31 23:18:39 +03:00
Ivan Savenko
952708e865
Basic version of object templates mapping
2023-05-31 23:18:39 +03:00
Ivan Savenko
ffd7144df8
Implemented identifiers mapping for town buildings
2023-05-31 23:01:57 +03:00
Ivan Savenko
927fcc7d45
Removed hota objects desription, will be added to hota mod instead
2023-05-31 23:01:57 +03:00
Ivan Savenko
daaaf84392
Icon index for map format is now defined in config
2023-05-31 23:01:57 +03:00
Ivan Savenko
fb55719671
Map format support status can now be loaded from gameSettings
2023-05-31 23:01:57 +03:00
Ivan Savenko
eff6551f80
Merge pull request #2171 from krs0/feature/schema_updates
...
Rearranging Schemas
2023-05-29 15:37:50 +03:00
DjWarmonger
c99aa74434
Merge pull request #2053 from vcmi/parellel_rmg
...
Okay, let's merge this.
2023-05-29 13:50:02 +02:00
krs
6daa933aa2
Fixed errors and added a line after CreatureNumbersToggleGroup to separate them visually from next element.
2023-05-24 20:16:49 +03:00
krs
a7606010ee
Moved creatureInfo into a group for easier calculations
2023-05-24 20:16:49 +03:00
Tomasz Zieliński
0e37c7b7d0
By deafult use multithreaded RMG
2023-05-24 18:16:04 +02:00
Ivan Savenko
d18b240d6d
Added separate borderless & exclusive fullscreen options
2023-05-19 22:43:52 +03:00
Ivan Savenko
f2dfd6de42
Updated settings window to use new layouts & library
2023-05-19 22:43:52 +03:00
Ivan Savenko
7cbfd8117e
Implemented simple layout to simplify widget json definitions
2023-05-19 22:43:52 +03:00
Ivan Savenko
7cd898a87a
Implemented "customTypes" in UI json to reduce duplicated definitions
2023-05-19 22:43:52 +03:00
krs
289a6da3d7
Merge fix for battlefield
2023-05-19 21:23:08 +03:00
krs
105dcf5a9f
Fixed white spaces
2023-05-19 21:14:01 +03:00
krs
2e6cae80a9
Schemas rearranged
...
Artifact Schema rearranged
Battlefield schema rearanged
Bonus schema rearranged
Faction Schema rearanged
Hero Schema rearranged
HeroClass schema rearranged
MapHeader schema updated, something fishy in events
Mod schema updated. Settings not complete
Object schema rearranged
Object schema rearranged
object type schema rearranged
obstacles schema rearranged
Rivers schema updated
roads schema updated
script schema updated
skill schema updated
spell schema updated
template schema update
terrain schemas updated
town buildings schema update
town siege schema updated
town structure schema updated
2023-05-19 21:04:47 +03:00
Ivan Savenko
805721f8d7
Add missing check for file presence
2023-05-16 21:58:09 +03:00
Ivan Savenko
c45d4f8d22
Few more fixes to building ordering
2023-05-15 22:22:54 +03:00
Ivan Savenko
ca19fc7fcc
Backported minor z-ordering fixes from hota mod
2023-05-15 22:22:54 +03:00
Ivan Savenko
5e3a0a1a75
Fixed json validation
2023-05-15 22:22:54 +03:00
Ivan Savenko
b9f18288f9
Fix duplicated widget name in settings window
2023-05-12 22:58:36 +03:00
Ivan Savenko
edd5d11734
Fix issues discovered by self-review
2023-05-09 13:10:33 +03:00
Ivan Savenko
7228b08d1d
Implemeted runtime generation of player-colored background texture
2023-05-09 13:10:33 +03:00
Ivan Savenko
342ea138f9
Fix remaining graphical artifacts on switching from world view
2023-05-09 13:10:33 +03:00
Ivan Savenko
8e320d8454
Fixed world view mode
2023-05-09 13:10:33 +03:00
Ivan Savenko
5ae507505a
Fixed toggleable buttons (sleep/wake & subterra/surface)
2023-05-09 13:10:33 +03:00
Ivan Savenko
a0f1bf3928
Implemented user-selectable UI scaling mode
2023-05-09 13:10:33 +03:00
Ivan Savenko
97426a3f7c
Implemented disabling of buttons based on condition
2023-05-09 13:10:33 +03:00
Ivan Savenko
d4098059b8
Proper support for player-colored buttons in UI
2023-05-09 13:10:33 +03:00
Ivan Savenko
019d7b6811
Integrated shortcuts into adventure window configuration
2023-05-09 13:10:33 +03:00
Ivan Savenko
63a1efbdc2
Fixed system options window
2023-05-09 13:10:33 +03:00
Ivan Savenko
a4b102e46f
Implemented UI scaling (non-selectable option for now)
2023-05-09 13:10:33 +03:00
Ivan Savenko
d96edd9f56
Added larger town list for higher resolutions
2023-05-09 13:10:33 +03:00
Ivan Savenko
4958190e82
Fixed visibility of corner gems
2023-05-09 13:10:33 +03:00
Ivan Savenko
a015bf6507
Initial part of dynamically-sized adventure map:
...
- removed no longer used CConfigHandler
- remove no longer use resolutions.json
- moved widget management from adventure map to a separate class
- adventure map layout is now loaded from config
2023-05-09 13:10:33 +03:00
Konstantin P
057a33c508
SpellSchool: use identifier instead of int
...
Needs redifinition of MAGIC_SCHOOL_SKILL in all mods
2023-05-07 20:37:32 +03:00
Konstantin P
9e1cdc410f
vcmi: replace school bonuses to unified ones
...
Except immunity now
2023-05-05 21:30:45 +03:00
Konstantin
b0d2787e86
vcmi: remove DIRECT_DAMAGE_IMMUNITY bonus
...
Replace by SPELL_DAMAGE_REDUCTION bonus with 100 value
2023-05-05 18:57:40 +03:00
Ivan Savenko
4c93b8f3f2
Use separate json for vcmi-1.3
2023-05-04 19:38:36 +03:00
Konstantin
05eccbc2bb
vcmi: split bonus to enumerator and HeroBonus.h
2023-05-03 18:01:06 +03:00
Ivan Savenko
916b41d9a7
Merge pull request #2078 from IvanSavenko/shortcuts
...
Basic shortcuts system
2023-05-01 21:45:52 +03:00
nordsoft
b6270fae49
Remove deprecated from config
2023-05-01 21:49:37 +04:00
nordsoft
eb577a03b5
Deprecating enum constants
2023-05-01 21:49:37 +04:00
nordsoft
32277a007d
Fix compilation after merge
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
193cf6676a
Adjust config for markets
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
6c637dd8e6
Integrated hotkeys with InterfaceObjectConfigurable
2023-05-01 17:59:21 +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
nordsoft
9dbac414fc
Remove tmg limits
2023-04-20 20:44:25 +04:00
nordsoft
008db447e7
Minor changes
2023-04-19 02:11:24 +04:00
nordsoft
d1dacd45e2
Animations from config
2023-04-19 00:14:15 +04: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
Ivan Savenko
ac8952d6cf
Added list of H3 objects for reference
2023-04-15 17:20:38 +03:00
Ivan Savenko
44b83b2e11
Merge master -> develop
2023-04-14 16:51:35 +03:00
Ivan Savenko
beb9069f78
Do not allow targeting enemy corpses for Demon summon
2023-04-13 19:07:46 +03:00
Konstantin P
384ee99834
vcmi: configurable teleport v2
...
1. Redesign wall and teleport penalty using shortest path
This will avoid OH3 exploits with teleport inside walls
2. Teleport is now configurable
2023-04-13 11:24:19 +03:00
Konstantin
198df21ae3
vcmi: remove old landmine property
2023-04-13 11:24:19 +03:00
Nordsoft91
3951bbb395
Merge pull request #1108 from Nordsoft91/battle-dialog
...
[HDMod features] Quick combat
2023-04-11 21:18:04 +04:00
Ivan Savenko
dfa2e2a349
Merge beta into develop
2023-04-11 19:37:35 +03:00
nordsoft
bfc75ccd39
Merge remote-tracking branch 'upstream/develop' into battle-dialog
2023-04-11 02:22:42 +04:00
Konstantin
b82374c4a9
config: Orb of Vulnerability should block all resistances
...
Just set MAGIC_RESISTANCE and SPELL_RESISTANCE_AURA to 0
by INDEPENDENT_MIN, will work.
2023-04-10 22:07:22 +03:00
Ivan Savenko
e2d0cd37e4
Merge pull request #1910 from IvanSavenko/beta_fixes
...
Fixes for 1.2 branch
2023-04-09 20:09:03 +03:00
Ivan Savenko
a6ce99573c
Added fallback identifiers for reading older vcmi maps
2023-04-09 12:27:33 +03:00
krs
709a8a6eb3
movementHighlightOnHover is now saved with settings
2023-04-08 20:42:16 +03:00
krs
1644cab938
Added combat option Highlight Movement on Hover
2023-04-08 20:40:30 +03:00
Ivan Savenko
454168897e
Fix handling of invalid hotkeys in configurable UI
2023-04-08 19:53:13 +03:00
nordsoft
52b53ab307
Feature and setting implemented
2023-04-08 01:49:59 +04:00
nordsoft
ece8a2a41f
Merge branch 'battle-dialog' into battle-dialog2
...
# Conflicts:
# AI/BattleAI/BattleAI.h
# AI/StupidAI/StupidAI.h
# client/CPlayerInterface.cpp
# client/CPlayerInterface.h
# client/Client.cpp
# client/NetPacksClient.cpp
# client/battle/CBattleInterface.cpp
# client/battle/CBattleInterface.h
# client/battle/CBattleInterfaceClasses.cpp
# client/battle/CBattleInterfaceClasses.h
# config/schemas/settings.json
# lib/CGameInterface.h
# lib/IGameEventsReceiver.h
# lib/NetPacks.h
# lib/NetPacksLib.cpp
# lib/battle/BattleInfo.cpp
# server/CGameHandler.cpp
# server/CQuery.h
2023-04-06 19:53:52 +04:00
Ivan Savenko
307065a633
Merge beta into develop
2023-04-04 16:06:20 +03:00
Ivan Savenko
d6cb513374
Merge pull request #1858 from IvanSavenko/sliders_fix
...
Allow defining active areas for sliders.
2023-04-04 11:21:45 +03:00
Andrii Danylchenko
10bf9bc7a0
Merge pull request #1678 from vcmi/nkai-fix-build
...
NKAI: more fixes to defense and pandora
2023-04-03 22:39:11 +03:00
Ivan Savenko
191959ae05
Fixed moat identifiers requests - will now always request spells
2023-04-03 15:15:12 +03:00
Konstantin
76bddf97bd
gameConfig.json: add missing comma
2023-04-02 23:53:47 +03:00
Ivan Savenko
507d8bf7fd
Allow defining active areas for sliders. Fixes settings window.
2023-04-02 22:24:07 +03:00
Ivan Savenko
efbc5cf581
Merge pull request #1815 from IvanSavenko/beta_fixes
...
Beta fixes
2023-04-02 20:02:41 +03:00
Andrii Danylchenko
88fb532d90
NKAI: more fixes to defense and pandora
2023-04-02 10:02:33 +03:00
Ivan Savenko
cfe4cad8cb
Merge pull request #1818 from rilian-la-te/beta-fixes
...
config: CATAPULT_EXTRA_SHOTS should be hidden
2023-04-01 23:09:38 +03:00
Konstantin
766f599e41
config: CATAPULT_EXTRA_SHOTS should be hidden
2023-04-01 00:21:34 +03:00
Ivan Savenko
220f4531a1
Changed default mod repository path
2023-03-31 23:18:45 +03:00
Ivan Savenko
e3b1b0fbd6
Removed hardcoded texts
2023-03-31 23:18:45 +03:00
Konstantin
d8a237ba46
vcmi: add getTrigger method to obstacles
...
Fixes advanced remove obstacle spell
2023-03-31 01:01:26 +03:00
Konstantin
82a6d94fd0
moats: indentation
2023-03-31 01:01:26 +03:00
Konstantin
ecae600563
effects: Moat now includes battlefield bonus
...
This is an implementation which works exactly like in H3
2023-03-31 01:01:25 +03:00
Konstantin
f704a17e1a
vcmi: add a last hex setting
...
I consider this behaviour as H3 bug, but this is H3.
So, added a setting to disable this behaviour.
2023-03-31 01:01:25 +03:00
Konstantin
c4d5a7a2d6
vcmi:towns now can choose if moat render is needed
...
Using invalid points. Also removed unused variable.
2023-03-31 01:01:25 +03:00
Konstantin
a639bd2606
spells: rework isMagical()
...
Now it is a flag of a spell, and not a target condition.
This fixes resistance to bind effect
2023-03-31 01:01:25 +03:00
Konstantin
aab5b47038
vcmi: setup moats using MoatAbility
...
Setup moats using moat ability, need playtest for now.
-3 to defence not added for now.
2023-03-31 01:01:25 +03:00
Konstantin
50dab1f049
vcmi: convert fireWall and landMine
...
convert fireWall and landMine to new
trigger system. Now landmines correctly removed
after exploding
2023-03-31 01:01:25 +03:00
Ivan Savenko
4f703df4ac
Removed old bonuses data
2023-03-31 00:16:27 +03:00
Konstantin
57c35f39ca
WIP: Moat placer
2023-03-30 14:41:40 +03:00
Ivan Savenko
9e75568574
Fixed Roland's specialty to use Swordsmen instead of Griffins
2023-03-30 12:19:31 +03:00
Ivan Savenko
8a3e1b0230
Merge pull request #1789 from IvanSavenko/beta_fixes
...
Fixes for 1.2 release
2023-03-30 00:09:51 +03:00
Ivan Savenko
be52d46981
Fix Whirlpool sounds
2023-03-28 19:05:38 +03:00
Ivan Savenko
6d04c0b4db
Fix affinities of Dungeon heroes
2023-03-28 18:58:30 +03:00
Ivan Savenko
21ea50ca1e
Check obstacle image for existance in schema
2023-03-28 17:02:18 +03:00
Ivan Savenko
b3b2426b19
Updated mod.json schema
2023-03-27 22:33:36 +03:00
Ivan Savenko
b2f5042942
Merge pull request #1783 from vcmi/beta
...
Merge beta -> develop
2023-03-27 21:21:25 +03:00
Ivan Savenko
d1f6497bc8
Merge pull request #1768 from vcmi/default_ai
...
Make NKAI default AI
2023-03-27 21:20:01 +03:00
Ivan Savenko
b875da108b
Merge pull request #1717 from SoundSSGood/backpack-limit-size
...
Introducing backpack size limit functionality
2023-03-27 17:17:49 +03:00
Konstantin
a75ff91a50
vcmi: remove old string from config
2023-03-26 21:17:58 +03:00
Ivan Savenko
7fd0d0beb1
Made English first language so invalid values would reset to it
2023-03-25 23:54:51 +02:00
Ivan Savenko
a0bd46c9dd
Fix teleport animation speed
2023-03-25 23:54:51 +02:00
Tomasz Zieliński
ab57941f0a
Make NKAI default AI.
2023-03-25 12:17:35 +01:00
SoundSSGood
96e8a1f21c
Backpack limit part1 (move, disassemble)
2023-03-21 12:14:33 +02:00
Konstantin
895572df02
vcmi: fix first aid regression
2023-03-19 19:20:08 +03:00
Konstantin
a1f3dd31e8
fix commander jousting
2023-03-17 21:03:47 +03:00
Ivan Savenko
aea2a1e22e
Fixed loading of settings from mods
2023-03-16 18:11:36 +02:00
Ivan Savenko
2207c0dfb2
Clear up comments
2023-03-16 18:11:36 +02:00
Ivan Savenko
a0e9e01b48
Renamed & reorganized all game mechanics settings names
2023-03-16 18:11:35 +02:00
Ivan Savenko
383387ef29
Integrated defaultMods into mod system
2023-03-16 17:55:09 +02:00
Konstantin
77ebe05491
defaultMods: comment army movement
2023-03-16 17:58:46 +03:00
Konstantin
580268bfd4
vcmi: fix logistics specialist movement regression
...
There was incorrect calculations introduced earlier.
2023-03-16 16:46:42 +03:00
Konstantin
0adffc824f
vcmi: allow to configure army movement counter
...
It is not hardcoded now. MOVEMENT.TXT is still not read,
but ARMY_MOVEMENT updater parameters can be specified in json.
There is a 4 parameters:
1. Base - base value (firstly lowest speed is multiplied by it)
2. Divider - base value is integrally divided by it
3. Multiplier - result value will be multiplied by it
4. Max - maximum allowed movement from army.
Vanilla values is in defaultMods.json
Fixes: https://bugs.vcmi.eu/view.php?id=3209
2023-03-16 16:46:42 +03:00
Konstantin
b91d7418dd
vcmi: remove ONLY_ENEMY_ARMY range
...
It should be used directly instead of alias, propagation updater
also can be useful for any other updaters can be added.
2023-03-16 16:46:42 +03:00
Konstantin
af2cb61077
vcmi: directly specify ONLY_ENEMY_ARMY instead of alias
2023-03-16 16:46:42 +03:00
Konstantin
ff5f828031
vcmi: remove SELF_LUCK bonus
...
This bonus also now handled by LUCK bonus with INDEPENDENT_MAX of 1
2023-03-16 16:46:42 +03:00
Konstantin
c7e197e1ff
vcmi: remove SELF_MORALE bonus
...
It is easily handled by MORALE bonus with INDEPENDENT_MAX
Harmless due to converter.
2023-03-16 16:46:42 +03:00
Konstantin
ae535384f7
vcmi: fix hourglass of the evil hour
...
It also should block only positive luck, according
to HOTA description. So, use LUCK with INDEPENDENT_MIN
2023-03-16 16:46:42 +03:00
Konstantin
ba2a35464a
vcmi: fix spirit of oppression
...
According to discussion on https://bugs.vcmi.eu/view.php?id=2841
2023-03-16 16:46:42 +03:00
Konstantin
930955f268
vcmi: deprecated bonus converter
...
It converts almost all sorts of deprecated bonuses from mods
when loading json. It can print to console correct new variant
or bonus.
Also removed a bunch of deprecated bonuses from list.
It will break saves!!!
2023-03-16 16:46:41 +03:00
Konstantin
95503d0623
vcmi: unify movement
...
1. Now there is only one bonus: MOVEMENT, with 2 subtypes: 0 is sea, 1 is land
For movement value on land depends on creature speed we use a new
ARMY_MOVEMENT updater with global bonus. If we does not like such
dependency, we can just remove this updater from json.
2. All specialities and secondary skills for movement moved to new
system AFAIK
2023-03-16 16:46:41 +03:00
Konstantin
20a9332a3f
vcmi: translate wisdom
...
Make wisdom as separate bonus. It will be enough for now. But
next is should be done as IsLearnable for each spell.
2023-03-16 16:46:41 +03:00
Konstantin
ddcff9dc36
vcmi: convert magic schools to MAGIC_SCHOOL_SKILL
...
It is already used by battlefields.
2023-03-16 16:46:41 +03:00
Konstantin
64ad7558c6
vcmi: skill-agnostic artillery
...
Now it should work for any creature and with any damage percentage.
2023-03-16 16:46:41 +03:00
Konstantin
9205ef2c91
vcmi: skill-agnostic ballistics
...
Made ballistics by using spell action and more code is shared now.
2023-03-16 16:46:41 +03:00
Konstantin
84f53485e2
vcmi: skill-agnostic first aid
...
Now first aid is passive battle spell, and skill just bumps
specific spell power for this spell. Everything about healing
is handled into Heal spell effect.
2023-03-16 16:46:41 +03:00
Konstantin
a0987313ba
vcmi: convert intelligence
...
Intelligence is converted to both global effect and skill bonus
Bonus name HERO_MANA_PER_TEN_KNOWLEDGE is a little weird, but works
like old SECONDARY_SKILL_PREMY bonus
2023-03-16 16:46:41 +03:00
Konstantin
a86e12cd42
vcmi: convert necromancy
...
Now it is 3 bonuses to cover necromancy.
1. IMPROVED_NECROMANCY = possible creatures raized (affected by cloak)
2. UNDEAD_RAISE_CHANCE = raise chance (affected by artifacts)
3. UNDEAD_RAISE_POWER = helper to select creature from first
2023-03-16 16:46:41 +03:00
Konstantin
84eece1d8b
vcmi: convert mysticism to MANA_REGENERATION
...
With PERCENT_TO_TARGET_TYPE it was easy.
2023-03-16 16:46:41 +03:00
Konstantin
f641ed2015
vcmi: convert learning to global effect
...
Now hero experience is a global effect, and secondary
skill gives exactly same bonus. Can be modified by
PERCENT_TO_TARGET_TYPE.
2023-03-16 16:46:41 +03:00
Konstantin
a85f3b63ec
vcmi: reuse SPELL_DAMAGE for sorcery
...
Now there is no need for specific spell bonus, and
we need to simply reuse SPELL_DAMAGE, and by using
PERCENT_TO_TARGET_TYPE speciality will work.
2023-03-16 16:46:41 +03:00
Konstantin
6b987275eb
vcmi: use global bonuses for sight radius and mana
...
We do not need to hardcode constants for there. We can just
use default bonuses.
2023-03-16 16:46:41 +03:00
Konstantin
5d4bcb3c78
vcmi: fix scouting bonus spelling error
...
With fallback for old mods.
2023-03-16 16:46:41 +03:00
Konstantin
f264c541fb
vcmi: skill-agnostic tactics
...
Tactics is split to 2 bonuses, and it is now possible to
block tactics without having tactics itself. But tactics
for two sides is not implemented, because it is huge rework
and not high priority for me now, I want to do basic
secondary skill rework first.
2023-03-16 16:46:41 +03:00
Konstantin
300a8a15ba
vcmi: remove estates bonus
...
Now it is handled by GENERATE_RESOURCE::GOLD.
2023-03-16 16:46:41 +03:00
Konstantin
c64d05c419
vcmi: skill-agnostic diplomacy
...
This is simple and will work.
2023-03-16 16:46:41 +03:00
Konstantin
34a26580a7
vcmi: skill-agnostic resistance
...
Uses exiting bonus and new PERCENT_TO_TARGET_TYPE value type
2023-03-16 16:46:41 +03:00
Konstantin
6e4372176a
vcmi: skill-agnostic pathfinding
...
For now, works exactly as in VCMI and H3.
I think we should add some BONUS_TERRAIN_DISCOUNT_PERCENT bonus
to discount by percent, like written in pathfinding description
2023-03-16 16:46:41 +03:00
Konstantin
9ffd18c914
vcmi: skill-agnostic armorer
...
This is a skill-agnostic armorer, which can be used same as
armorer before.
2023-03-16 16:46:41 +03:00
Konstantin
43f09dd2e4
vcmi: convert scholar to new bonus
...
Convert scholar to new skill-agnostic bonus. Now works only for any
school (not from specific). In all schools form identical to
past's SECONDARY_SKILL_PREMY::SCHOLAR
2023-03-16 16:46:41 +03:00
Konstantin
0ed89e77d4
vcmi: replace archery and offence to new bonus
...
Add PERCENTAGE_DAMAGE_BOOST bonus, which will work exactly as old
archery or offence. Subtype is actually boolean which select
ranged (1) and melee (0)
2023-03-16 16:46:41 +03:00
Konstantin
4a89418ada
vcmi: replace SecondarySkillPremy:EAGLE_EYE
...
Replace this bonus to new ArcaneIntuition bonus, which
will work independently from the rest of skill bonuses.
Proof of concept for other skills.
2023-03-16 16:46:41 +03:00
Konstantin
496c1def12
vcmi: remove FULL_HP_REGENERATION bonus
...
Just set HP_REGENERATION to high number
(in OH3 doubled stack health is sufficient)
2023-03-16 16:46:41 +03:00
Konstantin
62e579f672
vcmi: replace KINGx bonuses to one KING bonus
...
val = level of slayer which require to affect.
Can break saves.
2023-03-16 16:46:41 +03:00
Konstantin
f26fac5562
vcmi: move obligatory marker to CSkillHandler
...
It is working, now it is possible to
define other obligatory skills than wisdom or magic schools,
but only 2 types of obligatory skills exists - like wisdom and
like magic school
2023-03-16 16:46:41 +03:00
Konstantin
9280d70819
vcmi: remove deprecated "specalties" node
...
Use new bonus system format
2023-03-16 16:46:41 +03:00
Konstantin
d9496dd9f7
vcmi: remove vector speciality format
...
It is deprecated and will not be used anymore.
2023-03-16 16:46:41 +03:00
Konstantin
96c40eb36e
vcmi: remove SPECIAL_BLESS_DAMAGE bonus
...
It is handled by HAS_ANOTHER_BONUS_LIMITER with SPELL_EFFECT limiter
with desired spell id (bless). Yes, bonus will come from HERO_SPECIAL,
but will work only for blessed with spell id creatures.
2023-03-16 16:46:41 +03:00
Konstantin
a943d2cb12
vcmi: add sourceType to HasAnotherBonusLimiter
...
Now we can filter bonuses by sourceType, hence,
checking, for example, specific secondary skills.
Also fix archery artifacts working without Archery skill.
2023-03-16 16:46:41 +03:00
Konstantin
7e9a15c20b
vcmi: add PERCENT_TO_TARGET_SOURCE value type
...
It will break saves!!!
Added a new value type to bonuses which allows to add percentage
only to one foreign bonus source, for example, to add percentage to all
bonuses from secondary skills from hero special.
2023-03-16 16:46:41 +03:00
Konstantin
b59ee5fecc
vcmi: move demon summoning ability to separate file
2023-03-16 16:46:41 +03:00
Ivan Savenko
a062e5e425
- Implemented proposition to install translation mod when necessary
2023-03-14 16:02:16 +02:00
Ivan Savenko
c3d78ba761
Partially implemented Setup Window
2023-03-14 16:02:16 +02:00
Ivan Savenko
6fe319329b
Fix language selection
2023-03-14 16:02:16 +02:00
Andrii Danylchenko
4bf570763a
NKAI: improve neutral town priority handling, reduce priority of objects like star axis
2023-03-12 16:31:15 +02:00
Konstantin
a0c644a0e5
vcmi: actually implement AUTO for CInfoWindow
...
This is possible to use infobar interactions now.
2023-03-11 21:41:57 +03:00
Konstantin
38d8585be3
vcmi: fix library of Enlinghtenment text
...
Was text from +1 knowledge garden
2023-03-11 21:41:57 +03:00
Ivan Savenko
58cfea02f1
Added option to skip validation of mods
2023-03-07 00:06:58 +02:00
Ivan Savenko
f768a5543e
Removed deprecated encoding option
2023-03-07 00:06:58 +02:00
Ivan Savenko
499496f9d0
Restored Simplified Chinese support
2023-03-07 00:06:58 +02:00
Ivan Savenko
b3b7a4eb2c
Fix potentially missing message for Tree of Knowledge
2023-03-07 00:06:58 +02:00
Ivan Savenko
b7025125d5
Added map swipe option
2023-03-05 23:53:06 +02:00
Ivan Savenko
2e69a4769d
Implemented framerate limit option (not available in UI)
2023-03-05 21:06:52 +02:00
Ivan Savenko
37b2fb7ff3
Fixed map options to support adventure map rewrite
2023-03-05 20:14:23 +02:00
Ivan Savenko
95440ad540
Minor fixes
2023-03-05 19:55:38 +02:00
Ivan Savenko
d34268d7d5
Split "Show available creatures in town" into two buttons
2023-03-05 19:55:38 +02:00
Ivan Savenko
17dfd3d34a
Updated English translation
2023-03-05 19:55:38 +02:00
Ivan Savenko
b2e5e55c1e
Added labels that indicate current option values
2023-03-05 19:55:37 +02:00
Ivan Savenko
2f556ccf60
Improved General options tab layout presentation
2023-03-05 19:53:27 +02:00
Ivan Savenko
33603f87f3
Finalized general layout
2023-03-05 19:53:27 +02:00
Ivan Savenko
b298895e61
Added placeholders for missing options
2023-03-05 19:53:27 +02:00
Ivan Savenko
919af720a8
Formatting cleanup
2023-03-05 19:53:27 +02:00
Ivan Savenko
c976176453
Added additional buttons for movement speeds
2023-03-05 19:53:26 +02:00
Ivan Savenko
c011a5a9cf
Added lines to window to separate UI elements into groups
2023-03-05 19:51:42 +02:00
Ivan Savenko
273a06a878
Added frame for movement speed & map scrolling
2023-03-05 19:51:42 +02:00
Ivan Savenko
f23186f47d
Slightly better layout for new settings window
2023-03-05 19:51:42 +02:00
Ivan Savenko
7ef5163d9d
Merge pull request #1581 from IvanSavenko/map_render_rewrite
...
Adventure Map - rendering rewrite
2023-03-05 19:51:07 +02:00
Ivan Savenko
b57a07b10f
Restored ambient sounds functionality
2023-03-05 18:02:59 +02:00
Ivan Savenko
387a7b421a
Refactoring of new code, multiple functionality changes:
...
- Implemented separate Map View contexts for different map modes
- Puzzle map now works
- Enemy movement now works as in H3
- Removed no longer used code
- Implemented missing embark/disembark sounds
- Fixed view focusing on embarking/disembarking
- Fixed focusing on movement near edge of terra incognita
- Fixed sea movement sound
2023-03-05 18:02:58 +02:00
Ivan Savenko
b9056ef248
Moved swipe handling to TerrainRect class
2023-03-05 17:57:34 +02:00
Ivan Savenko
cda78fb30f
Added option to disable animations for very low-end systems
2023-03-05 17:48:02 +02:00
Ivan Savenko
ebe996fa74
Hero movement speed and map scrolling speed now matches H3
2023-03-05 17:48:02 +02:00
Ivan Savenko
260f6d626c
Implemented translations for H3M maps
2023-03-05 17:39:27 +02:00
Ivan Savenko
6643408cdd
Fixed localization validation
2023-03-05 17:30:38 +02:00
Ivan Savenko
ad87735d8d
Updated schema
2023-03-05 17:30:38 +02:00
Ivan Savenko
84fa19dadf
Merge pull request #1547 from dydzio0614/game-start-unrandomization
...
Hardcoded features for HotA-like starting conditions
2023-03-05 17:29:49 +02:00
Konstantin
f6695737d6
vcmi: allow loads bonuses info from mods
...
It is useful for making custom bonus graphics into mods, now
mods just replace game config, which is not good.
2023-03-04 22:50:00 +03:00
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