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

5415 Commits

Author SHA1 Message Date
Ivan Savenko
3268ebe27c Moved some code from OptionTab to separate class, OptionTabBase 2023-11-13 19:06:56 +02:00
Ivan Savenko
301ac2457a Cleanup 2023-11-13 17:48:55 +02:00
Ivan Savenko
af0afb251e Correctly shutdown client media handlers 2023-11-13 16:27:15 +02:00
Ivan Savenko
a6f37b7cd7 Fixed few more memory leaks in client 2023-11-13 16:27:15 +02:00
Ivan Savenko
20ef3a69e7 Fix most of memleaks discovered by valgrind 2023-11-13 16:27:15 +02:00
Ivan Savenko
1192dbff15
Merge pull request #3180 from IvanSavenko/bugfixing
Fixes for miscellaneous accumulated issues
2023-11-13 16:26:33 +02:00
Alexander Wilms
c0c16fed75 Move FPS counter to bottom left, set width of black background to suffice for 3 digit FPS
Fixes #3171
2023-11-13 02:52:19 +01:00
Ivan Savenko
c6f9434c8e
Merge pull request #3170 from gamestales/gamestales/2903-morale-description-1442
#2903-morale-description-#1442
2023-11-13 01:53:29 +02:00
Ivan Savenko
b86060d729
Merge pull request #3169 from Alexander-Wilms/intro-clear-screen
CVideoHandler.cpp: Clear screen before rendering each frame of the intro
2023-11-12 19:38:02 +02:00
Ivan Savenko
bc51d9c772
Merge pull request #3161 from SoundSSGood/art-swap-optimization
Artifacts swap optimization
2023-11-12 19:37:25 +02:00
Ivan Savenko
833051cced Display exit confirmation dialog on Alt-F4 2023-11-12 17:35:43 +02:00
Ivan Savenko
59806bf112 Fix right-click tooltips for starting hero/towns 2023-11-12 17:17:07 +02:00
Ivan Savenko
07472d3b05
Merge pull request #3147 from IvanSavenko/serialization_refactor
Serialization refactor - remove VLC from saved games
2023-11-11 17:35:01 +02:00
Ivan Savenko
5c810df36f Reorganized types registration code 2023-11-11 00:39:08 +02:00
gamestales-com
a574f18e69 #2903-morale-description-#1442 2023-11-10 15:58:19 +01:00
Alexander Wilms
eee1a4d061 CVideoHandler.cpp: Clear screen before rendering each frame of the intro
This way, the background is black instead of showing glitchy artifacts when one resizes the window
2023-11-10 03:37:42 +01:00
Ivan Savenko
359af84d59 Fix crash on starting battle in MP 2023-11-09 01:22:09 +02:00
Ivan Savenko
864462b84a Reduce excessive updates of garrisons. Fixes selection reset in simturns 2023-11-09 00:01:48 +02:00
Ivan Savenko
4a7fa9bf8c Simplified CTypeList class 2023-11-08 22:05:36 +02:00
SoundSSGood
57e3abc548 ask assemble regression fixed 2023-11-08 21:59:55 +02:00
SoundSSGood
ce3d407396 artifacts swap optimization 2023-11-08 21:58:48 +02:00
Ivan Savenko
eb167d94a6 Mod compatibility check is now in a separate class and not part of
ModHandler
2023-11-08 21:27:05 +02:00
Ivan Savenko
6b81012f31 Use variant identifier in netpacks where applicable 2023-11-08 14:00:23 +02:00
Ivan Savenko
0b4fa20bdc
Merge pull request #3152 from SoundSSGood/CAltar-widget
Altar rework
2023-11-08 13:42:00 +02:00
SoundSSGood
41ee52d9d4 fix build & suggested changed 2023-11-08 01:51:13 +02:00
Ivan Savenko
86a3806bec MetaString refactor to eliminate integer usage for identifiers
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
2023-11-07 22:47:10 +02:00
Ivan Savenko
f4feaea177
Merge pull request #3141 from IvanSavenko/better_tooltips
Better tooltips
2023-11-07 22:46:02 +02:00
Tomasz Zieliński
c909bd766e Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
#	lib/rmg/CMapGenOptions.cpp
#	lib/rmg/CMapGenOptions.h
2023-11-07 20:54:04 +01:00
Ivan Savenko
f039b20653 Improvement for wandering monster tooltip/hover text:
- show Visions information only on right-click (H3 logic)
- show threat level only on right-click and only if UI tweaks are on
2023-11-06 20:37:07 +02:00
SoundSSGood
539b2e596d adjusting the placement of artifact slots 2023-11-06 14:31:32 +02:00
SoundSSGood
75ebd954af Creatures altar & Artifacts altar 2023-11-06 14:31:32 +02:00
SoundSSGood
9f9317a8a0 CTradeBase initial commit 2023-11-06 14:31:31 +02:00
SoundSSGood
fbe3e0fe12 CArtPlace preparation 2023-11-06 14:01:13 +02:00
Andrii Danylchenko
0927d3e3e8
Merge pull request #3145 from vcmi/fix-3142
#3142 - fi custom campaign selection screen
2023-11-05 11:12:58 +02:00
Andrii Danylchenko
060079cfc6
Merge pull request #3146 from vcmi/fix-3006
#3006 - fix starting move from teleport
2023-11-05 11:12:41 +02:00
Ivan Savenko
8dc5837395
Merge pull request #3144 from IvanSavenko/remove_identifier_implicit_int_conversion
Remove (some of) implicit conversions of Identifier to integer
2023-11-04 19:36:11 +02:00
Ivan Savenko
5487f07d3b added toEntity overload that accepts generic Services class 2023-11-04 17:04:53 +02:00
Andrii Danylchenko
91c04f4718 #3006 - fix starting move from teleport 2023-11-04 15:43:08 +02:00
Andrii Danylchenko
d50ebd7d58 #3142 - fi custom campaign selection screen 2023-11-04 14:34:18 +02:00
Andrii Danylchenko
a8cc5e1d60
Merge pull request #3140 from vcmi/fix-3003
#3003 - fix hypnotize
2023-11-04 10:50:58 +02:00
Ivan Savenko
184f5a72cc Use toEntity/toXXX methods in Identifier instead VLC objects access 2023-11-03 16:03:29 +02:00
Ivan Savenko
8d5fa41a19 Minor fixes 2023-11-03 16:03:29 +02:00
Ivan Savenko
87f6c7354b
Merge pull request #3139 from IvanSavenko/component_variant_identifier
Refactoring of Component class
2023-11-03 15:52:07 +02:00
Ivan Savenko
4a24da3804
Merge pull request #3114 from Laserlicht/fix-highscore
fix high scores screen
2023-11-03 15:51:37 +02:00
Ivan Savenko
7a254dd55f
Merge pull request #3135 from IvanSavenko/file_corruption_check
Ignore corrupted .def files
2023-11-03 15:49:43 +02:00
Andrii Danylchenko
3b27e07385 #3003 - fix hypnotize 2023-11-03 13:50:16 +02:00
Ivan Savenko
056ef00f74 Bugfixing 2023-11-02 13:52:58 +02:00
Ivan Savenko
10e50548e7 Converted Component class to use VariantIdentifier instead of int 2023-11-02 12:00:04 +02:00
Ivan Savenko
0376873cb3
Merge pull request #3125 from IvanSavenko/reduce_subid_usage
Reduce usage of CGObjectInstance::subID
2023-11-02 11:58:01 +02:00
Andrii Danylchenko
5cd16e5b27
Merge pull request #3124 from vcmi/fix-2977
#2977 - fix obstackle path deserialization
2023-11-01 15:27:14 +02:00
Ivan Savenko
8346d71c98 Remove more subID access 2023-11-01 14:44:05 +02:00
Ivan Savenko
7107b3202f
Merge pull request #3069 from SoundSSGood/artifact-location-id
ArtifactLocation now use ID for artHolder identification
2023-11-01 14:41:36 +02:00
Laserlicht
8a9f10ec3a
fix asset failures 2023-10-31 22:05:22 +01:00
Ivan Savenko
858ba22a27 Ignore corrupted .def files 2023-10-31 12:11:41 +02:00
Tomasz Zieliński
6e7b68d0e6 Unused variable, unused code 2023-10-30 21:33:49 +01:00
Tomasz Zieliński
e105b23a37 Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
#	Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
#	Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
#	client/lobby/RandomMapTab.cpp
2023-10-30 20:08:13 +01:00
Tomasz Zieliński
f39edf9413 Update ally and enemy flags when selecting new template 2023-10-30 07:48:51 +01:00
Tomasz Zieliński
4f2cde018c Fixed most of reported issues, removed unused code. 2023-10-29 21:25:39 +01:00
SoundSSGood
c2f658d638 Bulk move artifacts. id 2023-10-29 17:46:13 +02:00
SoundSSGood
3c5527a222 ArtifactLocation now use ID for artHolder identification part3 2023-10-29 17:46:13 +02:00
SoundSSGood
ab2f6abb87 ArtifactLocation now use ID for artHolder identification part2 2023-10-29 17:46:13 +02:00
SoundSSGood
61fc236d79 ArtifactLocation now use ID for artHolder identification part1 2023-10-29 17:46:13 +02:00
Andrii Danylchenko
73b89d4e84 #2977 - fix obstackle path deserialization 2023-10-29 16:07:00 +02:00
Alexander Wilms
5cbc75d3b7 Merge remote-tracking branch 'upstream/develop' into develop 2023-10-29 13:35:37 +00:00
Alexander Wilms
e677164ed0 client/widgets/Buttons.h: Fix const reference
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2023-10-29 13:34:19 +00:00
Alexander Wilms
5d7b83c10b client/widgets/Buttons.cpp: Fix const reference
Co-authored-by: Andrey Filipenkov <kambaladecapitator@gmail.com>
2023-10-29 13:34:19 +00:00
Alexander Wilms
466cdb9d2b client/widgetsImages.{h,cpp}: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') 2023-10-29 13:34:19 +00:00
Alexander Wilms
f1bb6b999c client/widgets/Buttons.{h,cpp}: Pass expensive to copy object "callback" by reference to const. 2023-10-29 13:33:57 +00:00
Ivan Savenko
0169c65937
Merge pull request #3100 from IvanSavenko/split_net_packs
Split netpacks.h into multiple files
2023-10-29 13:46:40 +02:00
Tomasz Zieliński
368a185008 Cleaning up the code 2023-10-29 10:05:24 +01:00
Alexander Wilms
e4db6f2af8 CClient::removeGUI(): This function should be declared 'const' 2023-10-28 23:05:05 +00:00
Tomasz Zieliński
07dac8b6d4 Works more or less 2023-10-28 20:30:38 +02:00
Alexander Wilms
bb04ca46b5 client/NetPacksClient.cpp: Combine null pointer checks
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-27 23:43:39 +00:00
Alexander Wilms
92bab6dd08 client/NetPacksClient.cpp: Combine null pointer checks
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-27 23:43:39 +00:00
Alexander Wilms
d2c03773cd client/NetpacksClient.cpp: Called C++ object pointer is null
Null pointers should not be dereferenced
2023-10-27 23:43:39 +00:00
Alexander Wilms
ead1140b9b client/icons/generate_icns.py: Replace print statement by built-in function.
The "print" statement should not be used
2023-10-27 23:34:11 +00:00
Alexander Wilms
10ad5b6789 client/windows/CCastleInterface.cpp: Identical sub-expressions on both sides of operator "&&".
Identical expressions should not be used on both sides of a binary operator
2023-10-27 18:19:17 +00:00
Alexander Wilms
f01ec55d21 Use the "nullptr" literal.
"nullptr" should be used to denote the null pointer
2023-10-27 18:18:59 +00:00
Laserlicht
c1707bcc71
fix datatype 2023-10-27 18:52:25 +02:00
Alexander Wilms
3616235bb5 FramerateManager.cpp: Merge this "if" statement with the enclosing one.
Collapsible "if" statements should be merged
2023-10-27 14:30:04 +00:00
Nordsoft91
8f2b50a5e2
Merge pull request #3095 from Laserlicht/team_alignment
fix team alignments
2023-10-26 23:19:18 +02:00
Tomasz Zieliński
a817e481d0 Merge fix 2023-10-26 10:46:04 +02:00
Tomasz Zieliński
36911d1e0a Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
#	client/lobby/RandomMapTab.cpp
2023-10-26 10:31:41 +02:00
Laserlicht
e28d14d16d
not needed anymore 2023-10-24 18:56:30 +02:00
Laserlicht
abb279f5b4
use config 2023-10-24 18:51:58 +02:00
Ivan Savenko
5523f05284 Moved ArtifactLocation to a separate file 2023-10-23 19:02:28 +03:00
Ivan Savenko
b88a8da4e8 Split off some netpack structures into separate files 2023-10-23 13:59:15 +03: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
a70ad7202f
Merge pull request #3088 from Laserlicht/non_squared
Minimap keep aspect ratio (Letterboxing)
2023-10-22 16:55:58 +03:00
Ivan Savenko
ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
Ivan Savenko
80e6485965 MetaIdentifier now uses std::variant internally 2023-10-22 16:55:19 +03:00
Ivan Savenko
b394158dc9 Bonus Source ID now uses metaidentifier 2023-10-22 16:55:18 +03:00
Ivan Savenko
77facf9387 Implement missing functions, fixes linking errors 2023-10-22 16:54:56 +03:00
Ivan Savenko
454ba44ac5
Merge pull request #2988 from IvanSavenko/configurable_extensions
Extension of configurable object functionality
2023-10-22 16:24:47 +03:00
Laserlicht
b67548e7cf
format 2023-10-22 15:06:12 +02:00
Laserlicht
7b370d1967
fix team alignments 2023-10-22 15:00:04 +02:00
Ivan Savenko
8752551786
Merge pull request #3086 from Laserlicht/show_random
show random maps
2023-10-22 12:29:31 +03:00
Ivan Savenko
acc8e9db32
Merge pull request #3082 from SoundSSGood/crash-hotfix
Сrash fixed  and little optimization
2023-10-22 12:01:28 +03:00
Ivan Savenko
07cd894024
Merge pull request #3090 from Laserlicht/fix_town_selection
[fix] no town selection on loadscreen
2023-10-22 12:01:00 +03:00
Laserlicht
0b0082eebc
format 2023-10-22 00:22:49 +02:00
Laserlicht
ab59c153b3
fix 2023-10-22 00:22:16 +02:00
Laserlicht
05a9f0fe39
move to EventReceiver 2023-10-22 00:05:14 +02:00
Laserlicht
6939989026
try to fix 2023-10-21 23:37:59 +02:00
Laserlicht
a042cc46c2
no town selection on loadscreen 2023-10-21 19:10:02 +02:00
Laserlicht
d215ffa011
optics 2023-10-21 18:45:45 +02:00
Laserlicht
737525756f
fix redraw 2023-10-21 17:28:23 +02:00
Laserlicht
e03f2a9d3a
improvements for non quadratic maps 2023-10-21 16:49:50 +02:00
Laserlicht
86e6f7d156
fix 2023-10-21 02:26:03 +02:00
Laserlicht
ceb70af528
fix 2023-10-21 02:22:22 +02:00
Laserlicht
9a116f9b20
small optimisation 2023-10-21 02:16:42 +02:00
Laserlicht
0eba0ee686
show random maps 2023-10-21 02:12:34 +02:00
Nordsoft91
f3acc939b9
Merge pull request #3062 from Laserlicht/sort_towns
sort town/hero feature
2023-10-20 22:51:26 +02:00
Nordsoft91
12b179ef1f
Merge pull request #3057 from Laserlicht/rw_hero 2023-10-20 01:42:06 +02:00
SoundSSGood
068a7d5d4a crash fixed 2023-10-20 01:11:10 +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
Ivan Savenko
e0f6b582f5 Display object description only on right-click 2023-10-19 14:36:11 +03:00
Ivan Savenko
0f2922d064 Only show components if UI enhancements is on 2023-10-19 13:33:49 +03:00
Ivan Savenko
d295840c64
Merge pull request #3075 from josch/spelling
some spelling fixes
2023-10-19 11:15:25 +03:00
Johannes Schauer Marin Rodrigues
f9e1b302c7
some spelling fixes 2023-10-18 01:41:02 +02:00
Alexandre Detiste
15e45f966c typos found by lintian 2023-10-17 22:06:08 +02:00
Laserlicht
2fcbf78e4e
unused var 2023-10-17 21:22:27 +02:00
Laserlicht
464c65a595
fix 2023-10-17 21:17:57 +02:00
Laserlicht
e05102192b
heroes and more buttons 2023-10-17 21:13:08 +02:00
Laserlicht
464577be28
new icons 2023-10-17 20:06:35 +02:00
Ivan Savenko
927ce4e60e Improvements to rewardable objects popups 2023-10-16 23:55:37 +03:00
Nordsoft91
1ffc246c8b
Merge pull request #3051 from Laserlicht/name_change
possibility to change name in lobby
2023-10-16 22:28:31 +02:00
Laserlicht
be6ed36422
fix 2023-10-16 21:35:29 +02:00
Laserlicht
ecd093cae4
fix 2023-10-16 21:28:44 +02:00
Laserlicht
0a1578b797
Apply suggestions from code review
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-16 21:24:59 +02:00
Laserlicht
d5b16ac96c
rename 2023-10-16 01:43:50 +02:00
Laserlicht
f3262a47c0
Update client/adventureMap/CList.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-16 01:42:01 +02:00
Laserlicht
f6843c0574
fix focus problem 2023-10-16 01:39:53 +02:00
Laserlicht
aeb559efb8
code review 2023-10-16 00:04:29 +02:00
Nordsoft91
ee997a291c
Merge pull request #3045 from Laserlicht/interface_improvement
various interface shortcuts
2023-10-15 23:48:22 +02:00
Ivan Savenko
dd841bdaa7 Use enum instead of mix of bool's and int's for tile reveal 2023-10-16 00:12:38 +03:00
Ivan Savenko
98fd939ed6 Cartographer/Observatory is now configurable object 2023-10-16 00:12:38 +03:00
Laserlicht
4528f42cdf
fix segmentation fault; update townlist on adventuremap 2023-10-15 15:53:19 +02:00
Laserlicht
3b853bff08
sort town feature 2023-10-15 14:31:33 +02:00
Laserlicht
efcf6b71d7
formatting 2023-10-15 12:58:07 +02:00
Laserlicht
dd0033296f
docs 2023-10-15 12:28:13 +02:00
Laserlicht
5ae646bd15
Update client/windows/GUIClasses.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2023-10-15 12:19:44 +02:00
Laserlicht
23e1b0b0d5
radial wheel for hero 2023-10-15 02:43:42 +02:00
Laserlicht
78026f40eb
name opens town itself 2023-10-15 00:41:17 +02:00
Laserlicht
f6071ed181
fix 2023-10-15 00:09:32 +02:00
Laserlicht
c96cc405ed
town now updates 2023-10-14 23:41:12 +02:00
nordsoft
c8452355ce Revert "Merge pull request #2959 from Alexander-Wilms/faster-server-connection"
This reverts commit 43636af2e4, reversing
changes made to aed2e360ba.

# Conflicts:
#	client/CServerHandler.cpp
2023-10-14 22:52:24 +02:00
Nordsoft91
aa25ab6488
Merge pull request #3035 from Nordsoft91/quests
Quests rework
2023-10-14 21:38:15 +02:00
Laserlicht
b2396a61fa
code review 2023-10-14 13:34:39 +02:00
Laserlicht
7217992898
code review 2023-10-14 12:08:38 +02:00
Laserlicht
b89cdda718
Tavern also in infobox & haptics 2023-10-13 23:36:51 +02:00
Laserlicht
0c6b1ca3c8
possibility to change name 2023-10-13 23:04:35 +02:00
Laserlicht
5a84e7cd7f Update client/windows/GUIClasses.cpp
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2023-10-13 19:56:56 +02:00
Laserlicht
08832eeeb4 fix 2023-10-13 19:56:56 +02:00
Laserlicht
3c117da4eb fix tavern 2023-10-13 19:56:56 +02:00
Laserlicht
9e508fe2c2 interface improvements 2023-10-13 19:56:56 +02:00
Nordsoft91
802e1bb961
Merge pull request #3042 from Laserlicht/crash_preview
[fix] crash with custom campaign preview
2023-10-13 10:57:02 +02:00
Nordsoft91
093c8149e5
Merge pull request #3040 from Laserlicht/infobox_next 2023-10-13 10:38:32 +02:00
Nordsoft91
ab36692847
Merge pull request #3037 from Laserlicht/missing_res 2023-10-13 10:36:33 +02:00
nordsoft
fadf086e61 Fix review comments 2023-10-12 13:30:01 +02:00
Nordsoft91
4ae123e2a1
Merge pull request #3038 from Alexander-Wilms/connection-error-window
Show info dialog when connection to multiplayer server fails
2023-10-12 00:16:04 +02:00
nordsoft
7ccd4cdcb2 Refactor quests progress 2023-10-11 21:10:42 +02:00
Nordsoft91
ecd01fd53c
Merge pull request #3039 from Laserlicht/townhall_click 2023-10-11 18:43:59 +02:00
Laserlicht
abab917ef9
fix crash with custom campaign preview 2023-10-11 11:23:38 +02:00
Laserlicht
f9db3d131f
lastActivated with overload 2023-10-10 23:51:05 +02:00
nordsoft
bb238f9b72 New quests work 2023-10-10 23:44:29 +02:00
Nordsoft91
773fb965ba
Merge pull request #3028 from Nordsoft91/fixes
Fix campaign advance crash
2023-10-10 23:41:52 +02:00
Nordsoft91
25952f8223
Merge pull request #3027 from Nordsoft91/turn-timer
Add game pause
2023-10-10 23:41:36 +02:00
Laserlicht
8a3e58cd5e
red is the most liked color 2023-10-10 23:15:40 +02:00
Laserlicht
53ee843e7e
fixes problem with radial menu 2023-10-10 22:33:22 +02:00
Laserlicht
890c4ac19d
quick army managment click next 2023-10-10 22:11:06 +02:00
Laserlicht
926bf71814
make townhall clickable 2023-10-10 21:02:40 +02:00
Alexander Wilms
7c627d8163 Show info dialog when connection to multiplayer server fails 2023-10-10 18:11:11 +02:00
Ivan Savenko
e247c29269
Merge pull request #3021 from Laserlicht/video
video loop fix and missing videos/sounds for battle result
2023-10-10 18:48:19 +03:00
Nordsoft91
b6da60b105
Merge pull request #3023 from Laserlicht/video_audio
audio from SMK video file
2023-10-10 00:40:33 +02:00
Laserlicht
25f7bb40d0
new layout 2023-10-09 22:50:07 +02:00
Laserlicht
19788c6399
suggestion 2023-10-09 22:22:10 +02:00
Laserlicht
fa9d5e9971
show missing resources 2023-10-09 21:43:43 +02:00
Laserlicht
7ef9e91741
new approach 2023-10-08 21:19:04 +02:00
Laserlicht
89a39fcfc0
code review 2023-10-08 20:27:56 +02:00
nordsoft
fe7c01cd37 Fix 3024 2023-10-08 17:46:47 +02:00
Nordsoft91
43636af2e4
Merge pull request #2959 from Alexander-Wilms/faster-server-connection
Sleep for 10 ms instead of 1000 ms while waiting for server connection
2023-10-08 17:21:57 +02:00
Nordsoft91
aed2e360ba
Merge pull request #2997 from Alexander-Wilms/fix-ios-pch
Enable ccache for iOS and MSVC builds
2023-10-08 16:10:07 +02:00
nordsoft
d7d435dcb7 Add game pause 2023-10-08 16:03:57 +02:00
Laserlicht
a1f6e49f87
vcmi always uses only 2 channels 2023-10-08 14:09:07 +02:00
Laserlicht
639b6c6577 version 2023-10-08 12:49:59 +02:00
Laserlicht
66ff603456 remove crackle 2023-10-08 12:49:59 +02:00
Laserlicht
39e06ea5e1 fix error message 2023-10-08 12:49:59 +02:00
Laserlicht
3c647334b0 remove other pr 2023-10-08 12:49:59 +02:00
Laserlicht
be2b3afe48 implements sounds 2023-10-08 12:49:59 +02:00
Laserlicht
2bbce0f38b decoding working 2023-10-08 12:49:59 +02:00
Laserlicht
8de4b88a1b basically playing 2023-10-08 12:49:59 +02:00
Laserlicht
628de69a63 audio 2023-10-08 12:49:59 +02:00
Laserlicht
63fbaa8380 support raw audio 2023-10-08 12:49:59 +02:00
Nordsoft91
088ce9b948
Merge pull request #3013 from Nordsoft91/turn-timer 2023-10-08 12:11:44 +02:00
Laserlicht
42bf5fdd58
video fix 2023-10-07 14:31:49 +02:00
Alexander Wilms
732c39fcc6 Fix build 2023-10-07 00:08:22 +02:00
Alexander Wilms
c8f1512a3f Use correct address to decide whether we're connecting to a remote server or a local one 2023-10-06 23:33:51 +02:00
nordsoft
9b54b25a6c Show timer only for one player 2023-10-06 18:17:05 +02:00
nordsoft
a09c595cf4 Support simturn timers 2023-10-06 18:17:05 +02:00
nordsoft
043f54698b Fix translations in map editor / fix crash on game end 2023-10-05 23:34:29 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor
Improvements to type safety of Identifier class
2023-10-05 00:33:07 +03:00
Ivan Savenko
179def179f
Merge pull request #2969 from IvanSavenko/tavern_query
Add query for Tavern, Dwelling and Market visits
2023-10-04 22:34:45 +03:00
Ivan Savenko
56d5c74a61
Merge pull request #2996 from Nordsoft91/fix-2992
Capture key event in chat box
2023-10-04 19:59:06 +03:00
Ivan Savenko
037efdf5fc Improvements to type safety of Identifier class
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
2023-10-04 18:05:23 +03:00
Ivan Savenko
39a92cdde3 Add query for dwellings dialog 2023-10-04 17:47:12 +03:00
Ivan Savenko
898733eed7 Added Query to track visit duration for Taverns and Markets 2023-10-04 17:47:12 +03:00
Ivan Savenko
e322d0a084
Merge pull request #2966 from IvanSavenko/simplify_ui_lock
Simplified locking of game UI state
2023-10-04 16:50:23 +03:00
Alexander Wilms
b58cca7770 100 connection attempts is not always enough 2023-10-03 22:06:32 +02:00
Alexander Wilms
a66d8ecb8f Use ui16 instead of uint for connectionAttemptCount to fix MinGW build 2023-10-03 22:06:32 +02:00
Alexander Wilms
e1401d26c5 hostAddress can be localhost, return from justConnectToServer() is maximum number of attempts is exceeded 2023-10-03 22:06:32 +02:00
Alexander Wilms
39427d6658 Use different delay and maximum number of connection attempts for local and remote servers 2023-10-03 22:06:32 +02:00
Alexander Wilms
9f9930a9dd CServerHandler::justConnectToServer(): Read settings only once 2023-10-03 22:06:32 +02:00
Alexander Wilms
614d000376 Sleep for 10 ms instead of 1000 ms while waiting for server connection 2023-10-03 22:06:32 +02:00
Laserlicht
ec8580b99e
Merge branch 'develop' into patch-4map_overview_rework 2023-10-02 21:03:16 +02:00
Nordsoft91
4620d2c96d
Merge pull request #2980 from Nordsoft91/proxy-reconnect
Allow to reconnect to proxy server
2023-10-02 20:42:11 +02:00
Nordsoft91
c57d5545c2
Merge pull request #2971 from Nordsoft91/translations
Multi-language support for network game and for VMAPs
2023-10-02 20:41:42 +02:00
Laserlicht
12ca3ea0ec
pos from texture 2023-10-01 19:44:04 +02:00
Alexander Wilms
46d785c371 Fix iOS build with ENABLE_PCH=OFF
https://github.com/vcmi/vcmi/issues/2991#issuecomment-1742066891

Fixes #2991
2023-10-01 18:16:41 +02:00
Laserlicht
cbd014ac88
code review 2023-10-01 17:35:56 +02:00
Ivan Savenko
b21a361b99
Merge pull request #2814 from SoundSSGood/arts-counter-impovements
Artifacts counter impovements
2023-10-01 17:53:51 +03:00
nordsoft
213d0c3553 Capture events in chat box 2023-10-01 16:40:26 +02:00
Nordsoft91
d695d87b99
Merge pull request #2964 from kambala-decapitator/fix-docs
improve layout of developer docs
2023-10-01 14:08:38 +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
Laserlicht
23b8a321f6
file ending 2023-10-01 00:46:29 +02:00
Laserlicht
648a37310f
description 2023-10-01 00:35:11 +02:00
Laserlicht
65c21064b5
added var 2023-10-01 00:18:25 +02:00
Laserlicht
58dfc55ca3
only calc minimaps once 2023-09-30 23:50:27 +02:00
Laserlicht
61aae7bccc
code review 2023-09-30 22:49:22 +02:00
Laserlicht
73a05d82e1
fix 2023-09-30 20:18:12 +02:00
Laserlicht
8b835c9253
load game support 2023-09-30 20:03:33 +02:00
Laserlicht
c6adcc40f5
add date; cleanup 2023-09-30 17:56:51 +02:00
Laserlicht
79e66c38df
layout 2023-09-30 17:14:22 +02:00
Laserlicht
718bafc8af
map overview rework 2023-09-30 15:05:12 +02:00
nordsoft
f3fa0f8652 Allow to reconnect to proxy server 2023-09-29 19:49:18 +02:00
Laserlicht
293214bb61
height fix 2023-09-29 00:08:25 +02:00
Ivan Savenko
9ba1aa652d
Merge pull request #2967 from IvanSavenko/bugfixing
Miscellaneous bugfixing
2023-09-28 12:11:51 +03:00
nordsoft
6da605ff83 Campaign meta strings 2023-09-28 00:10:28 +02:00
nordsoft
5b97c323d3 Rename hero strings to text id 2023-09-28 00:04:05 +02:00
nordsoft
0ac893b80f Rumors meta string 2023-09-27 23:22:45 +02:00
nordsoft
03c099d4fd First steps 2023-09-27 22:53:13 +02:00
Ivan Savenko
71ad9d6707 Fix crash on starting map as non-red player 2023-09-27 21:23:54 +03:00
Ivan Savenko
03a939fd52 Remove redundant thread name - this method is not thread entry point 2023-09-27 19:13:26 +03:00
Ivan Savenko
195320dcf2 Removed remaining references to 'pim' name 2023-09-27 18:50:01 +03:00
Ivan Savenko
0dcfd6e65c Removed optional locking in waitWhileDialog method 2023-09-27 18:44:08 +03:00
Ivan Savenko
d6b9fa8fbd Replaced CPlayerInterface::pim with CGuiHandler::interfaceLock
- Removed CPlayerInterface::pim since this lock does not actually
protects LOCPLINT but rather entire game UI state
- added more logical CGuiHandler::interfaceLock
- interface lock is now non-recursive and is locked only once by initial
caller that want to access GUI
2023-09-27 18:33:52 +03:00
Ivan Savenko
c330998518 Fix freeze on moving through teleporters without set path 2023-09-27 17:17:06 +03:00
Alexander Wilms
f52562eeb7 Fix freezing of hero and long enemy turns without sleeping in FramerateManager::framerateDelay() 2023-09-27 16:09:52 +02:00
Ivan Savenko
97097c20ad
Merge pull request #2874 from SoundSSGood/exchange-window-update
Exchange window update
2023-09-27 15:50:52 +03:00
Ivan Savenko
71a1ed816a
Merge pull request #2892 from Laserlicht/highscore_menu
Highscore Menu & end video
2023-09-27 15:48:47 +03:00