1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-14 10:12:59 +02:00
Commit Graph

6507 Commits

Author SHA1 Message Date
Ivan Savenko
4171026035 First iteration of upscaled rendering 2024-08-17 15:25:25 +00:00
Ivan Savenko
7f5cd8a7aa newSurface method now accepts Point instead of two integers 2024-08-17 15:25:25 +00:00
Ivan Savenko
20ba63bba3 Added xBRZ 1.8 library to source code 2024-08-17 15:25:25 +00:00
Laserlicht
0c836e0797 code review 2024-08-17 12:25:16 +02:00
Laserlicht
f7e01eaf67 sonarcloud 2024-08-16 00:03:45 +02:00
Laserlicht
00692888df sonar cloud fixes 2024-08-15 23:09:04 +02:00
Laserlicht
ba77107e71 fix some sonar cloud issues 2024-08-15 21:48:35 +02:00
Simeon Manolov
be58f61c35
fix indentation 2024-08-15 10:19:20 +03:00
Laserlicht
4796f46c24 fix defeat icon 2024-08-15 00:53:38 +02:00
Laserlicht
5743f151a1 icon drawing 2024-08-15 00:21:02 +02:00
Simeon Manolov
9b655ac43e
ios fix attempt 2024-08-15 00:27:18 +03:00
Laserlicht
b693ce120a code review 2024-08-14 22:36:54 +02:00
Laserlicht
a42afa2910 code review 2024-08-14 21:51:08 +02:00
Laserlicht
e1fdac42fd code review 2024-08-14 21:50:53 +02:00
Laserlicht
3551470919 adjusted texts 2024-08-14 21:15:18 +02:00
Laserlicht
39aaa6fe32 data to clipboard; simplify types 2024-08-14 21:01:37 +02:00
Laserlicht
81b1704e39
Merge branch 'vcmi:develop' into extended_statistic 2024-08-14 20:32:47 +02:00
Laserlicht
df8e491b72 prepare icons 2024-08-14 21:11:57 +02:00
Laserlicht
ec2163b974 add val; stat at end turn; events 2024-08-14 19:24:40 +02:00
Simeon Manolov
6767f90066
move ios/ folder 2024-08-14 19:55:22 +03:00
Simeon Manolov
bc162f514e
fix invalid file ref 2024-08-14 19:41:44 +03:00
Simeon Manolov
f2cddaa21b
Split vcmiclient in two
Similar to vcmiserver (app) and vcmiservercommon (lib), now
there is vcmiclient (app) and vcmiclientcommon (lib).
2024-08-14 19:20:01 +03:00
Ivan Savenko
49c5f650f7
Merge pull request #4437 from IvanSavenko/battle_sides
Unified handling of battle sides ID's
2024-08-14 18:37:05 +03:00
Ivan Savenko
5c7c4a7810
Merge pull request #4443 from IvanSavenko/fix_sonar
Fix miscellaneous issues discovered by Sonar
2024-08-14 17:12:27 +03:00
Ivan Savenko
89dca5061d
Merge pull request #4384 from Laserlicht/shortcut
add shortcut for list item ordering
2024-08-14 17:04:45 +03:00
Ivan Savenko
38311244a4
Merge pull request #4402 from Laserlicht/8th_creature
support for 8th creature (Factory)
2024-08-14 17:04:32 +03:00
Laserlicht
e83a30ea11 darkened; added values 2024-08-14 02:49:54 +02:00
Laserlicht
70bb918872 added values 2024-08-14 01:38:18 +02:00
Laserlicht
4b042aa153 table fill 2024-08-14 01:06:29 +02:00
Laserlicht
504aec3b52 statistic selection 2024-08-13 23:32:12 +02:00
Laserlicht
795a9e131f resource selection 2024-08-13 22:40:37 +02:00
Laserlicht
fac0450256 selectionwindow 2024-08-13 22:07:09 +02:00
Laserlicht
4f8b965b36 selection 2024-08-13 21:30:54 +02:00
Laserlicht
6e6ca16d4e gui stuff 2024-08-13 20:41:55 +02:00
Laserlicht
3bf377984a
fix 2024-08-13 01:07:55 +02:00
Laserlicht
cac778ffed fix 2024-08-13 00:50:10 +02:00
Laserlicht
9e9a6f1c5f
Merge branch 'develop' into extended_statistic 2024-08-13 00:49:51 +02:00
Laserlicht
1980f56668 statusbar 2024-08-13 00:17:12 +02:00
Laserlicht
0c58c9ca9c diagram rendering works 2024-08-12 23:28:08 +02:00
Laserlicht
47330653da basic diagram functionality 2024-08-12 21:47:59 +02:00
Ivan Savenko
a7e6d4146e Fix activation of tabs in lobby menu 2024-08-12 18:44:45 +00:00
Ivan Savenko
97f1a310df Fix miscellaneous issues discovered by Sonar 2024-08-12 18:26:30 +00:00
Laserlicht
37283e51c3 basic diagram 2024-08-12 20:14:36 +02:00
Laserlicht
52b1219db6
code review 2024-08-12 17:53:24 +02:00
Ivan Savenko
39d3217d20
Merge pull request #4428 from Laserlicht/vcmp_rework
VCMP format -> change to zip
2024-08-12 17:20:22 +03:00
Ivan Savenko
79c55bc898
Merge pull request #4425 from IvanSavenko/ui_cleanup
Remove old code from UI system
2024-08-12 17:16:03 +03:00
Laserlicht
ca99dfd12f csv export 2024-08-12 02:56:33 +02:00
Laserlicht
da86a49ea1 save var 2024-08-12 01:19:00 +02:00
Laserlicht
c9a3ea28bf enableUiEnhancements flag 2024-08-12 01:10:47 +02:00
Laserlicht
1e298534ae shortcut 2024-08-12 01:07:58 +02:00
Laserlicht
da64991fd9 fix 2024-08-12 00:02:20 +02:00
Laserlicht
88a5d23ac6 fix 2024-08-11 23:50:16 +02:00
Ivan Savenko
84f29183c8
Merge pull request #4391 from Laserlicht/bank_support
[HotA] Bank support
2024-08-12 00:24:32 +03:00
Ivan Savenko
2a05fbdd50 Unified handling of battle sides ID's
- Replaced BattleSide namespace-enum with enum class
- Merged two different BattleSide enum's into one
- Merged BattlePerspective enum into BattleSide enum
- Changed all places that use integers to represent battle side to use
BattleSide enum
- Added BattleSideArray convenience wrapper for std::array that is
always 2-elements in size and allows access to its elements using
BattleSide enum
2024-08-11 20:54:44 +00:00
Laserlicht
5eac491189 fix 2024-08-11 22:54:19 +02:00
Laserlicht
299ee35c48 extended statistic: Window 2024-08-11 22:44:16 +02:00
Laserlicht
f42f1de347 extended statistic: Button and data transfer 2024-08-11 22:21:13 +02:00
Andrii Danylchenko
78dea24017 Visual logger colored text 2024-08-10 19:13:09 +03:00
Laserlicht
661c374bf2 fixes & code review 2024-08-10 15:01:17 +02:00
Andrii Danylchenko
47c77826c3 Visual logger map texts 2024-08-10 13:04:35 +03:00
Andrii Danylchenko
9ffd6368d4 Add visual logger for battle interface 2024-08-10 10:54:20 +03:00
Andrii Danylchenko
8e79263b21
Merge pull request #4323 from vcmi/battle-ai-fixes
Battle ai fixes
2024-08-10 10:48:35 +03:00
Laserlicht
170f375179 code review 2024-08-10 00:29:30 +02:00
Laserlicht
b4c25a148a
Merge branch 'develop' into bank_support 2024-08-09 23:36:59 +02:00
Laserlicht
5c2523219c code review 2024-08-09 23:35:47 +02:00
Laserlicht
9a9cc10ee7 use Strg instead mouse pos 2024-08-09 22:50:09 +02:00
Ivan Savenko
c6943e0ab0 Fix build, fix element disabling 2024-08-09 16:41:11 +00:00
Ivan Savenko
220c5cb1d7 Remove no longer used DISPOSE flag from CIntObject 2024-08-09 15:50:37 +00:00
Ivan Savenko
4ff2894cf2 Add comments 2024-08-09 15:37:31 +00:00
Ivan Savenko
9fba3d97f1 Renamed & unified OBJECT_CONSTRUCTION macro set 2024-08-09 15:30:04 +00:00
Ivan Savenko
337431901f Moved object construction macros to more logical location 2024-08-09 14:57:40 +00:00
Ivan Savenko
00605b5129 Remove largely unused defActions member from CIntObject 2024-08-09 14:26:53 +00:00
Ivan Savenko
7d30b660ea
Merge pull request #4359 from Laserlicht/statistic
Writing some statistics and make it possible to export via csv
2024-08-09 15:31:13 +03:00
Laserlicht
0e28791075 scroll only if in focus 2024-08-07 20:47:29 +02:00
Ivan Savenko
3f9e57d3f3
Merge pull request #4334 from Laserlicht/quickspell_improve
quickspell improvements
2024-08-07 13:08:13 +03:00
Laserlicht
14bcfad7b0 fix upgrade 2024-08-06 23:28:45 +02:00
Laserlicht
dc81426b5e remove var 2024-08-06 19:34:50 +02:00
Ivan Savenko
97357071b0
Merge pull request #4380 from SoundSSGood/moveChildForeground
Fixed graphical artifacts
2024-08-06 18:09:38 +03:00
Andrii Danylchenko
f34ffcc727
Merge pull request #4388 from kaja47/fix-crash-defense
fix crash when my city without hero is attacked
2024-08-06 17:50:04 +03:00
Laserlicht
abd1a1940a fix recruitment & icons 2024-08-06 01:02:38 +02:00
Laserlicht
ebeeff5aa3 abstraction layer 2024-08-05 23:51:07 +02:00
Laserlicht
3afddbbf29 replaced constant 2024-08-05 23:03:19 +02:00
Laserlicht
1a06a2cc44 basic 8th creature support 2024-08-05 21:15:47 +02:00
Ivan Savenko
b7391f49f6 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-08-05 10:36:10 +00:00
Laserlicht
a15cd05da3 gui stuff for bank 2024-08-04 18:25:21 +02:00
Laserlicht
47327e1642 backend 2024-08-04 17:52:40 +02:00
K
70f3397a35 fix crash when my city without hero is attacked 2024-08-04 16:49:53 +02:00
Ivan Savenko
edad888915 Fixed non-scrollable invite to private room widget 2024-08-04 13:58:20 +00:00
Laserlicht
072af5bd6d basic support for bank 2024-08-04 15:44:57 +02:00
Ivan Savenko
dde5cea601 Fix activation of world view on end turn in multiplayer 2024-08-04 13:19:12 +00:00
Ivan Savenko
e8c3252214 Do not auto-remove dialogs such as new week 2024-08-04 13:14:28 +00:00
Laserlicht
7071647b72 add shortcut for list item moving 2024-08-04 14:11:10 +02:00
SoundSSGood
34b824f9ea moveChildForeground 2024-08-03 17:04:27 +03:00
Andrii Danylchenko
3d856bfa9d Merge remote-tracking branch 'origin/develop' into battle-ai-fixes 2024-08-03 12:54:25 +03:00
Ivan Savenko
7bcd6b1b0d
Merge pull request #4363 from IvanSavenko/fixes_156
Fixes for 1.5.6 release
2024-08-02 21:23:27 +03:00
Laserlicht
acf2e0eef1 fix 2024-08-02 20:01:00 +02:00
Laserlicht
9ceb1c567d highscore refactoring 2024-08-02 19:37:46 +02:00
Ivan Savenko
46669e78e8 Fix possible crash on deletion of adventureInt after GH on shutdown 2024-08-02 15:02:37 +00:00
Ivan Savenko
2c42737b28 Fix infinitely updating simultaneous turns slider 2024-08-02 12:20:14 +00:00
Laserlicht
52ae6a56f1 fix 2024-08-01 23:35:07 +02:00
Laserlicht
6f604444c6
fix 2024-08-01 22:36:11 +02:00
Laserlicht
405bc09780
Update client/battle/BattleInterfaceClasses.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-08-01 21:42:32 +02:00
Laserlicht
4f0c3a3608
Merge branch 'develop' into handicap 2024-08-01 21:39:40 +02:00
Ivan Savenko
b7b25bffd2
Merge pull request #4347 from kaja47/opto
little optimization in MapRenderer
2024-08-01 21:18:44 +03:00
Ivan Savenko
9f7abfe6e9
Merge pull request #4346 from Laserlicht/mod_comp
[1.5.6?] online lobby - mod compatibility improvements
2024-08-01 21:18:30 +03:00
Ivan Savenko
92902d3327
Merge pull request #4345 from Laserlicht/text_sizes
[1.5.6?] limit text sizes in online lobby
2024-08-01 21:18:16 +03:00
Ivan Savenko
88eff2609b
Merge pull request #4332 from Laserlicht/campaign_highscores
fix campaign highscores
2024-08-01 21:16:50 +03:00
K
07e2ec8474 little optimization in MapRenderer
When we replace static const std::vector by std::array the compiler
generates much shorter and nicer binary which doesn't waste time
initializing data structure during runtime.
2024-07-31 22:54:44 +02:00
Laserlicht
12af016eac more colors for status 2024-07-31 22:27:15 +02:00
Laserlicht
0cc743f7ca
mod compatibility improvements 2024-07-31 22:10:37 +02:00
Laserlicht
0d1f744ba4
limit text sizes 2024-07-31 21:40:49 +02:00
Laserlicht
a8fe8cbcf0 adjust text; increase gold input size 2024-07-29 23:48:00 +02:00
Laserlicht
f7376b8fd3
Merge branch 'vcmi:develop' into handicap 2024-07-29 23:10:20 +02:00
Laserlicht
3e5df61946 code review 2024-07-29 22:54:42 +02:00
Laserlicht
939dd62491
change variable name 2024-07-29 20:43:41 +02:00
Ivan Savenko
5f0e6f7ce1 Close all dialogs on start of new turn in MP 2024-07-29 17:13:31 +00:00
Ivan Savenko
434a2fb0fb Explicitly specify to use ranged or melee attack for damage estimation 2024-07-29 17:13:31 +00:00
Ivan Savenko
87b5f955d1 Fix some shortcuts not active during enemy turn in multiplayer 2024-07-29 17:13:31 +00:00
Ivan Savenko
74fea5109b Show non-learnable spells from rewardable object as greyed-out 2024-07-29 17:13:31 +00:00
Ivan Savenko
dac18ae35a
Merge pull request #4315 from IvanSavenko/map_overlay
Add overlay that shows map objects and their name & status
2024-07-29 18:56:53 +03:00
Laserlicht
6adc49b814
add help text 2024-07-29 00:54:58 +02:00
Laserlicht
c103d2a9f7
fix 2024-07-26 21:02:25 +02:00
Laserlicht
6e68dee955
fix 2024-07-26 20:54:44 +02:00
Laserlicht
53c0d20a57 fix campaign highscores 2024-07-26 20:36:52 +02:00
Laserlicht
e46f5f705b
better approach 2024-07-26 20:34:47 +02:00
Laserlicht
136f33f950 quickspell improvements 2024-07-26 20:11:14 +02:00
Laserlicht
2d100b00cd
check spellbook 2024-07-26 01:06:54 +02:00
Laserlicht
652e2ddf3f only host 2024-07-25 23:37:31 +02:00
Laserlicht
ecd7e17764 button 2024-07-25 23:32:45 +02:00
Laserlicht
ec005593d3 growth handicap 2024-07-25 23:04:59 +02:00
Laserlicht
bfd1e8a7c8 calculate income 2024-07-25 02:51:00 +02:00
Laserlicht
63b8ac1a58 fix 2024-07-25 00:45:52 +02:00
Laserlicht
d7ffc6ad3e cleanup 2024-07-25 00:28:49 +02:00
Laserlicht
d54dfe4508 gui improvements 2024-07-25 00:28:49 +02:00
Laserlicht
dc54261574 set handicap 2024-07-25 00:28:49 +02:00
Laserlicht
5310f94e99 gui input 2024-07-25 00:28:49 +02:00
Laserlicht
2b7e42004f basic gui 2024-07-25 00:28:49 +02:00
Laserlicht
268e0c8c44 change data structure 2024-07-25 00:28:49 +02:00
Laserlicht
fa7153b577 fix 2024-07-25 00:28:49 +02:00
Laserlicht
832e1531fc handycap percent 2024-07-25 00:28:49 +02:00
Laserlicht
48eacbf830 handicap percent 2024-07-25 00:28:49 +02:00
Laserlicht
97f49030d2 fix 2024-07-25 00:28:49 +02:00
Laserlicht
af2b6a0051 show handicap resources 2024-07-25 00:28:49 +02:00
Laserlicht
8edf77afcc basic handicap support 2024-07-25 00:28:01 +02:00
Andrii Danylchenko
da46d5d01b BattleAI: take into account defender dragon breath and other mutitarget attacks 2024-07-22 20:39:33 +03:00
Ivan Savenko
37cf788079
Merge pull request #4317 from IvanSavenko/split_townhandler
Split CTownHandler into smaller chunks
2024-07-22 17:42:48 +03:00
Ivan Savenko
4aa73b40c9 Split CTownHandler into smaller chunks 2024-07-21 18:21:48 +00:00
Ivan Savenko
550540f8ab
Merge pull request #4316 from IvanSavenko/crashfixes
Crashfixes
2024-07-21 16:15:28 +03:00
Ivan Savenko
4533271692
Merge pull request #4312 from IvanSavenko/texthandler_split
Split CGeneralTextHandler file into 1 file per class form
2024-07-21 13:49:14 +03:00
Ivan Savenko
398111f8d7
Merge pull request #4212 from alkazandzhiev/alkazandzhiev/saveMultiPlayerNames
Save all human player names in the configuration
2024-07-21 11:20:25 +03:00
Ivan Savenko
44f516d2fc Add overlay that shows map objects and their name & status 2024-07-20 18:47:20 +00:00
Ivan Savenko
5b9130c288 Fixes broken player-coloring on animations (e.g. hero in battle) 2024-07-20 18:28:47 +00:00
Ivan Savenko
1aa391fdf8 Split CGeneralTextHandler file into 1 file per class form
All text processing code is now located in lib/texts.
No changes other than code being moved around and adjustment of includes

Moved without changes:
Languages.h           -> texts/Languages.h
MetaString.*          -> texts/MetaString.*
TextOperations.*      -> texts/TextOperations.*

Split into parts:
CGeneralTextHandler.* -> texts/CGeneralTextHandler.*
                      -> texts/CLegacyConfigParser.*
                      -> texts/TextLocalizationContainer.*
                      -> texts/TextIdentifier.h
2024-07-20 12:55:17 +00:00
Ivan Savenko
3c611ffa5b
Merge pull request #4307 from IvanSavenko/misc_fixes
Miscellaneous fixes
2024-07-20 12:56:10 +03:00
Ivan Savenko
08a6b859d2
Merge pull request #4304 from Laserlicht/quickspell-option
option to enable quickspell
2024-07-20 12:53:36 +03:00
Ivan Savenko
d59a5dad7d
Merge pull request #4299 from Laserlicht/input_modi_detection
input mode detection
2024-07-20 12:51:08 +03:00
Ivan Savenko
34204d5898
Merge pull request #4305 from Laserlicht/fix_search
fix search in quick spell spellbook
2024-07-20 12:50:43 +03:00
Aleksandar Kazandzhiev
cde9bed5a6 Use std::vector::empty for non-zero size checking.
Use auto type for ocontainers iterations.
2024-07-20 12:16:13 +03:00
Ivan Savenko
2796931259 Fix credits scrolling 2024-07-20 08:28:35 +00:00
Ivan Savenko
8d4f8dcf9c Add unassigned by default hotkeys to show visitable or blocked tiles 2024-07-19 19:38:40 +00:00
Ivan Savenko
e862b9c868 Fix crash on opening creature window with bonuses that don't have icon 2024-07-19 19:37:22 +00:00
Ivan Savenko
75fd67a921 Fix mouse scroll not working in right-click popups 2024-07-19 19:36:05 +00:00
Ivan Savenko
1dec5e56a9 Fix cursor shadow option in battles 2024-07-19 19:35:39 +00:00
Laserlicht
598f1b0738 fix search in quick spell spellbook 2024-07-19 19:49:21 +02:00
Laserlicht
ee0cf58395 option to enable quickspell 2024-07-19 19:43:22 +02:00
Laserlicht
0e207e7f64 change naming 2024-07-19 17:58:23 +02:00
Laserlicht
994a065e29 change naming 2024-07-19 17:58:06 +02:00
Ivan Savenko
0d44bf1506 Fix build 2024-07-19 12:30:10 +00:00
Ivan Savenko
b256919dab Implemented per-surface alpha for images that have palettes with alpha 2024-07-19 12:03:29 +00:00
Ivan Savenko
c40eea6e10 Fix fade-in animation - per-surface alpha was not set correctly 2024-07-19 10:46:20 +00:00
Ivan Savenko
9f3663b7d4 Remove unused method 2024-07-19 10:08:50 +00:00
Ivan Savenko
4f8f217b49 Moved range highlight transforms to config file 2024-07-19 10:08:50 +00:00
Ivan Savenko
81c7c0ce24 Fixed loading of flipped and duplicate images in animations 2024-07-19 10:08:50 +00:00
Ivan Savenko
73e052b1d0 Fix merge 2024-07-19 10:08:50 +00:00
Ivan Savenko
e4bed98674 Replaced raw json nodes with ImageLocator class 2024-07-19 10:08:50 +00:00
Ivan Savenko
2f68beead1 Remove old code 2024-07-19 10:08:50 +00:00
Ivan Savenko
fd726523a2 Remove creations of custom animations in runtime 2024-07-19 10:08:50 +00:00
Ivan Savenko
5409936509 Fix build with older SDL 2024-07-19 10:08:50 +00:00
Ivan Savenko
0d6ec0d224 Reviewed usage of EBlitMode, now specified clearly in all cases 2024-07-19 10:08:50 +00:00
Ivan Savenko
f11c5f62e1 Remove no longer needed code 2024-07-19 10:08:50 +00:00
Ivan Savenko
b850b6339f Flipped images are now tracked by RenderHandler 2024-07-19 10:08:50 +00:00
Ivan Savenko
230add02e4 Remove no longer used code 2024-07-19 10:08:50 +00:00
Ivan Savenko
0e407540ec Fixed player-coloring on adventure map 2024-07-19 10:08:50 +00:00
Ivan Savenko
920a39844b Unified naming of method to recolor UI element to current player scheme 2024-07-19 10:08:50 +00:00
Ivan Savenko
9f31ec5326 Restore previously disabled icons registry 2024-07-19 10:08:50 +00:00
Ivan Savenko
fcafe53da9 Restored previously disabled University code, add interface to notify
market-like objects
2024-07-19 10:08:50 +00:00
Ivan Savenko
c1ebb6b0e3 Try to use lazy loading for animations 2024-07-19 10:08:50 +00:00
Ivan Savenko
a8a330f39f Remove unused code and no longer needed caching 2024-07-19 10:08:50 +00:00
Ivan Savenko
47de9a62dc Created separate classes for shared, unchangeable image and image
manipulators owned by UI elements
2024-07-19 10:08:50 +00:00
Ivan Savenko
2b3e4e01ca Remove unused code 2024-07-19 10:08:50 +00:00
Ivan Savenko
600b06b74d Moved all handling of image loading to render handler 2024-07-19 10:08:50 +00:00
Ivan Savenko
a1fb3b8b01 Reduce direct access to CAnimation, removed various caching schemes 2024-07-19 10:08:50 +00:00
Ivan Savenko
56f1725234 All images are now loaded via RenderHandler class 2024-07-19 10:08:50 +00:00
Ivan Savenko
2020d96070
Merge pull request #4071 from IvanSavenko/fix_rng_syncronization
[1.6] Fix potential desync if client uses different stdlib with different random number generators
2024-07-19 13:08:09 +03:00
Laserlicht
ac30f7757b changed naming 2024-07-19 11:41:00 +02:00
Laserlicht
68213eb5a0 touch tutorial only if touch used 2024-07-19 04:16:43 +02:00
Laserlicht
26b164b7ca change naming 2024-07-19 03:44:45 +02:00
Laserlicht
fb980bdb74 fix 2024-07-19 03:28:33 +02:00
Laserlicht
76fc821f82 click also change of modi; haptic only with touch 2024-07-19 03:16:56 +02:00
Laserlicht
5dae5ed30e input modi detection 2024-07-19 03:00:19 +02:00
Laserlicht
9ac7db24ca
Merge branch 'develop' into quickspell 2024-07-18 21:24:42 +02:00
Ivan Savenko
d02251f6a8
Merge pull request #4263 from Alexander-Wilms/json-error
JsonParser::parse(): Print file name if there were errors while parsing
2024-07-18 21:28:44 +03:00
Ivan Savenko
d55c4e3973
Merge pull request #4275 from IvanSavenko/music_modding
Additional options for music modding
2024-07-18 21:28:04 +03:00
Ivan Savenko
37284efd74
Merge pull request #4278 from IvanSavenko/video_fixes
Video playback fixes
2024-07-18 21:18:39 +03:00
Andrii Danylchenko
37dc2a38e8 NKAI: reduce double army loss cases 2024-07-18 13:38:25 +03:00
Andrii Danylchenko
73ea0ce7bc
Merge pull request #4289 from vcmi/fix-gosolo-for-multiplayer
NKAI: fix gosolo when human is lead by gosolo AI + multiplayer
2024-07-18 08:02:16 +03:00
Laserlicht
e629b7a371 reduce to 12 with gap 2024-07-17 19:26:18 +02:00
Aleksandar Kazandzhiev
551b87e2cd Add up to 8 human player names to the configuration and save/load them to avoid entering them each time.
Avoid a crash when all names are deleted in the multiplayer names editing dialog.
2024-07-17 20:04:20 +03:00
Laserlicht
4415f645a7 lambda -> function; fix color 2024-07-17 18:07:45 +02:00
Andrii Danylchenko
7571fb7046 NKAI: fix gosolo when human is lead by gosolo AI + multiplayer 2024-07-17 17:09:04 +03:00
Ivan Savenko
662254155a Merge branch 'vcmi/master' into 'vcmi/develop' 2024-07-17 13:57:36 +00:00
Laserlicht
2dd22c383b make inactive buttons darker 2024-07-17 14:05:14 +02:00
Ivan Savenko
becd13e03d Fix page flip animation playback 2024-07-17 11:57:03 +00:00
Alexander Wilms
434371195d JsonNode constructors: Take fileName as argument
* Don't print JSON in JsonParser::parse() in case of errors
2024-07-17 13:50:59 +02:00
Laserlicht
f0435d8b8e small fix 2024-07-17 13:48:00 +02:00
Laserlicht
f54b84ead9 use spellbook to select 2024-07-17 13:20:17 +02:00
Laserlicht
5562402646 hotkey number from config 2024-07-17 12:37:23 +02:00
Laserlicht
b8d872aa60 mobile adjustments 2024-07-17 04:24:27 +02:00
Laserlicht
b568e2f628
Merge branch 'vcmi:develop' into quickspell 2024-07-17 03:20:31 +02:00
Laserlicht
d23d4b32c7 cleanup 2024-07-17 01:02:11 +02:00
Laserlicht
0a98169bcf update quick spell panel 2024-07-17 00:55:01 +02:00
Laserlicht
a3874297f5 toggle window 2024-07-17 00:48:22 +02:00
Laserlicht
1daf6dfad1 make hideable 2024-07-16 23:36:23 +02:00
Laserlicht
37b5de689a move to left side 2024-07-16 22:47:40 +02:00
Ivan Savenko
1c63fefe02 Moved banks randomization to server-side with client netpack 2024-07-16 13:13:39 +00:00
Ivan Savenko
b07408e984 New objects are now created and initialized on server and sent to client 2024-07-16 13:13:39 +00:00
Ivan Savenko
d2839c8e52 Rewardable object randomization is now always server-sided 2024-07-16 13:13:39 +00:00
Ivan Savenko
0d66ddbeec GameState now uses random generator from server. Blocked access to rmg
on client
2024-07-16 13:13:38 +00:00
Ivan Savenko
63bcf7d83c Replaced most of usages of CRandomGenerator with vstd::RNG in library 2024-07-16 13:13:07 +00:00
Ivan Savenko
7328c9ffd6 Fix path and music not updating on new turn 2024-07-16 13:08:15 +00:00
Ivan Savenko
e4be4c3061 Fix playback of 8-bit audio found in h3intro.smk in some version not
from gog.com
2024-07-16 12:49:24 +00:00
Ivan Savenko
29d3de2807 Fix missing video on winning the battle 2024-07-16 11:41:40 +00:00
Ivan Savenko
e59880a37c Remove unnecessary logging 2024-07-16 09:53:56 +00:00
Ivan Savenko
a273eb6413 Fix crash on attempt to play audio from video without such stream 2024-07-16 09:53:56 +00:00
Ivan Savenko
ad9750ed3e
Merge pull request #4186 from SoundSSGood/end-of-battle-artifacts-transfer
End of battle artifacts transfer
2024-07-16 12:45:13 +03:00
Ivan Savenko
696cce7f7f
Merge pull request #4253 from smanolloff/random-port
Bind VCMI server to a random TCP port
2024-07-16 12:25:29 +03:00
Ivan Savenko
fd04320815
Merge pull request #4267 from IvanSavenko/sonar_fix
Fixed new issues detected by SonarCloud
2024-07-16 12:23:08 +03:00
Ivan Savenko
f920e94366
Merge pull request #4210 from Laserlicht/graphics_improvements
[1.6] Graphics improvements
2024-07-16 12:17:39 +03:00
Ivan Savenko
3134d8383c
Merge pull request #4207 from Laserlicht/map_format_additional
[1.6] Map format additional infos
2024-07-16 12:15:58 +03:00
Ivan Savenko
4e48d70537
Merge pull request #4265 from dydzio0614/alternative-actions-fix
Fix alternative actions to support more than 2 actions + simplify logic
2024-07-16 12:14:46 +03:00
Ivan Savenko
9c5d5d7c5a It is now possible to define custom battle opening sound and custom music
for a battlefield
2024-07-15 21:46:23 +00:00
Ivan Savenko
358008fca9 It is now possible to define multiple town themes 2024-07-15 21:45:51 +00:00
SoundSSGood
ff5ddd76b7 suggestions 2024-07-16 00:03:06 +03:00
Dydzio
037ee4395e Allow opening single hero when two heroes in town via shift+click 2024-07-15 20:22:19 +02:00
Ivan Savenko
c00a1e1b0c Fixed new issues detected by SonarCloud 2024-07-15 07:46:40 +00:00
Dydzio
6119898932 Add some useful comments 2024-07-15 09:39:22 +02:00
Laserlicht
6aa7c9ebf9
code review 2024-07-15 00:51:41 +02:00
Dydzio
3836f132d3 Fix alternative actions to support more than 2 actions + simplify logic 2024-07-15 00:41:05 +02:00
Simeon Manolov
d997d18438
remove debug line 2024-07-12 15:41:07 +03:00
Simeon Manolov
4be7adbf0a
add missing include 2024-07-12 15:26:31 +03:00