games/vcmi
1
0 Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
12,634 Commits 30 Branches 75 Tags
9af73c2212cf0495aa4c19dfb1faae85c8564fe7
Commit Graph
12634 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nordsoft91 9af73c2212 Merge pull request #2723 from Nordsoft91/versions-fix 
Launcher & lib versions unification
 2023-09-02 19:42:46 +04:00
Nordsoft91 48e6e0228c Merge pull request #2722 from Nordsoft91/launcher-doubleclick 
Launcher mod double click behavior
 2023-09-02 19:42:28 +04:00
Nordsoft91 91565225c6 Merge pull request #2728 from Nordsoft91/turn-timer-fix 2023-09-02 16:29:20 +04:00
nordsoft e85eb36bbd Battle timer fix 2023-09-02 13:14:24 +04:00
nordsoft 48fb167fef Fix timer end turn while standing on obstacles/water 2023-09-02 03:27:46 +04:00
nordsoft 0fc6e2b316 rollback query blocking 2023-09-02 03:17:51 +04:00
nordsoft 9cd3b537ad Add turn timer allowed option 2023-09-02 03:17:32 +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
nordsoft 5875dc6b8f Smarter double-click 2023-09-01 17:40:52 +04:00
nordsoft 8040cafb3d Code review tweaks 2023-09-01 15:17:46 +04:00
nordsoft 15037b782f Fix assert 2023-09-01 04:39:32 +04:00
nordsoft e9ba1d73d1 Support partial versions 2023-09-01 04:36:53 +04:00
nordsoft ea7ab9d5ed Migrate launcher to vcmi versions 2023-09-01 04:12:41 +04:00
nordsoft 31956549e6 Double click behavior 2023-09-01 03:29:50 +04: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