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
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
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
88a5d23ac6
fix
2024-08-11 23:50:16 +02: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
Ivan Savenko
9fba3d97f1
Renamed & unified OBJECT_CONSTRUCTION macro set
2024-08-09 15:30:04 +00:00
Ivan Savenko
00605b5129
Remove largely unused defActions member from CIntObject
2024-08-09 14:26:53 +00:00
Laserlicht
9ceb1c567d
highscore refactoring
2024-08-02 19:37:46 +02:00
Laserlicht
939dd62491
change variable name
2024-07-29 20:43:41 +02:00
Laserlicht
53c0d20a57
fix campaign highscores
2024-07-26 20:36:52 +02:00
Ivan Savenko
4aa73b40c9
Split CTownHandler into smaller chunks
2024-07-21 18:21:48 +00: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
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
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
a1fb3b8b01
Reduce direct access to CAnimation, removed various caching schemes
2024-07-19 10:08:50 +00: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
Ivan Savenko
6b8f94e6e7
Merge remote-tracking branch 'vcmi/master' into develop
2024-07-11 17:43:44 +00:00
Laserlicht
e142776957
highscore text len
2024-06-29 14:44:29 +02:00
Alexander Wilms
02e429e973
Fix typos using https://github.com/crate-ci/typos
...
Changes were reviewed manually
2024-06-24 03:47:19 +02:00
Ivan Savenko
3bea383b59
Merge branch 'vcmi/beta' into 'vcmi/develop'
2024-06-21 12:58:36 +00:00
Ivan Savenko
ffa5c03515
Load & decode high score creatures on first access
2024-06-17 17:08:41 +00:00
Ivan Savenko
f03d80628a
Fix potentially uninitialized pointer
2024-06-11 14:12:03 +00:00
Ivan Savenko
b8beb4fb13
Fixes for various minor issues detected by Sonar Cloud
2024-06-01 11:48:30 +00:00
Ivan Savenko
df83fa33a1
Merge branch 'vcmi/master' into 'vcmi/develop'
2024-05-31 09:34:21 +00:00
Ivan Savenko
3ed7c1d066
Implement playback of two-part campaign videos
2024-05-30 18:02:19 +00:00
Ivan Savenko
d1aa4ecd10
Merge pull request #4013 from IvanSavenko/shortcuts_additions
...
[1.5.2] Shortcuts additions
2024-05-21 14:18:55 +03:00
Ivan Savenko
82af0639df
Merge pull request #4004 from Laserlicht/background
...
[1.5.2] background for multiple windows
2024-05-20 18:10:38 +03:00
Ivan Savenko
017aaefc40
Handle invalid main menu config
2024-05-20 11:00:21 +00:00
Ivan Savenko
68883e0b29
Fixed disabling of text input on closing high scores
2024-05-19 12:39:59 +00:00
Ivan Savenko
88fbb7ee71
Most of buttons created in cpp now have assigned shortcut
2024-05-19 09:12:36 +00:00
Laserlicht
c676b999e5
use showAll
2024-05-18 20:21:47 +02:00
Laserlicht
fc50482b43
background for multiple windows
2024-05-18 19:58:51 +02:00
Ivan Savenko
dc0b90e755
Code style & formatting
2024-05-18 13:34:23 +00:00
Ivan Savenko
d502850054
Add network thread termination logic for adventure map animations
2024-05-18 12:15:48 +00:00
Ivan Savenko
9bfe000724
Added semi-workaround method for network thread shutdown:
...
Currently closing game while network thread is waiting for something is
very bug-prone, since network thread may resume during shutdown and
access partially destroyed client state.
Now if exit has been requested, the very first step would be semi-
graceful shutdown of network thread (via exception throwing). This may
in theory skip some cleanup in non-RAII code, but since game is shutting
down this does not matters much.
This logic applies to:
- shutting down while network thread is waiting for dialogs
- shuttind down while network thread waiting for animations in combat
2024-05-18 11:04:10 +00:00
Ivan Savenko
540bd16e7b
Fixed video widget playback
2024-05-16 16:50:36 +00:00
Ivan Savenko
d08c7b7b8f
Added VideoWidget to hide implementation details
2024-05-15 17:05:16 +00:00
Ivan Savenko
d27b854cb1
Reorganized music, video and sound players:
...
- All XXXplayers are now in client/media directory
- Reogranized code on one class per file basis
- Extracted interfaces from handlers. Handlers now implement
corresponding interface.
- CCS now only stores pointer to an interface
2024-05-15 17:05:12 +00:00
Ivan Savenko
7790b8969d
Simplify TextInput constructor
2024-05-15 12:45:45 +00:00
Ivan Savenko
93c3cf372b
Reworked TextInput to allow text overflow support
2024-05-15 12:45:45 +00:00
Ivan Savenko
1abe9007bc
Moved CTextInput to a separate file. No changes in logic
2024-05-15 12:45:45 +00:00
Ivan Savenko
d3d15cd6b9
Loop audio stream from video file on campaing prolog/epilog window
2024-05-02 16:45:46 +03:00
Ivan Savenko
d4594baa05
Merge pull request #3749 from IvanSavenko/configurable_shortcuts
...
Configurable keyboard shortcuts
2024-04-13 12:47:30 +03:00
Ivan Savenko
ac1c36b7e2
Fixed not working shortcuts on some buttons in main menu
2024-04-11 22:00:54 +03:00
Ivan Savenko
9188280d02
Fix access to CPrologEpilogVideo after destruction from sound callback
2024-04-11 13:25:54 +03:00
Ivan Savenko
07d201502e
Refactoring of button class to prepare for configurable button
2024-02-29 13:57:25 +02:00
Ivan Savenko
af671d109f
Made graphical primitive-based UI more configurable
2024-02-18 20:48:45 +02:00
Ivan Savenko
c3957c2c2a
Moved json files to new directory, split on per-class basis
2024-02-14 13:08:24 +02:00
Ivan Savenko
9ebd194ab1
Merge pull request #3609 from IvanSavenko/single_process
...
Allow running server as part of client process
2024-02-14 12:06:22 +02:00
Ivan Savenko
6e399eb21a
Make some non-const static variables const or constexpr
2024-02-12 13:22:54 +02:00
Ivan Savenko
0d263c5571
Implemented option to run server as a thread with shared VLC
2024-02-11 17:55:02 +02:00
Ivan Savenko
d4bedd8d8d
Fixed handling of match server crash
2024-02-04 19:58:09 +02:00
Ivan Savenko
80fc2bb695
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-02-03 21:11:34 +02:00
Ivan Savenko
c5c46a7c9a
Implemented connecting to server via proxy
2024-01-30 21:31:41 +02:00
Ivan Savenko
dc2f8cb81d
Merge pull request #3553 from Laserlicht/sync_subtitle
...
sync subtitle with audio
2024-01-29 12:54:43 +02:00
Laserlicht
d53dd83466
fix; cleanup; optimized times
2024-01-26 21:58:39 +01:00
Laserlicht
6e957d4913
fix build
2024-01-26 20:31:57 +01:00
Laserlicht
3d57437e52
move logic to tick
2024-01-26 20:13:02 +01:00
Ivan Savenko
322c5faf63
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-01-26 16:52:23 +02:00
Ivan Savenko
388ca6e776
Added list of active accounts and rooms to UI. Added room creation logic
2024-01-26 16:32:36 +02:00
Laserlicht
28c6385211
fix
2024-01-26 11:17:38 +01:00
Laserlicht
c2c86ec278
fix
2024-01-25 21:11:42 +01:00
Laserlicht
3b9372c51c
Code review
2024-01-25 20:49:59 +01:00
Laserlicht
134eaa1583
sync subtitle
2024-01-24 01:17:23 +01:00
Laserlicht
0df4f9bda5
video button
2024-01-23 23:45:31 +01:00
Ivan Savenko
ffa58152ac
Client-side support for hosting game server via lobby
2024-01-19 23:49:59 +02:00
Ivan Savenko
55b504792e
Implemented basic version of login window and persistent connection on
...
client
2024-01-19 23:49:59 +02:00
Ivan Savenko
78833a1015
Split LobbyWindow file into one file per class
2024-01-19 23:49:59 +02:00
Ivan Savenko
20a38d8514
Renamed new LobbyXXX classes to GlobaLobbyXXX
2024-01-19 23:49:59 +02:00
Ivan Savenko
2396c14114
Fixed logic for reconnection attempts to local server. Cleanup.
...
Added distinct fields in config for local and remote connection.
Removed code for restoring last session since it does not works as
intended and often triggers after crash
2024-01-19 23:49:59 +02:00
Ivan Savenko
5694777a96
Simplified connection logic
2024-01-19 23:49:59 +02:00
Ivan Savenko
22f0ca67c6
Fix connection to game lobby & map load
2024-01-19 23:49:59 +02:00
Ivan Savenko
0a1153e1c6
Switch client-server communication to new API
2024-01-19 23:49:59 +02:00
Ivan Savenko
c2c43602ea
Initial version of global lobby server available in client
2024-01-19 23:49:59 +02:00
Ivan Savenko
bd5682ecc3
Merge remote-tracking branch 'vcmi/master' into develop
2024-01-19 13:49:54 +02:00
Alexander Wilms
f3277b7953
Define each identifier in a dedicated statement
2024-01-10 00:22:23 +00:00
Laserlicht
63ee20de6c
video campaign fix
2024-01-01 15:25:42 +01:00
Ivan Savenko
44a79c1ff4
Merge pull request #3327 from Laserlicht/datetime
...
date time format
2023-12-18 13:21:01 +02:00
Laserlicht
9299eaed36
code review
2023-12-16 21:10:27 +01:00
Laserlicht
56562ad8dc
date time format
2023-12-16 18:57:38 +01:00
Ivan Savenko
9f8a5119f9
Less strict check for Armageddon's Blade data files presence
2023-12-16 15:04:41 +02:00
Dydzio
4b57b9f9a9
Display disabled connect button on server autojoin
2023-11-26 18:39:51 +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
4a24da3804
Merge pull request #3114 from Laserlicht/fix-highscore
...
fix high scores screen
2023-11-03 15:51:37 +02:00
Laserlicht
8a9f10ec3a
fix asset failures
2023-10-31 22:05:22 +01:00
Alexander Wilms
5cbc75d3b7
Merge remote-tracking branch 'upstream/develop' into develop
2023-10-29 13:35:37 +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