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

482 Commits

Author SHA1 Message Date
DjWarmonger
4949b98ed3
Merge pull request #3759 from Laserlicht/bio
Let's try this
2024-05-07 09:05:14 +02:00
Ivan Savenko
91ff82e74f Remove no longer used values 2024-04-30 21:35:07 +03:00
Ivan Savenko
73f4ad46ca Tweaked default settings for controller sensitivity 2024-04-30 21:29:49 +03:00
Ivan Savenko
89d6ddd916 Allow input configuration via config file 2024-04-30 20:56:47 +03:00
Laserlicht
ab50bf9198
biography to description 2024-04-27 18:41:21 +02:00
Ivan Savenko
1840666327 Implemented join room dialog 2024-04-23 17:15:59 +03:00
Ivan Savenko
e5f8cefa7f Store and send mod list and game version for game rooms 2024-04-23 17:15:59 +03:00
Ivan Savenko
556c8f165c
Merge pull request #3802 from vcmi/dydzio0614-patch-1
Change default mod repository URL
2024-04-22 11:09:30 +03:00
Dydzio
331ebbaf70
Change default mod repository URL 2024-04-20 14:49:13 +02:00
Laserlicht
19b75c3d88
possibility to disable dimming of small windows 2024-04-19 22:50:05 +02:00
DjWarmonger
0808a8b36f
Merge pull request #3714 from vcmi/biome_system
Biome system implementation
2024-04-13 21:32:13 +02:00
Laserlicht
e4b60baa3b
creature/town biography/description 2024-04-12 23:35:39 +02:00
Tomasz Zieliński
a7d0f0626a Docs & final touches 2024-04-12 14:53:07 +02:00
Tomasz Zieliński
4fa7f0e93d Also allow filtering biomes by faction(s) 2024-04-12 10:25:13 +02:00
Tomasz Zieliński
a356fdaf2a Allow filtering obstacles by faction aligmnment 2024-04-11 18:10:14 +02:00
Dydzio
00ebbad622 Ability to make faction not pickable on typical maps 2024-04-10 21:22:29 +02:00
Tomasz Zieliński
6c9d18a85c Allow multiple terrains per biome 2024-04-10 09:40:12 +02:00
Tomasz Zieliński
3e3959d360 Move all OH3 objects and obstacle sets to a mod 2024-04-08 12:50:41 +02: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
Ivan Savenko
699616c984 Removed no longer used fields - data moved to persistent storage 2024-03-30 10:25:17 +02:00
Ivan Savenko
2c7025f7f8 Remove old config options, set defaults to our public server 2024-03-28 12:07:49 +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
7c9aa9d953 Show all rooms (including private) in room list 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
be641d1710 Split 'loginSuccess' into server and client-specific versions 2024-03-27 13:10:55 +02: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
Tomasz Zieliński
5f95955535 Store and load last difficulty setting 2024-03-01 10:57:48 +01: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
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
f2ecd4cf11 Merge branch 'develop' into 'lobby' 2024-02-11 16:13:13 +02: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
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
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
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
44d3629028 Fix schema 2024-01-19 16:30:15 +02:00
Laserlicht
a1f4fcb78a
hide adventuremap 2024-01-18 00:47:18 +01:00
Ivan Savenko
b08462d555 Change default SDL driver name from opengl to empty (autoselection) 2024-01-14 14:29:13 +02:00
Dydzio
046d3abee4 Add new setting for instant adventure map fade in / fadeout effects 2023-12-24 17:18:48 +01:00
Dydzio
896f3108ee Large spellbook by default 2023-12-23 17:53:06 +01:00
Dydzio
661e5295f1 Change infoBarCreatureManagement setting: true by default 2023-12-17 16:31:49 +01:00
Laserlicht
df2a5f05d8
audio mute on focus lost setting 2023-12-10 14:49:27 +01:00
Dydzio
fc035b1b55 Change large spellbook config section to gameTweaks 2023-11-28 22:30:50 +01:00
Dydzio
a4d76b2529 Split large spellbook from UI enhancements setting 2023-11-26 19:16:53 +01:00
Ivan Savenko
845a259619 Disable quick combat by default to avoid confusing players 2023-11-20 14:39:19 +02:00
Tomasz Zieliński
ec0bf05163 Rename "cpu" parameter to correct "humans" 2023-10-30 17:21:03 +01: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
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
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
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
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
krs
ffaf4c5b01 Fix broken skill schema 2023-09-15 22:03:23 +03: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
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
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
nordsoft
1ef407ea9f Fixes 2023-09-02 14:10:50 +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
6380a02e10 Upgrade launcher default repo 2023-08-28 17:10:52 +04:00
Michael
bbd69fd430
added setting 2023-08-27 00:33:52 +02:00
Michael
65884b15d0
Update settings.json
best setting as default (subfolder with map-name)
2023-08-22 20:51:28 +02: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
Dydzio
6bfbe80cc9 Allow toggling quick combat spells usage 2023-08-19 17:23:55 +02:00
Ivan Savenko
59c599cbf9 Reverted FPS limit change on mobile systems 2023-08-05 13:35:58 +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
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
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
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
Tomasz Zieliński
f3d2a50d2e Update schemas with new properties 2023-07-18 19:24:45 +02: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
Dydzio
48a72f90f7 Add option for persistent hero info window as in HD mod 2023-07-17 23:25:16 +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
Ivan Savenko
57e7db7fdf Add missing language entry 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
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
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
Ivan Savenko
e0ea994656 Moved some pathfinding options to game settings 2023-06-25 17:42:36 +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
77b58bc66d Cleaned up object constructors to reduce duplicated code 2023-06-16 17:59:50 +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
krs
9496cb4058 rangedFullDamageLimitHighlightOnHover is now turned off by default 2023-06-11 19:36:46 +03:00