1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

277 Commits

Author SHA1 Message Date
Ivan Savenko
e4bed98674 Replaced raw json nodes with ImageLocator class 2024-07-19 10:08:50 +00:00
SoundSSGood
ef1fbffad4 ArtifactsUIController class 2024-07-09 14:27:05 +03:00
Ivan Savenko
b4c6906471 Merge branch 'vcmi/beta' into 'vcmi/develop' 2024-06-11 19:22:23 +00:00
Andrey Filipenkov
8cee8b72a6 [launcher] build for Android
also embeds icons and translations as Qt resources instead of reading from disk
2024-06-08 00:09:04 +03:00
Ivan Savenko
df83fa33a1 Merge branch 'vcmi/master' into 'vcmi/develop' 2024-05-31 09:34:21 +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
d965226cbd Moved Exchange Window to new file, no functionality changes 2024-05-19 10:53:56 +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
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
1abe9007bc Moved CTextInput to a separate file. No changes in logic 2024-05-15 12:45:45 +00:00
Ivan Savenko
2bb96018b8 Update list of player in invite window on new player or new invite 2024-05-13 13:48:01 +00:00
Ivan Savenko
1dc27046ef Unified game controller input with keyboard/mouse 2024-04-30 15:21:07 +03:00
kdmcser
92b1c8deb5 Merge branch 'develop' into joystick_support 2024-04-29 00:49:04 +08:00
kdmcser
1eea8398b4 make joystick configurable 2024-04-27 22:42:54 +08:00
Ivan Savenko
01c2814d35
Merge pull request #3821 from SoundSSGood/CWindowWithArtifacts-refactoring
CWindowWithArtifacts refactoring
2024-04-26 11:58:38 +03:00
SoundSSGood
20471c9c2f virtual CWindowObject 2024-04-23 18:58:41 +03:00
Ivan Savenko
1840666327 Implemented join room dialog 2024-04-23 17:15:59 +03:00
SoundSSGood
25d2b468c3 CWindowWithArtifacts preparations 2024-04-23 16:06:58 +03:00
kdmcser
cee8d34fc5 Merge branch 'develop' into joystick_support 2024-04-15 22:37:15 +08:00
kdmcser
beaebb3a5f a simple implement for game controller 2024-04-13 13:12:25 +08:00
Ivan Savenko
f73243eb1c
Merge pull request #3669 from SoundSSGood/market-window-unified
Market window and widgets
2024-04-09 12:48:25 +03:00
Ivan Savenko
ace43e97b9 Added UI for inviting players into a match 2024-03-27 13:10:55 +02:00
Ivan Savenko
4ed961fb96 Partially unified handling of pregame and in-game chats 2024-03-27 13:10:55 +02:00
SoundSSGood
cc14f85445 Refactoring. Regressions fixing. 2024-03-25 12:55:05 +02:00
SoundSSGood
433d55cac3 Market window unified 2024-03-25 12:44:34 +02:00
SoundSSGood
4839891de4 Cleanup & refactoring 2024-03-25 12:44:33 +02:00
SoundSSGood
f3fa6714dc Artifacts selling widget 2024-03-25 12:44:33 +02:00
SoundSSGood
4e0ea7355b Transfer resources widget 2024-03-25 12:44:33 +02:00
SoundSSGood
4d3bf882ed market resources widget 2024-03-25 12:44:33 +02:00
SoundSSGood
6b658bf9c1 freelancer guild widget 2024-03-25 12:44:33 +02:00
SoundSSGood
0813fdbf8c market window 2024-03-25 12:44:33 +02:00
Andrey Filipenkov
35cf227b35 [cmake] simplify 'share' files installation on Linux 2024-03-19 21:55:45 +03:00
Ivan Savenko
af671d109f Made graphical primitive-based UI more configurable 2024-02-18 20:48:45 +02:00
Ivan Savenko
a909d7ddde Removed cmake_modules/VCMI_lib macro, use it directly in place 2024-02-11 20:38:24 +02:00
Ivan Savenko
19ccef7131 Fix build 2024-02-11 19:54:30 +02:00
Ivan Savenko
f08c9f4d59 Renamed ENABLE_STATIC_AI_LIBS option to match its actual effect 2024-02-11 17:55:02 +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
388ca6e776 Added list of active accounts and rooms to UI. Added room creation logic 2024-01-26 16:32:36 +02: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
c2c43602ea Initial version of global lobby server available in client 2024-01-19 23:49:59 +02:00
SoundSSGood
fdf60b2151 moved to widgets/markets 2024-01-09 20:21:09 +02:00
Laserlicht
a3e27b859e extra option tab 2023-12-28 19:41:01 +01:00
Ivan Savenko
07990644b5
Merge pull request #3191 from Laserlicht/touch-introduction
Touch introduction
2023-11-20 14:05:47 +02:00
Laserlicht
f7a31865f3
basic touch introduction implementation 2023-11-14 21:52:30 +01: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
SoundSSGood
75ebd954af Creatures altar & Artifacts altar 2023-11-06 14:31:32 +02:00