1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-18 17:40:48 +02:00
Commit Graph

12625 Commits

Author SHA1 Message Date
nordsoft
b0105e8a3a Channels support 2023-09-03 16:47:34 +04:00
nordsoft
ef853ab96d Move chat logic to separate class 2023-09-03 03:05:48 +04:00
nordsoft
d0b3567447 Advanced chat 2023-09-03 01:46:25 +04:00
nordsoft
75258baefc Chat minor improvements 2023-09-02 22:53:44 +04:00
Ivan Savenko
cab2bddf7e
Merge pull request #2712 from Laserlicht/dim_map
Dim adventuremap
2023-09-01 22:37:10 +03:00
Alexander Wilms
d2f0a80573
Update VCMI icon (#2672)
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
2023-09-01 22:36:32 +03:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer
Turn timer fixes
2023-09-01 00:31:52 +04:00
Michael
1721fe1ad6
optimize if disabled 2023-08-31 21:03:54 +02:00
Michael
3593911dde
improve readability 2023-08-31 21:00:02 +02:00
nordsoft
d7f0698651 Change text hints 2023-08-31 20:46:48 +04:00
Ivan Savenko
ab2d4ba471
Merge pull request #2708 from Laserlicht/disable_unavilable_heroes
disable unavailable heroes in selection
2023-08-31 15:45:32 +03:00
Ivan Savenko
a59d7b5fc9
Merge pull request #2687 from Nordsoft91/filledTexturePlayerColored
Support FilledTexturePlayerColored in configurable interface
2023-08-31 15:43:40 +03:00
Ivan Savenko
adb633be30
Merge pull request #2715 from IvanSavenko/regression_fix
Fix several recently discovered regressions
2023-08-31 15:41:04 +03:00
Nordsoft91
49614f5851
Merge pull request #2695 from Nordsoft91/mod-compatibility 2023-08-31 12:14:54 +04:00
Ivan Savenko
2e411eca19 Do not allow stopping movement while using water walk over water 2023-08-31 01:38:16 +03:00
Ivan Savenko
0f4f9b3233 Fix handling of opening spells when tactics is present 2023-08-31 01:32:32 +03:00
Ivan Savenko
3e169ef2f5 Fix visiting of markets 2023-08-31 01:07:59 +03:00
Ivan Savenko
f6a4a1ae0c
Merge pull request #2686 from vcmi/fix-battle-freeze
BattleAI: fix freeze
2023-08-31 01:06:47 +03:00
Michael
31e0558809
remove unneeded headers 2023-08-30 21:43:59 +02:00
Michael
e650f0100b
setting + all non popups 2023-08-30 21:41:28 +02:00
nordsoft
00216168bf Timer works as designed 2023-08-30 03:44:09 +04:00
nordsoft
cc3ca9a41e Timers fixes 2023-08-30 03:33:59 +04:00
nordsoft
9a42abe2a7 Extended timer info to exhange between client and server 2023-08-30 03:11:46 +04:00
nordsoft
f30f00faa0 Timer pausing while waiting for player accept turn 2023-08-30 02:18:44 +04:00
nordsoft
b4c20734f3 Support timer logic for pve and pvp 2023-08-30 02:17:29 +04:00
Michael
1d6469ab36
battlewindow 2023-08-29 22:43:37 +02:00
Michael
40c7ddcaf4
dim adventuremap 2023-08-29 22:22:22 +02:00
Michael
b6000841f1
code review 2023-08-29 21:08:18 +02:00
nordsoft
03496e6738 Code review fixes 2023-08-29 15:48:42 +04:00
nordsoft
c8243313b8 Translations for turn timers 2023-08-29 14:53:15 +04:00
Michael
196cd41e35
fix multiplayer 2023-08-29 02:04:32 +02:00
Michael
44ece25042
disable unavailable heroes 2023-08-29 00:14:49 +02:00
Ivan Savenko
695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
Ivan Savenko
eafa9cbae1
Merge pull request #2684 from dydzio0614/creature-spellcasting-fixes
Better default stack action handling + "F shortcut" mode fixes
2023-08-28 20:01:04 +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
Ivan Savenko
a30939ad8e
Merge pull request #2685 from dydzio0614/mana-drain-ui-refresh
Fix mana drain not refreshing battle hero window mana
2023-08-28 19:56:29 +03:00
nordsoft
883c68b151 Remove unused variable 2023-08-28 19:57:42 +04:00
nordsoft
432ed18579 Fix overlap of timer and fps widgets 2023-08-28 19:46:09 +04:00
nordsoft
b5417c667c Hold timer client counter 2023-08-28 19:46:09 +04:00
nordsoft
21af69e0b7 Fix timer synchornization 2023-08-28 19:45:15 +04:00
nordsoft
68b11dbe38 Fix no-base turn timer 2023-08-28 19:45:15 +04:00
nordsoft
15f57a0817 Timer enabler 2023-08-28 19:45:15 +04:00
nordsoft
2c61d1b23f Use precision clocks for timer 2023-08-28 19:45:15 +04:00
nordsoft
7dc1717ec6 Handle timer for tactic phase 2023-08-28 19:45:15 +04:00
nordsoft
4ee47b01ae Make possible to play with different timers independently 2023-08-28 19:45:15 +04:00
nordsoft
6226ddf4a7 Fix potential concurrenccy issues 2023-08-28 19:45:15 +04:00
Nordsoft91
2022d55d40
Merge pull request #2692 from Nordsoft91/accept-turn
Accept turn query
2023-08-28 19:44:46 +04:00
nordsoft
71cbb0e2e7 Change query reply method 2023-08-28 18:56:36 +04:00
nordsoft
98f7ed9dfd Implement player start turn query 2023-08-28 18:56:36 +04:00
Nordsoft91
8e9dd697ff
Merge pull request #2674 from Nordsoft91/turn-timer
Chess Timer UI and battle timer fixes
2023-08-28 18:53:41 +04:00