1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-22 22:13:35 +02:00
Commit Graph

1663 Commits

Author SHA1 Message Date
Dydzio
637270ee36 Minor fixes 2024-04-09 19:59:27 +02:00
Ivan Savenko
9e49587749 Replace bonus string description with metastring that can properly
handle translations
2024-04-09 16:13:30 +03:00
Ivan Savenko
576939f105
Merge pull request #3713 from Laserlicht/scalingMode
scalingMode to config
2024-04-09 12:48:35 +03:00
Tomasz Zieliński
d9a598ad9c Merge remote-tracking branch 'origin/develop' into biome_system 2024-04-08 15:01:17 +02:00
Tomasz Zieliński
c9f8742334 Remove some unused templates, hand-tweak existing ones 2024-04-08 14:56:48 +02:00
Tomasz Zieliński
3e3959d360 Move all OH3 objects and obstacle sets to a mod 2024-04-08 12:50:41 +02:00
Ivan Savenko
2685721bf2 Erdamon now increases both min and max damage, as in H3 2024-04-06 15:59:08 +03:00
Tomasz Zieliński
305e2bdf2f Load obstacle sets from json in mods 2024-04-05 08:31:05 +02:00
Laserlicht
ff866bdfce
scalingMode to config 2024-04-04 21:10:49 +02:00
Dydzio
e5e14adb51 Add setting for HD mod tournament rules dimension door limit 2024-04-01 21:52:11 +02:00
Dydzio
f51e1a0ba6 Working version of dimension door triggering guards 2024-04-01 19:00:24 +02:00
Dydzio
3bb66de551 Serverside validation, setting for terrain compatibility before cast etc 2024-04-01 18:12:38 +02:00
Dydzio
70b86e5a87 Merge remote-tracking branch 'origin/develop' into dimension-door-changes 2024-03-30 10:45:00 +01:00
Ivan Savenko
699616c984 Removed no longer used fields - data moved to persistent storage 2024-03-30 10:25:17 +02:00
Dydzio
fe42fab2d6 Merge remote-tracking branch 'origin/develop' into dimension-door-changes 2024-03-28 18:26:21 +01:00
Ivan Savenko
2c7025f7f8 Remove old config options, set defaults to our public server 2024-03-28 12:07:49 +02:00
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