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

5122 Commits

Author SHA1 Message Date
Laserlicht
68e536c290
code review 2023-09-24 02:00:42 +02:00
Laserlicht
b143c2786f
use dimming to hide screen 2023-09-24 00:58:48 +02:00
Laserlicht
e69b91fbdd
fix layer problem 2023-09-23 23:44:12 +02:00
Laserlicht
41b03e7c5b
fixed some edge cases 2023-09-23 23:11:17 +02:00
Laserlicht
96df11a6f2
always show actual entry 2023-09-23 22:45:38 +02:00
Laserlicht
8a0565eb9b
use vector 2023-09-23 22:15:05 +02:00
Laserlicht
c49d38b855
cheats + grail in town 2023-09-23 21:37:40 +02:00
Laserlicht
6f8b62d77d
codereview 2023-09-23 20:41:30 +02:00
Laserlicht
ca96749c45
workaround for missing video 2023-09-23 16:28:28 +02:00
Laserlicht
06895e6733
fine tuning 2023-09-23 15:11:48 +02:00
Laserlicht
e3edcb6cd8
rmb; bugfix; tabs 2023-09-23 14:51:39 +02:00
Laserlicht
d2398b804a
implement adding 2023-09-23 13:14:45 +02:00
Laserlicht
e18a4a09a9
forward declaration 2023-09-23 02:14:45 +02:00
Laserlicht
049f90159d
highlight preparation 2023-09-23 01:53:45 +02:00
Laserlicht
d3f007453d
win screen ready 2023-09-23 01:36:01 +02:00
Laserlicht
901a33bf1d
calculation 2023-09-23 01:03:15 +02:00
nordsoft
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
Laserlicht
1a0f5cf159
calc preperation 2023-09-23 00:21:36 +02:00
Laserlicht
30c6cf3b98
video & audio correction; win/lose 2023-09-22 21:45:12 +02:00
Laserlicht
a4cb74f0dc
highscore input window 2023-09-22 20:39:20 +02: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
Nordsoft91
ec582328b4
Merge pull request #2887 from Laserlicht/campaign_improvement
campaign improvements
2023-09-22 01:01:59 +02:00
Laserlicht
9e78f9c69c
CodeReview 2023-09-21 23:41:00 +02:00
nordsoft
4691907f9c Show root mods only 2023-09-21 22:28:29 +02:00
Laserlicht
5fd2eee3e8
code review 2023-09-21 21:27:06 +02:00
nordsoft
a05f8339ae Proper mod compatibility check system 2023-09-21 04:31:08 +02:00
Laserlicht
4d8414bd3d
unlock functionality 2023-09-20 23:06:32 +02:00
Laserlicht
48231f5f4f
save results only if from set 2023-09-20 22:28:45 +02:00
Laserlicht
dfb5ccbeaf
add persistent storage & completed campaign support 2023-09-20 22:18:53 +02:00
Laserlicht
52b86eb9c1
get back to campaignmenu 2023-09-20 21:18:13 +02:00
Ivan Savenko
a9abd294da
Merge pull request #2876 from IvanSavenko/revisit_object_button_block
Block revisit object shortcut if no visit is possible
2023-09-20 22:09:36 +03:00
Ivan Savenko
42d9ba6c82
Merge pull request #2877 from IvanSavenko/simturn_fixes
Changes for simturns support
2023-09-20 22:09:25 +03:00
Nordsoft91
5a8c3b5ae2
Merge pull request #2869 from Laserlicht/audio
disable audio on lost focus
2023-09-20 13:20:47 +02:00
Ivan Savenko
00db2e245f
Merge pull request #2872 from Laserlicht/bonus_selection
fix bonus selection
2023-09-20 13:19:54 +03:00
Laserlicht
34182069f5
campaignset 2023-09-20 03:13:54 +02:00
Ivan Savenko
7b37c2353a
Merge pull request #2865 from IvanSavenko/market_ownership_check_fix
Cleaned up and fixed ownership checks for market netpack
2023-09-19 23:43:33 +03:00
Nordsoft91
461aa97d7e
Merge pull request #2864 from Laserlicht/double_tap
support double tap
2023-09-19 19:37:49 +02:00
Nordsoft91
648e8c7acb
Merge pull request #2856 from Laserlicht/hero_overview
Hero overview
2023-09-19 19:36:19 +02:00
Ivan Savenko
d3ced6b703 Block revisit object shortcut if no visit is possible 2023-09-19 19:51:31 +03:00
Ivan Savenko
2af7d7c085 Ignore garrison update events of another towns for our castleInt 2023-09-19 19:24:35 +03:00
Ivan Savenko
8c0d78f1d9 Added initiator-player to packs that add/remove/move objects 2023-09-19 19:24:34 +03:00
SoundSSGood
48ec2d7e2a
Merge branch 'vcmi:develop' into exchange-window-update 2023-09-19 16:22:00 +03:00
SoundSSGood
6280e778dc fix build 2023-09-19 16:04:37 +03:00
SoundSSGood
9cc623c981 Fixed move checks. Backpack buttons. 2023-09-19 13:31:59 +03:00
SoundSSGood
f47def3588 refactoring 2023-09-19 13:31:57 +03:00
SoundSSGood
a83f290e13 bulk move artifacts only equipped, only backpack 2023-09-19 13:31:42 +03:00
Laserlicht
a2174dc83f
fix window open while sound playing 2023-09-19 11:20:16 +02:00
Laserlicht
6ae09d8458
newday 2023-09-19 09:52:32 +02:00
Laserlicht
babf858112
format 2023-09-19 01:50:42 +02:00
Laserlicht
4ac3e3c2e5
fix bonus selection 2023-09-19 01:48:26 +02:00
Laserlicht
bcf32984ce
always sound at chat message 2023-09-19 01:08:49 +02:00
Laserlicht
996036bdf2
disable audio on lost focus 2023-09-18 21:28:23 +02:00
Laserlicht
2d2c7ee8e0
added tolerance 2023-09-18 20:35:23 +02:00
Ivan Savenko
219f81d28b Added explicit "PlayerEndsTurn" netpack
- PlayerEndsTurn pack is now sent when player ends turn
- YourTurn pack has been renamed to PlayerStartsTurn for consistency
- PlayerStartsTurn will no longer replace list of acting players
- PlayerEndsGame and PlayerEndsTurn will remove player from acting list
2023-09-18 20:55:01 +03:00
Ivan Savenko
54ff039c51
Merge pull request #2850 from IvanSavenko/remove_hero_move_thread
Remove hero movement thread
2023-09-18 20:54:13 +03:00
Ivan Savenko
f1c40466d3 Changes according to review 2023-09-18 18:17:26 +03:00
Laserlicht
71659f1423
fix 2023-09-18 16:43:16 +02:00
Ivan Savenko
3d04e9c9ed Cleaned up and fixed ownership checks for market netpack 2023-09-18 17:22:30 +03:00
Laserlicht
7321bb1d25
support double tap 2023-09-18 16:05:39 +02:00
Laserlicht
5125bcc67f
added probabilities 2023-09-17 23:01:18 +02:00
Laserlicht
7978e5a9b7
adjusted army and warmachine space 2023-09-17 21:55:35 +02:00
Laserlicht
21f37cfafb
simplified 2023-09-17 21:41:55 +02:00
Laserlicht
05fad115b5
Added new Widgets an functions for simplification 2023-09-17 20:34:31 +02:00
Laserlicht
d33101187b
simplify 2023-09-17 16:55:26 +02:00
Laserlicht
a994fa00aa
fixes; translation 2023-09-17 16:15:17 +02:00
Laserlicht
69da4d59bf
basic function ready 2023-09-17 15:28:05 +02:00
Laserlicht
cfc5bac540
layout 2023-09-17 14:31:07 +02:00
Laserlicht
59b5c46a32
right side draft 2023-09-17 13:22:39 +02:00
Laserlicht
79e872da68
left side ready 2023-09-17 04:10:08 +02:00
Laserlicht
b674682fe3
left side 2023-09-17 03:21:29 +02:00
Laserlicht
73fe924544
draw background 2023-09-17 02:14:03 +02:00
Laserlicht
ff96b1af0a
initial hero overview 2023-09-17 00:32:10 +02:00
Ivan Savenko
348eddcc17 Fix looped playback of video files 2023-09-17 01:31:31 +03:00
Ivan Savenko
b7de685483 Fixed paths through teleport, formatting cleanup 2023-09-16 20:35:04 +03:00
Ivan Savenko
f08028a158 Fixed moving through garrisons & teleporters 2023-09-16 20:07:26 +03:00
Ivan Savenko
2355aab139 Correctly end movement on battle start 2023-09-16 20:07:26 +03:00
Ivan Savenko
c8e6a7cd27 Fixed most common cases of movement actions 2023-09-16 20:07:26 +03:00
Ivan Savenko
0afc244934 Split massive methods into smaller chunks 2023-09-16 20:07:26 +03:00
Ivan Savenko
80b80a0ae6 Minor cleanup of hero movemen code 2023-09-16 20:07:26 +03:00
Ivan Savenko
347ce01dbe Moved hero movement logic to a new class from PlayerInterface 2023-09-16 20:07:26 +03:00
Nordsoft91
717a765123
Merge pull request #2813 from Laserlicht/textcolor
Textcolor support
2023-09-16 14:12:17 +02:00
Ivan Savenko
ed60675a01
Merge pull request #2808 from Laserlicht/credits
VCMI credits
2023-09-16 12:02:32 +03:00
Nordsoft91
2d6ef9049a
Merge pull request #2827 from Laserlicht/select_instead_path 2023-09-15 20:28:51 +02:00
Laserlicht
063c7f3ca0 move function; optional; json static 2023-09-15 15:27:26 +02:00
Laserlicht
922a775108 Update CMessage.h 2023-09-15 15:27:26 +02:00
Laserlicht
f5505c9f6d support for predefined colors 2023-09-15 15:27:26 +02:00
Laserlicht
f776422c67 color linesplit 2023-09-15 15:27:26 +02:00
Laserlicht
d948cb72a0 Alignment 2023-09-15 15:27:26 +02:00
Laserlicht
dd4c95bd04 textcolor 2023-09-15 15:27:26 +02:00
Laserlicht
1c68937d95 new approach 2023-09-15 15:26:14 +02:00
Laserlicht
42d2257f19 VCMI credits 2023-09-15 15:26:14 +02:00
Laserlicht
39838fdd3c extend for all selections 2023-09-15 15:24:17 +02:00
Laserlicht
03316c62bf Easy choosing for a secondary skill in Level Up Dialog by double clicking it 2023-09-15 15:24:17 +02:00
Laserlicht
19693d251d comments 2023-09-15 15:15:33 +02:00
Laserlicht
6d69326c1a alternative implementation 2023-09-15 15:15:33 +02:00
Laserlicht
8d160101ed alt mode to select instead of changing path 2023-09-15 15:15:33 +02:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Ivan Savenko
e2e4168966
Merge pull request #2828 from dydzio0614/commander-abilities-requirements
Commander abilities requirements
2023-09-14 14:57:19 +03:00
Ivan Savenko
717fff3d28
Merge pull request #2822 from IvanSavenko/float_comparison_fix
Attempt to fix freeze during map animations
2023-09-14 12:18:09 +03:00
Dydzio
56c969be4f Fix commanders requirements for special skills to match WoG 2023-09-13 23:08:22 +02:00
Dydzio
aabb26d210 Erase outdated path that was previously available 2023-09-13 22:25:33 +02:00
Ivan Savenko
70d44d435e Attempt to fix freeze during map animations 2023-09-13 18:48:36 +03:00
Laserlicht
9cf274362e
small folder optimation 2023-09-12 20:28:54 +02:00
Ivan Savenko
d070953c28 Fix open backpack strings 2023-09-12 21:28:36 +03:00
Ivan Savenko
538665fe42 Fix "Start game" blocking status:
- Start game is now initially blocked
- Receiving valid startInfo from server will unlock button
2023-09-12 21:15:15 +03:00
Ivan Savenko
60cbb939ab Fix crash on window resize 2023-09-12 21:15:15 +03:00
Ivan Savenko
a09147a433 Do not block map layer toggles in world view mode 2023-09-12 21:15:14 +03:00
Ivan Savenko
a5e42755be Correctly redraw map in world view mode 2023-09-12 21:15:14 +03:00
SoundSSGood
82eb2f8a2b Artifact assembling changes 2023-09-12 19:17:35 +03:00
Nordsoft91
0a799ecc46
Merge pull request #2740 from Laserlicht/fix_cursor_issue 2023-09-11 22:20:11 +02:00
Laserlicht
994da3fcf2
code review 2023-09-11 14:44:07 +02:00
Laserlicht
fa19ed4e7c
format 2023-09-11 14:11:16 +02:00
Laserlicht
00f07f93d1
wait while audio playing; no audio on custom campaigns 2023-09-11 14:04:44 +02:00
Laserlicht
fc1ce85a72
basic voice support 2023-09-11 12:57:10 +02:00
Laserlicht
2cb28178ae
code review 2023-09-10 20:52:35 +02:00
Ivan Savenko
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
Ivan Savenko
89c31d0d52
Fix typo 2023-09-08 16:54:51 +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
Ivan Savenko
9e6424c545
Merge pull request #2775 from IvanSavenko/radial_fill_ones
(1.3.2) Add "Fill with single creatures" option to radial wheel
2023-09-08 13:16:00 +03:00
Ivan Savenko
5d67481aaf
Merge pull request #2774 from IvanSavenko/beta_bugfixing
(1.3.2) Beta bugfixing
2023-09-08 13:15:52 +03:00
Ivan Savenko
72858cd0d8
Merge pull request #2768 from IvanSavenko/cherry_picked_fixes
(1.3.2) Cherry picked fixes
2023-09-08 13:15:34 +03:00
Ivan Savenko
635884cb05 Replaced show unit info with fill with one's option in radial 2023-09-07 13:55:58 +03:00
SoundSSGood
1b810b5b93 combined arts assembling fixed 2023-09-07 11:54:52 +03:00
SoundSSGood
f1a6116088 CHeroArea fix 2023-09-07 11:54:50 +03:00
SoundSSGood
3675d88730 fixed highlighting slots 2023-09-07 11:39:29 +03:00
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
Ivan Savenko
346eead8e0 Show spell cursor when casting spell in touch input mode 2023-09-06 23:01:43 +03:00
Ivan Savenko
d7fb2bcf83 Show message on cancelling spell in combat 2023-09-06 21:54:26 +03:00
Ivan Savenko
9fa7a93fb0 Properly pass battleID in all battle netpack's 2023-09-06 16:03:47 +03:00
Ivan Savenko
747e28947a Fix build 2023-09-06 16:03:47 +03:00
Ivan Savenko
41210c1dbf Client-side support for multiple battles 2023-09-06 16:03:47 +03:00
Ivan Savenko
036df2e0ad Support multiple battles in AI 2023-09-06 16:03:46 +03:00
Michael
287c0daaff add also savegame 2023-09-06 12:34:31 +03:00
Michael
36ab973dc8 fix difficulty widget 2023-09-06 12:34:23 +03:00
Ivan Savenko
3973624278 Implemented tolerance for touch events 2023-09-06 01:06:01 +03:00
Alexander Wilms
c0f0211098 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-05 23:57:19 +03:00
Gwart
707400d764 #2646 add a null check if creature is empty 2023-09-05 23:32:12 +03:00
Ivan Savenko
64adb538fe Do not allow stopping movement while using water walk over water 2023-09-05 23:32:02 +03:00
Ivan Savenko
63a8cd9642 Fix quest log button block status 2023-09-05 23:31:26 +03:00
Ivan Savenko
47249ee5ed Fix resource bar UI in hotseat 2023-09-05 23:31:20 +03:00
Ivan Savenko
f7b67a5abe Remove incorrect message on another player defeat 2023-09-05 23:31:14 +03:00
Ivan Savenko
5d1d559d81 Fix possible unprotected access to battleint 2023-09-05 23:31:07 +03:00
Ivan Savenko
211bcb6e82
Merge pull request #2720 from SoundSSGood/backpack-variable-cap
Support for different backpack window capacities
2023-09-05 13:40:39 +03:00
Ivan Savenko
f30355839f Fix build 2023-09-05 00:55:54 +03:00
Ivan Savenko
12c4f8d18c Fixed serialization of PlayerColor in json 2023-09-04 22:22:24 +03:00
Ivan Savenko
86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
SoundSSGood
a7cedea73c Support for different backpack capacities 2023-09-04 20:59:24 +03:00
Ivan Savenko
1d0e696db6 Added RenderHandler that acts as factory for images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
9cfcf5ea19 Fix regressions 2023-09-04 18:22:34 +03:00
Ivan Savenko
0f88b8969b Removed some usages of std string as resource path 2023-09-04 18:22:34 +03:00
Ivan Savenko
8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
Ivan Savenko
97b7d44c88 Use ResourcePath for video accessing 2023-09-04 18:22:34 +03:00
Ivan Savenko
6f0108e462 Use ResourcePath for referencing texts and json's 2023-09-04 18:22:34 +03:00
Ivan Savenko
823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
Ivan Savenko
e2b5ff13f1
Merge pull request #2746 from wb180/teamsPopup
Show only non-empty teams in teams popup
2023-09-03 22:23:32 +03:00
Ivan Savenko
7ccc8605ac
Merge pull request #2733 from SoundSSGood/empty-bulk-move-fix
Arts bulk move crash fixed
2023-09-03 22:06:57 +03:00
Nordsoft91
2eaed0c983
Merge pull request #2743 from Laserlicht/fix_difficulty_widget
[fix] difficulty widget
2023-09-03 17:57:43 +04:00
Nordsoft91
2057624cbc
Merge pull request #2741 from Laserlicht/folder_order
[fix] folder order
2023-09-03 17:56:56 +04:00
Evgeniy Meshcheryakov
b6e2c454c0 Show only non-empty teams in teams popup 2023-09-03 08:05:02 +03:00
Michael
53277306cd
add also savegame 2023-09-02 20:39:16 +02:00
Michael
3d08518dac
fix difficulty widget 2023-09-02 19:37:56 +02:00
Michael
e0460a0dec
up should be first 2023-09-02 19:04:06 +02:00
Michael
20fd0d8901
fix cursor issue 2023-09-02 18:35:32 +02:00
Gwart
05ba56a873 #2646 add a null check if creature is empty 2023-09-02 16:21:54 +02:00
SoundSSGood
3126875e6a arts bulk move crash fixed 2023-09-02 14:36:57 +03: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
Konstantin
e554a2766d BattleActions: do not pass unnecessary targetStack
It was unused for everything except teleport, so pass it only wher we
attempt to teleport.

Reworking sacrifice is out of scope from beta
2023-08-31 23:44:00 +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
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
7255dda624
Merge pull request #2629 from dydzio0614/neutral-creature-popup
Improve neutral creature adventure map popup
2023-08-31 15:44:19 +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
3ce99e8613
Merge pull request #2710 from dydzio0614/artifacts-backpack-graphics
Split artifacts bag button background and icon
2023-08-31 15:42:50 +03:00
Ivan Savenko
2e411eca19 Do not allow stopping movement while using water walk over water 2023-08-31 01:38:16 +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
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
Dydzio
e1e41d1107 Implement TOPCENTER text alignment 2023-08-30 00:35:31 +02: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
Dydzio
03ef5b6b0f Split artifacts bag button background and icon 2023-08-29 18:53:50 +02: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
Dydzio
bafe8baa15 Fix "ghost" icons in commander grandmaster abilities list 2023-08-29 00:20:44 +02:00
Michael
44ece25042
disable unavailable heroes 2023-08-29 00:14:49 +02:00
Dydzio
2769782d0a Fix broken grandmaster ability description updating on select/deselect 2023-08-28 23:49:07 +02:00
Dydzio
dacf6c9d08 Add border around selected commander "grandmaster ability" on levelup 2023-08-28 23:36:45 +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
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
4ee47b01ae Make possible to play with different timers independently 2023-08-28 19:45:15 +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
nordsoft
78397d6d1a Fix compiling 2023-08-28 17:21:38 +04:00
nordsoft
439254f921 Fix mistake 2023-08-28 17:21:38 +04:00
nordsoft
49a76ac14c Code review tweaks 2023-08-28 17:21:38 +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
de8bd48398 Added right click pop-up for text inputs 2023-08-28 17:21:38 +04:00
nordsoft
614a285fb8 Fix hot seat timer visualization 2023-08-28 17:21:38 +04:00
nordsoft
e4e9bcfb9b Show time for other player during battle 2023-08-28 17:19:04 +04:00
nordsoft
fdaf05514a Correct network data exchange and time parsing 2023-08-28 17:10:52 +04:00
nordsoft
1e527a6942 Minor changes 2023-08-28 17:10:52 +04:00
nordsoft
86e0ea15fb Fix turn timer settings 2023-08-28 17:10:52 +04:00
nordsoft
d758727c23 Basic timer ui is almost complete 2023-08-28 17:10:52 +04:00
nordsoft
c7ded69edc Minor changes 2023-08-28 17:10:52 +04:00
nordsoft
c064b805c2 Refactor combo box 2023-08-28 17:10:52 +04:00
nordsoft
39fbdd300d Refactor combo box 2023-08-28 17:10:52 +04:00
Nordsoft91
1586c6c6a0
Merge pull request #2668 from IvanSavenko/remove_current_player
Remove "currentPlayer" from gamestate
2023-08-28 17:10:28 +04:00
Nordsoft91
6394a77270
Merge pull request #2683 from Laserlicht/zoom_dead_area
dead area for zooming
2023-08-28 17:09:15 +04:00
Nordsoft91
ffc4b989f0
Merge pull request #2679 from Laserlicht/smooth_scroll
Smooth scroll
2023-08-28 17:08:57 +04:00
Michael
3c1892a7d2
adjust timing 2023-08-28 10:03:50 +02:00
Michael
220145bd9b
reintroduce setting to zero while holding 2023-08-28 00:59:08 +02:00
Michael
9f51f42128
use fps in calculation 2023-08-28 00:49:32 +02:00
Michael
b61890355f
Update MapViewController.cpp 2023-08-27 23:17:47 +02:00
Dydzio
cba9ddd66a
Update client/battle/BattleActionsController.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-08-27 23:01:04 +02:00
Michael
1c89c71031
Update MapViewController.cpp 2023-08-27 22:55:05 +02:00
Michael
3ce9d022d5
try to remove glitch 2023-08-27 22:00:20 +02:00
Michael
da3014bd54
Haptic feedback and increased dead zone 2023-08-27 21:40:56 +02:00
Michael
3960e5aa32
Update client/mapView/MapView.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-08-27 20:55:37 +02:00
nordsoft
3e502955b3 Support FilledTexturePlayerColored in configurable interface 2023-08-27 22:34:02 +04:00
Dydzio
321c9c2ca6 Remove now unused enum 2023-08-27 20:18:19 +02:00
Dydzio
207a73b9de Fix mana drain not refreshing battle hero window mana 2023-08-27 18:58:07 +02:00
Dydzio
e1eb245565 Better default stack action handling + "F shortcut" mode fixes 2023-08-27 17:33:10 +02:00
Michael
f16b93c391
dead area for zoom 2023-08-27 14:00:40 +02:00
Michael
b77bccdc24
code review 2023-08-27 12:09:26 +02:00
Michael
d1d0d6d62e
fps independent 2023-08-27 02:35:10 +02:00
Michael
4137a66f2a
fix division by zero edge case 2023-08-27 00:53:09 +02:00
Ivan Savenko
ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
Michael
bbd69fd430
added setting 2023-08-27 00:33:52 +02:00
Michael
4eecca2d9a
code review 2023-08-27 00:22:29 +02:00
Michael
6b71820197
avoid some edge cases 2023-08-26 23:25:46 +02:00
Michael
a354a7f696
compatible with older sdl 2023-08-26 22:30:02 +02:00
Michael
cde22b3755
fix 2023-08-26 21:37:29 +02:00
Michael
e57e9e8e9f
ready draft 2023-08-26 21:29:24 +02:00
Michael
2286e0c7b1
implement speed and move 2023-08-26 21:13:33 +02:00
Michael
fe6d96f4a0
angle calc 2023-08-26 20:19:25 +02:00
Michael
bd0f9bb280
preparation 2023-08-26 19:53:36 +02:00
Ivan Savenko
edd029c79c Replace "currentPlayer" from gamestate with "activePlayers"
- Allows multiple active players at once, e.g. simturns
- Cleared up validation of netpacks by server, e.g. always check for
pack sender
2023-08-25 18:56:15 +03:00
Ivan Savenko
b61c9a9e35 Fix build 2023-08-25 13:46:42 +03:00
Ivan Savenko
e2718db791 Converted several enumerations into constants 2023-08-25 13:38:02 +03:00