1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

1847 Commits

Author SHA1 Message Date
Dydzio
25f9e6a3e9 Add setting to allow previous VCMI mechanics of dimension door 2024-03-27 23:39:08 +01:00
Ivan Savenko
862f6f8c7b Added descriptions for new buttons in pregame menu 2024-03-27 13:10:55 +02:00
Ivan Savenko
d59fb87504 Indicate rooms with active invites, fix invite acceptance 2024-03-27 13:10:55 +02:00
Ivan Savenko
4dce0479ba UI improvements for lobby screen:
- Show description of current chat room in header
- Show count of online accounts / active rooms
- Highlight currently selected chat room
2024-03-27 13:10:55 +02:00
Ivan Savenko
489dd781c2 Show match creation date in history 2024-03-27 13:10:55 +02:00
Ivan Savenko
829b754091 Implemented matches history in lobby 2024-03-27 13:10:55 +02:00
Ivan Savenko
4ed961fb96 Partially unified handling of pregame and in-game chats 2024-03-27 13:10:55 +02:00
Ivan Savenko
0b89d3804c Added Ukrainian translation 2024-03-27 13:10:55 +02:00
Ivan Savenko
df5af589ae Implemented per-language, player-player and (untested) match channels. 2024-03-27 13:10:55 +02:00
Ivan Savenko
5d188024db Set room status to "In Game" once gameplay starts 2024-03-27 13:10:55 +02:00
Ivan Savenko
7c9aa9d953 Show all rooms (including private) in room list 2024-03-27 13:10:55 +02:00
Ivan Savenko
dcf35e4877 Clicking "Create New Room" button with active room now will switch to
game lobby UI
2024-03-27 13:10:55 +02:00
Ivan Savenko
3023db6f0f Store and show correct player room limit in UI 2024-03-27 13:10:55 +02:00
Ivan Savenko
69236b73ca Added player count icon and enter room icon to room widget 2024-03-27 13:10:55 +02:00
Ivan Savenko
4f34c07f22 Provide correct size to room and account lists 2024-03-27 13:10:55 +02:00
Ivan Savenko
2d37180fe2 Chat textbox now correctly positioned and uses blue slider 2024-03-27 13:10:55 +02:00
Ivan Savenko
be641d1710 Split 'loginSuccess' into server and client-specific versions 2024-03-27 13:10:55 +02:00
Ivan Savenko
310b81db9f Fixes UI of buttons in lobby to use blue theme 2024-03-27 13:10:55 +02:00
Kris-Ja
05bbb45824 change MANA_PER_KNOWLEGDE to percentage 2024-03-23 20:28:49 +01:00
DjWarmonger
2c9b7089ad
Merge pull request #3645 from vcmi/save_rmg_options
Save rmg options
2024-03-14 19:54:08 +01:00
Ivan Savenko
c21e5bb0fb Always validate messages in debug mode. Fixes for schemas 2024-03-08 16:32:40 +02:00
Ivan Savenko
c9604f3dc1 Fix json formatting 2024-03-08 16:32:40 +02:00
Ivan Savenko
ea04a84812 Added initial versions of schemas for lobby protocol 2024-03-08 16:32:40 +02:00
Ivan Savenko
4b2cba96cc
Merge pull request #3646 from IvanSavenko/configurable_button
Configurable buttons
2024-03-04 13:34:40 +02:00
Andrii Danylchenko
35429eab52 NKAI: moddable configuration 2024-03-01 22:03:07 +02:00
Tomasz Zieliński
5f95955535 Store and load last difficulty setting 2024-03-01 10:57:48 +01:00
Ivan Savenko
22f23ba6f8 Restore previously disabled functionality 2024-02-29 16:47:44 +02:00
Ivan Savenko
a2b51323b1 Fix json format 2024-02-29 14:20:11 +02:00
Ivan Savenko
20008cd5a5 Replaced premade buttons on hero screen with generated ones 2024-02-29 13:57:25 +02:00
Ivan Savenko
e89835779b Replaced custom buttons in options window with runtime-generated ones 2024-02-29 13:57:25 +02:00
Ivan Savenko
0051ffa7a9 Implemented configurable buttons. Replaced 'animateLonelyFrame' logic. 2024-02-29 13:57:25 +02:00
Ivan Savenko
2549f62661 Added missing field to schema 2024-02-26 14:57:23 +02:00
Ivan Savenko
5901bf2190 Replace old 'defFile' format with animationFile 2024-02-26 12:55:49 +02:00
Ivan Savenko
5053500965 Fix json formatting 2024-02-19 18:02:44 +02:00
Ivan Savenko
bd901cb001 Replaced lines in settings with primitives 2024-02-19 16:55:07 +02:00
Ivan Savenko
ef8ff00973 Unified common primitive-based UI elements 2024-02-18 22:15:31 +02:00
Ivan Savenko
af671d109f Made graphical primitive-based UI more configurable 2024-02-18 20:48:45 +02:00
Ivan Savenko
9ebd194ab1
Merge pull request #3609 from IvanSavenko/single_process
Allow running server as part of client process
2024-02-14 12:06:22 +02:00
Alexander Wilms
c65794b9e3 Fix typos 2024-02-13 15:23:30 +01:00
Ivan Savenko
cded8b1999 Show human-readable thread name in log 2024-02-11 17:55:02 +02:00
Ivan Savenko
ef8eb330d6
Merge branch 'develop' into random_template_description 2024-02-11 17:54:18 +02:00
Ivan Savenko
f1a8e78f0b
Merge pull request #3596 from vcmi/fixes_for_water
Fixes for RMG water
2024-02-11 17:53:46 +02:00
Ivan Savenko
f2ecd4cf11 Merge branch 'develop' into 'lobby' 2024-02-11 16:13:13 +02:00
Ivan Savenko
a3462acac3
Merge pull request #3602 from Laserlicht/campaignExtraButton
Campaign extra options button
2024-02-11 12:27:14 +02:00
Ivan Savenko
ad602573ff
Merge pull request #3600 from dydzio0614/sod-fly
Fix SoD fly mechanics
2024-02-11 12:26:20 +02:00
Laserlicht
c8b6d6a684 add extra button for campaigns 2024-02-07 21:40:56 +01:00
Dydzio
fd9810adf4 Working SoD version of fly 2024-02-07 19:27:02 +01:00
Ivan Savenko
a18f9d1e8d Added workaround for references to old 'torosar ' ID 2024-02-05 21:56:06 +02:00
Tomasz Zieliński
5c6a146952 Use HoTA values for water treasures 2024-02-04 08:57:02 +01:00
Ivan Savenko
80fc2bb695 Merge remote-tracking branch 'vcmi/develop' into lobby 2024-02-03 21:11:34 +02:00
Tomasz Zieliński
b7df6064cd Add random map description and display it in RMG menu 2024-02-03 16:23:56 +01:00
Laserlicht
5e3f0e631c
possibility to show small queue outside 2024-02-01 21:17:08 +01:00
Laserlicht
25188aead8
change config name 2024-02-01 20:50:58 +01:00
Laserlicht
aa2fc4b88a
adjustable queue size for embedded queue 2024-02-01 20:38:38 +01:00
Ivan Savenko
049c352511 Added loss condition "lose part of Angelic Alliance" to Yog campaign 2024-01-31 12:52:16 +02:00
Ivan Savenko
c5c46a7c9a Implemented connecting to server via proxy 2024-01-30 21:31:41 +02:00
Laserlicht
a2fd5039ab
setting 2024-01-27 01:16:55 +01:00
Ivan Savenko
322c5faf63 Merge remote-tracking branch 'vcmi/develop' into lobby 2024-01-26 16:52:23 +02:00
Ivan Savenko
388ca6e776 Added list of active accounts and rooms to UI. Added room creation logic 2024-01-26 16:32:36 +02:00
Ivan Savenko
4d0c0f10a9
Merge pull request #3530 from Laserlicht/tavern
Invite hero
2024-01-26 13:12:55 +02:00
Laserlicht
0a4b5dbe10
code review 2024-01-21 18:12:46 +01:00
Ivan Savenko
b80c52faf1
Merge pull request #3524 from vcmi/dydzio0614-patch-1
Update bonuses.json
2024-01-21 10:10:00 +02:00
DjWarmonger
4e8ddf8d5b
Merge pull request #3526 from luk3ZPL/develop
Update difficulty.json
2024-01-21 09:07:05 +01:00
Laserlicht
883ea23495
moved to gameconfig 2024-01-20 17:54:15 +01:00
Laserlicht
4813179abb
Invite hero setting 2024-01-20 01:24:34 +01:00
Ivan Savenko
ffa58152ac Client-side support for hosting game server via lobby 2024-01-19 23:49:59 +02:00
Ivan Savenko
47f72af556 Client-side update, adapted and fixed login and chat 2024-01-19 23:49:59 +02:00
Ivan Savenko
55b504792e Implemented basic version of login window and persistent connection on
client
2024-01-19 23:49:59 +02:00
Ivan Savenko
2396c14114 Fixed logic for reconnection attempts to local server. Cleanup.
Added distinct fields in config for local and remote connection.
Removed code for restoring last session since it does not works as
intended and often triggers after crash
2024-01-19 23:49:59 +02:00
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