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

5383 Commits

Author SHA1 Message Date
Ivan Savenko
5f4608c9f0 Fixed memory corruption on usage of radial wheel to reorder towns/heroes 2023-12-16 13:46:29 +02:00
Ivan Savenko
16e845e1c8 - Check for presence of AB files on startup 2023-12-16 13:46:29 +02:00
Ivan Savenko
a1f34e059a Fix possible crash on starting 2nd battle while intro sound from 1st one
is still playing
2023-12-13 19:35:02 +02:00
Ivan Savenko
873fd33e7a Workaround for mingw and armeabi Android build 2023-12-13 19:23:32 +02:00
Ivan Savenko
76cb5387c5 Access CHero in a way that will throw exception on invalid access
instead of crash
2023-12-13 16:50:56 +02:00
Ivan Savenko
0dce278a3b Attempt to fix crash on app exit on Android 2023-12-13 16:50:13 +02:00
Ivan Savenko
4fa33c8d2e
Merge pull request #3279 from Laserlicht/smooth_scroll_fix
smooth scroll fix and gui option to disable
2023-12-10 22:49:43 +02:00
Ivan Savenko
e44a8ebfd9
Merge pull request #3291 from Laserlicht/audio_mute_setting
audio mute on focus lost setting
2023-12-10 22:48:52 +02:00
Laserlicht
df2a5f05d8
audio mute on focus lost setting 2023-12-10 14:49:27 +01:00
Laserlicht
e74c2262c3
add option to gui to disable smooth dragging 2023-12-10 13:38:58 +01:00
Laserlicht
b8e40978a0
stop smooth scroll when using window borders to scroll 2023-12-09 17:29:57 +01:00
Ivan Savenko
902db091da Simple fix for slider activation when clicking on left/right buttons 2023-12-09 18:09:10 +02:00
Laserlicht
dfb10bdfcb
search rectangle 2023-12-08 22:52:34 +01:00
Laserlicht
95ff89f622 search spells 2023-12-08 22:46:05 +01:00
Ivan Savenko
edbe25b33a Updated layout and localizations 2023-12-07 16:36:44 +02:00
Ivan Savenko
861c53059e Added callbacks for preset dropdowns 2023-12-07 13:57:16 +02:00
Ivan Savenko
653304b004 Implemented accumulating timers, rename creature timer to unit timer 2023-12-07 13:57:16 +02:00
Ivan Savenko
1f0bcbc194 Added option to configure dropdown position 2023-12-07 13:57:16 +02:00
Ivan Savenko
0fd966818f Remove 'visible' property from images, replaced with enable/disabled
call
2023-12-07 13:57:16 +02:00
Ivan Savenko
3b3c4860b2 Avoid creation of new threads without mutex protection 2023-12-03 15:58:03 +02:00
Andrii Danylchenko
26b6d1cf74 NKAI: fix capturing shipyards 2023-12-02 14:03:54 +02:00
Ivan Savenko
be9c7f2099
Merge pull request #3239 from IvanSavenko/pathfinder_fixes
Pathfinder fixes
2023-12-02 12:20:44 +02:00
Ivan Savenko
d919cb0eac
Merge pull request #3240 from IvanSavenko/bugfixing
[1.4.0] Bugfixing for beta
2023-12-02 12:20:37 +02:00
Ivan Savenko
55ad903ffb
Merge pull request #3231 from dydzio0614/large-spellbook-setting
Split large spellbook from UI enhancements setting
2023-12-02 12:13:06 +02:00
Dydzio
fc035b1b55 Change large spellbook config section to gameTweaks 2023-11-28 22:30:50 +01:00
Ivan Savenko
ea8995e901 Fixed check for free slots when recruiting in towns 2023-11-28 16:25:11 +02:00
Ivan Savenko
42ad860850
Merge pull request #3230 from dydzio0614/connection-button-fix
Display disabled connect button on server autojoin
2023-11-28 12:37:18 +02:00
Ivan Savenko
a7c45d8ec8 Remove assert - confirmed to be legal scenario 2023-11-28 12:32:24 +02:00
Ivan Savenko
48907f5e8b
Merge pull request #3237 from IvanSavenko/regressions_fix
Fixes for unresolved regressions
2023-11-28 12:24:24 +02:00
Ivan Savenko
5df53f6ea2 Hota compatibility fix - allow stack selection border to have different
size than creature icon
2023-11-27 23:20:24 +02:00
Ivan Savenko
02f7193260 Fix regression from map translation - properly translate custom main
hero name
2023-11-27 20:27:10 +02:00
Ivan Savenko
b8a4091356 Fix regressions from timers - client may be destroyed while receiving
timer update or pack reply
2023-11-27 20:27:10 +02:00
Ivan Savenko
d5f8db2222 Fixed undefined behavior on accessing array with -1 index 2023-11-27 14:09:08 +02:00
Ivan Savenko
e21e3f8386 Do not display "Spell Cancelled" message on right-click when no stack is
active
2023-11-27 14:09:08 +02:00
Ivan Savenko
d06ae15c6e Fix teleporting animation 2023-11-27 14:08:49 +02:00
Ivan Savenko
344d8891e4 Fix display of creatures to sell in Freelancer Guild 2023-11-27 14:08:49 +02:00
Ivan Savenko
81a48f2d80 Do not attempt to resize text box to zero-width 2023-11-27 14:08:49 +02:00
Dydzio
a4d76b2529 Split large spellbook from UI enhancements setting 2023-11-26 19:16:53 +01:00
Dydzio
4b57b9f9a9 Display disabled connect button on server autojoin 2023-11-26 18:39:51 +01:00
Laserlicht
2eada0efca
allow shortcout if any town has a marketplace 2023-11-25 03:14:31 +01:00
Laserlicht
1954447a9e
fix image order 2023-11-25 02:58:06 +01:00
Ivan Savenko
e5e01ab35d Disable spectator mode in single player to avoid confusing players 2023-11-20 14:38:57 +02:00
Ivan Savenko
aaefc07182
Merge pull request #3198 from IvanSavenko/ai_optimize
AI optimizations
2023-11-20 14:06:25 +02:00
Ivan Savenko
07990644b5
Merge pull request #3191 from Laserlicht/touch-introduction
Touch introduction
2023-11-20 14:05:47 +02:00
Ivan Savenko
a3f9450d83 Relax UI locking to reduce delays in AI actions 2023-11-18 19:41:00 +02:00
Laserlicht
70b6906e6d
adjust messages, add radial wheel 2023-11-17 18:23:11 +01:00
Laserlicht
a6dd5c2887
translation 2023-11-16 23:03:41 +01:00
Laserlicht
1bf05d43a1
fix video implementation error; implement paging; video loading 2023-11-16 22:39:50 +01:00
Ivan Savenko
76956cfe3a
Merge pull request #3188 from IvanSavenko/remove_identifier_implicit_int_conversion2
Remove implicit conversion of identifier to integer
2023-11-16 17:26:32 +02:00
Ivan Savenko
de02507fff
Merge pull request #3193 from IvanSavenko/warn_mod_dependencies
Show message about mods that failed to load on opening main menu
2023-11-16 17:26:19 +02:00
Laserlicht
2cfbcd067b
videos 2023-11-16 02:58:43 +01:00
Ivan Savenko
d1a4e84255 Show message about mods that failed to load on opening main menu 2023-11-15 17:57:40 +02:00
Ivan Savenko
0705604129
Merge pull request #3185 from IvanSavenko/memleak_fix
Memory leak fixes
2023-11-15 16:00:38 +02:00
Ivan Savenko
52050d0ef1 Fix build 2023-11-15 15:55:19 +02:00
Ivan Savenko
6cb1f6ff11 Remove all remaining implicit conversion in lib 2023-11-15 15:55:19 +02:00
Ivan Savenko
13763cad8e Remove few more implicit conversions 2023-11-15 15:55:19 +02:00
Ivan Savenko
0842f5afee Removed remaining usages of std::vector<bool> 2023-11-15 15:55:18 +02:00
Ivan Savenko
a9f868b379
Merge pull request #3166 from IvanSavenko/simturns_ui
UI for Simturns
2023-11-15 14:10:57 +02:00
Ivan Savenko
060e1cef21
Merge pull request #3182 from Alexander-Wilms/fix-fps-counter
Move FPS counter to bottom left, set width of black background to suf…
2023-11-15 13:56:27 +02:00
Laserlicht
05efb12d82
format fix 2023-11-14 22:50:22 +01:00
Laserlicht
cb92778e00
add ui 2023-11-14 22:39:11 +01:00
Laserlicht
f7a31865f3
basic touch introduction implementation 2023-11-14 21:52:30 +01:00
Ivan Savenko
f65f4b1285 Disable new UI if enhancements are off 2023-11-13 19:49:41 +02:00
Ivan Savenko
d1ae5bbee5 Implement AI simturns checkbox 2023-11-13 19:06:56 +02:00
Ivan Savenko
c5eeaa6526 Added non-linear slider for better simturn duration selection 2023-11-13 19:06:56 +02:00
Ivan Savenko
7d54f6a9c0 Implemented basic support for plural forms in translations 2023-11-13 19:06:56 +02:00
Ivan Savenko
e160b8557b Implement min/max simturns callbacks 2023-11-13 19:06:56 +02:00
Ivan Savenko
32633d5f52 Initial version of Turn Options tab screen 2023-11-13 19:06:56 +02:00
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