DjWarmonger
0808a8b36f
Merge pull request #3714 from vcmi/biome_system
...
Biome system implementation
2024-04-13 21:32:13 +02:00
Ivan Savenko
2f1f68f89d
Do not attempt to move if there are active dialogs
2024-04-13 16:57:21 +03:00
kdmcser
0cac4228e4
fix merge master error
2024-04-13 20:27:46 +08:00
Ivan Savenko
95c0551de5
Merge pull request #3751 from IvanSavenko/fix_dnd_cursor
...
Fix assertion failure with drag-and-drop cursor
2024-04-13 14:39:19 +03:00
Ivan Savenko
d4594baa05
Merge pull request #3749 from IvanSavenko/configurable_shortcuts
...
Configurable keyboard shortcuts
2024-04-13 12:47:30 +03:00
kdmcser
beaebb3a5f
a simple implement for game controller
2024-04-13 13:12:25 +08:00
Laserlicht
e4b60baa3b
creature/town biography/description
2024-04-12 23:35:39 +02:00
Ivan Savenko
0bd1c3c95d
Merge pull request #3746 from IvanSavenko/fix_undefined_behavior
...
Fix discovered undefined behavior cases
2024-04-12 11:51:13 +03:00
Ivan Savenko
a7d47cd3d2
Merge pull request #3742 from IvanSavenko/adventure_map_spellcast_fixes
...
Adventure map spellcasting fixes
2024-04-12 11:17:19 +03:00
Ivan Savenko
de5bd5f94c
Reset picked artifact on window deactivation
2024-04-11 23:52:37 +03:00
Ivan Savenko
fa9e0669f2
Remove excessive call - will be reset on window push anyway
2024-04-11 23:51:58 +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
611249d11d
Added workaround for weird SDL behavior that causes SDL to report text
...
input as active when app starts until first actual text input
2024-04-11 22:00:20 +03:00
Ivan Savenko
16c56cf6c5
Keyboard shortcuts are now loaded from config file
2024-04-11 21:21:46 +03:00
Ivan Savenko
cbd5f57069
Added workaround for potential access to CIntObject after destruction
2024-04-11 13:25:54 +03:00
Ivan Savenko
c99d4b959e
Fix potentially uninintialized variables
2024-04-11 13:25:54 +03:00
Ivan Savenko
9188280d02
Fix access to CPrologEpilogVideo after destruction from sound callback
2024-04-11 13:25:54 +03:00
SoundSSGood
6a0e8b0cab
Junkyard crash fixed
2024-04-11 01:44:15 +03:00
SoundSSGood
ca0f7aee7d
artifactMoved assertion fix
2024-04-10 23:30:31 +03:00
Ivan Savenko
320469d773
Cleanup
2024-04-10 20:04:08 +03:00
Ivan Savenko
8353bca34f
Small refactoring of adventure map spell casting:
...
- Removed duplicated checks for DD possibility
- Moved most of spell-specific code from AdventureMapInterface to library
code
- AdventureSpellMechanics class now provides methods to check whether
spellcast is possible, similarly to battle spells
- If it is not possible to cast adventure map spell (e.g. no mana or no
move points) game will show infowindow immediately on clicking spellbook
instead of on cast attempt
- If hero does not have movement points for a DD, game will show correct
error message
- Added game settings 'dimensionDoorFailureSpendsPoints' due to
discovered H3 logic
2024-04-10 20:04:08 +03:00
Ivan Savenko
bcd4a8c961
Merge pull request #3736 from IvanSavenko/fix_server_translations
...
Do not translate strings on server side
2024-04-10 19:12:34 +03:00
Ivan Savenko
5b43720dda
Merge pull request #3686 from dydzio0614/dimension-door-changes
...
Dimension door changes
2024-04-10 11:47:36 +03:00
Ivan Savenko
510e1023da
Merge pull request #3730 from IvanSavenko/localization_export
...
Better export command for translations
2024-04-09 19:11:10 +03:00
Ivan Savenko
18ece6dcf6
Remove some usages of server-side translations
2024-04-09 16:13:30 +03:00
Ivan Savenko
b0334b381e
Merge pull request #3724 from IvanSavenko/fix_server_shutdown
...
Simplified and fixed server restart procedure
2024-04-09 16:13:19 +03:00
Ivan Savenko
576939f105
Merge pull request #3713 from Laserlicht/scalingMode
...
scalingMode to config
2024-04-09 12:48:35 +03: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
Tomasz Zieliński
d9a598ad9c
Merge remote-tracking branch 'origin/develop' into biome_system
2024-04-08 15:01:17 +02:00
SoundSSGood
39a0e56169
suggested changes
2024-04-08 14:57:58 +03:00
Tomasz Zieliński
3e3959d360
Move all OH3 objects and obstacle sets to a mod
2024-04-08 12:50:41 +02:00
Ivan Savenko
8582bd7d66
Replaced 'convert txt' command with more convenient 'translate' and
...
'translate maps' commands.
2024-04-08 13:16:23 +03:00
Ivan Savenko
e89e5d2127
Rename for clarity
2024-04-07 21:22:33 +03:00
Ivan Savenko
0a296add0c
apply SonarCloud suggestions
2024-04-07 21:21:48 +03:00
Ivan Savenko
80acd7e77c
Simplified and fixed server restart procedure:
...
- Replaced several assertions with runtime_error's to detect them in
release builds
- Removed multiple dispatchMainThread calls in server shutdown code to
simplify debugging and code flow
- Moved handling of gameplay shutdown and score calculation from
PlayerInterface to ServerHandler (not perfect, but better than before)
2024-04-07 14:19:57 +03:00
Ivan Savenko
0a80c6c27b
Merge pull request #3722 from IvanSavenko/stabilization
...
Fixes for recently reported crashes
2024-04-07 14:07:56 +03:00
Ivan Savenko
4bef4d9277
Merge pull request #3718 from IvanSavenko/lobby_tweaks_3
...
Few more tweaks for new lobby
2024-04-07 14:07:49 +03:00
Ivan Savenko
2d9e42b623
Do not attempt to show extra options in campaign scenario information
...
screen
2024-04-06 15:59:08 +03:00
Andrii Danylchenko
c7b5d254d7
Fix castel interface closing by turn timer
2024-04-06 11:42:39 +03:00
Ivan Savenko
7c18c8b1da
Add comment
2024-04-05 18:50:06 +03:00
Ivan Savenko
ee1aa4ed05
Fix overlaying UI elements when player has no account created
2024-04-05 18:50:06 +03:00
Ivan Savenko
651908d7aa
Do not attempt to translate usernames
2024-04-05 18:50:06 +03:00
Ivan Savenko
fa31e9f69b
Do not mark channel as unread when receiving chat history
2024-04-05 18:50:06 +03:00
Laserlicht
ff866bdfce
scalingMode to config
2024-04-04 21:10:49 +02:00
Dydzio
3f94d316cb
Fix cursor & add way to access danger info for HotA-like DD cursor
2024-04-01 20:18:35 +02:00
Dydzio
3bb66de551
Serverside validation, setting for terrain compatibility before cast etc
2024-04-01 18:12:38 +02:00
Dydzio
e69c096f94
Move dimension door FoW limit check to lib
2024-04-01 15:13:18 +02:00
Dydzio
70b86e5a87
Merge remote-tracking branch 'origin/develop' into dimension-door-changes
2024-03-30 10:45:00 +01:00
Ivan Savenko
dd91a99e36
Distinguish "connected but not logged in" from "not connected" state
...
Possible in case of login failure
2024-03-30 10:26:07 +02:00
Ivan Savenko
acd2352653
Merge pull request #3699 from IvanSavenko/lobby_tweaks
...
Minor tweaks for most noticeable issues with new lobby
2024-03-30 00:13:14 +02:00
Andrii Danylchenko
ca7c91e766
Merge pull request #3677 from vcmi/object-graph
...
Object graph
2024-03-29 20:39:56 +02:00
Ivan Savenko
975cf7de95
Tweaks to lobby login window to make it more clear to use
2024-03-29 17:05:41 +02:00
Ivan Savenko
8f0236f046
Move account login details from settings to persistent storage, with
...
separate entries depending on server hostname for more convenient
testing
2024-03-29 17:04:52 +02:00
SoundSSGood
cb6fc4a385
Regressions fixed
2024-03-29 16:21:59 +02:00
Evgeny Malygin
ee42527ee1
Fixes
2024-03-29 12:28:14 +02:00
Evgeny Malygin
25125f96da
Fix: licenses, pragma guards, StdInc
2024-03-29 07:48:52 +02:00
Evgeny Malygin
54405e33bc
Fix: prevent possible int16_t overflow
2024-03-29 05:37:47 +02:00
Dydzio
fe42fab2d6
Merge remote-tracking branch 'origin/develop' into dimension-door-changes
2024-03-28 18:26:21 +01:00
Andrii Danylchenko
30d9daf62c
NKAI: improve boat handling by object graph, a set of fixes
2024-03-28 13:39:15 +02:00
Ivan Savenko
1f487dab49
Merge pull request #3685 from dydzio0614/small-fixes
...
Small fixes
2024-03-28 13:17:57 +02:00
Dydzio
25f9e6a3e9
Add setting to allow previous VCMI mechanics of dimension door
2024-03-27 23:39:08 +01:00
Dydzio
048fb1867d
Merge remote-tracking branch 'origin/develop' into dimension-door-changes
2024-03-27 23:03:33 +01:00
Dydzio
38659abcb8
Fix wrong cursor assignment for uncovered tiles beyond DD range
2024-03-27 22:48:53 +01:00
Dydzio
4f0a286167
Fix checks for tile visibility in tile click/hover handlers
2024-03-27 22:06:31 +01:00
Dydzio
e0855ceb7a
Add pitch black FoW representation for dimension door range map overlay
2024-03-27 21:39:36 +01:00
Dydzio
cfe7a3cfa6
Fix some more cases of missing pathfinder cache invalidation
2024-03-27 21:17:21 +01:00
Ivan Savenko
671b61c64e
Implement various todo's and review suggestions
2024-03-27 13:10:55 +02:00
Ivan Savenko
b9cd9a5822
Open lobby when players leaves pregame menu opened via lobby
2024-03-27 13:10:55 +02:00
Ivan Savenko
73d8789f8d
(untested) activate lobby UI on 3-finger touch
2024-03-27 13:10:55 +02:00
Ivan Savenko
d700e94189
Code cleanup
2024-03-27 13:10:55 +02:00
Ivan Savenko
862f6f8c7b
Added descriptions for new buttons in pregame menu
2024-03-27 13:10:55 +02:00
Ivan Savenko
d59fb87504
Indicate rooms with active invites, fix invite acceptance
2024-03-27 13:10:55 +02:00
Ivan Savenko
69f7b3169e
UI improvements for lobby:
...
- Added notifications sounds for invites and chat messages
- Added notifications for unread chat messages in inactive channels
- Added click sound when switching between channels
- Added workaround to prevent clicks due to list recreation
- Partial support for receiving invites
2024-03-27 13:10:55 +02:00
Ivan Savenko
ace43e97b9
Added UI for inviting players into a match
2024-03-27 13:10:55 +02:00
Ivan Savenko
4dce0479ba
UI improvements for lobby screen:
...
- Show description of current chat room in header
- Show count of online accounts / active rooms
- Highlight currently selected chat room
2024-03-27 13:10:55 +02:00
Ivan Savenko
489dd781c2
Show match creation date in history
2024-03-27 13:10:55 +02:00
Ivan Savenko
b50d9de912
Show opponent name in 1-vs-1 games, minor tweaks
2024-03-27 13:10:55 +02:00
Ivan Savenko
829b754091
Implemented matches history in lobby
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
Ivan Savenko
df5af589ae
Implemented per-language, player-player and (untested) match channels.
2024-03-27 13:10:55 +02:00
Ivan Savenko
8e9caf54f2
Added all missing text alignment values
2024-03-27 13:10:55 +02:00
Ivan Savenko
5d188024db
Set room status to "In Game" once gameplay starts
2024-03-27 13:10:55 +02:00
Ivan Savenko
7c9aa9d953
Show all rooms (including private) in room list
2024-03-27 13:10:55 +02:00
Ivan Savenko
dcf35e4877
Clicking "Create New Room" button with active room now will switch to
...
game lobby UI
2024-03-27 13:10:55 +02:00
Ivan Savenko
16605a7aaa
Allow hiding global lobby UI via Shift+Tab
2024-03-27 13:10:55 +02:00
Ivan Savenko
3023db6f0f
Store and show correct player room limit in UI
2024-03-27 13:10:55 +02:00
Ivan Savenko
715e094f5c
Implemented room description display (map/template name)
2024-03-27 13:10:55 +02:00
Ivan Savenko
69236b73ca
Added player count icon and enter room icon to room widget
2024-03-27 13:10:55 +02:00
Ivan Savenko
4f34c07f22
Provide correct size to room and account lists
2024-03-27 13:10:55 +02:00
Ivan Savenko
2d37180fe2
Chat textbox now correctly positioned and uses blue slider
2024-03-27 13:10:55 +02:00
Ivan Savenko
be641d1710
Split 'loginSuccess' into server and client-specific versions
2024-03-27 13:10:55 +02:00
SoundSSGood
2cdf2b4083
fixed missed trader text
2024-03-25 17:38:43 +02:00
Ivan Savenko
83984a73c7
Merge pull request #3668 from kambala-decapitator/fix-ios
...
make iOS work again
2024-03-25 15:03:01 +02:00
SoundSSGood
c6c213c454
CMarketBase::hRight CMarketBase::hLeft removed. Final changes
2024-03-25 12:56:46 +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
ae8d70748b
Altar artifacts widget refactoring
2024-03-25 12:44:33 +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
bb7137545f
Artifacts market 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
Dydzio
807035c321
temporarily add TODO's
2024-03-25 09:21:42 +01:00
Dydzio
982e67cea8
Working version of SoD dimension door spell
2024-03-24 23:58:04 +01:00
Dydzio
96b18b1b8e
Fix possibilities to get outdated movement points info due to creature types
2024-03-24 20:19:14 +01:00
Ivan Savenko
6a5696604e
Merge pull request #3656 from SoundSSGood/backpack-management
...
Backpack management init
2024-03-24 19:09:32 +02:00
Andrii Danylchenko
3820f6f78b
NKAI: fix headless and compilation
2024-03-24 13:16:46 +02:00
Andrii Danylchenko
e66ceff154
NKAI: object graph improved and optimized
2024-03-21 12:13:36 +02:00
Andrey Filipenkov
788e9093f3
[iOS] fix app icon size, remove unused icon
2024-03-20 05:52:26 +03:00
Andrey Filipenkov
35cf227b35
[cmake] simplify 'share' files installation on Linux
2024-03-19 21:55:45 +03:00
DjWarmonger
2c9b7089ad
Merge pull request #3645 from vcmi/save_rmg_options
...
Save rmg options
2024-03-14 19:54:08 +01:00
Ivan Savenko
94ecef748b
Merge pull request #3654 from IvanSavenko/lobby_protocol
...
Lobby protocol documentation and fixes
2024-03-11 18:07:57 +02:00
Andrii Danylchenko
c9c118cff2
Merge pull request #3595 from vcmi/object-graph
...
NKAI Object graph
2024-03-10 20:26:17 +02:00
Ivan Savenko
c21e5bb0fb
Always validate messages in debug mode. Fixes for schemas
2024-03-08 16:32:40 +02:00
Ivan Savenko
456dfd9e3d
Added debug validation of lobby protocol on every send/receive
2024-03-08 16:32:40 +02:00
Ivan Savenko
5b1549200a
Renamed openGameRoom to more clear activateGameRoom
2024-03-08 16:32:39 +02:00
SoundSSGood
d7607983fc
sonarcloud warnings
2024-03-08 14:33:03 +02:00
SoundSSGood
9f688e6fb7
MoveArtifact, BulkMoveArtifacts PlayerColor player field
2024-03-07 22:28:56 +02:00
SoundSSGood
b1f52eec41
ManageBackpackArtifacts
2024-03-07 18:16:22 +02:00
SoundSSGood
d143f53d7e
using deque for hero's backpack storage
2024-03-07 18:16:21 +02:00
Tomasz Zieliński
e7af9d5607
Code review fixes, Sonarcloud fixes
2024-03-04 21:23:17 +01:00
Ivan Savenko
4b2cba96cc
Merge pull request #3646 from IvanSavenko/configurable_button
...
Configurable buttons
2024-03-04 13:34:40 +02:00
Ivan Savenko
83eb0ea28f
Merge pull request #3625 from IvanSavenko/exchange_in_town
...
Better hero exchange in town
2024-03-04 13:34:15 +02:00
Andrii Danylchenko
fb6fd63a58
NKAI: water paths in graph
2024-03-02 15:55:36 +02:00
Andrii Danylchenko
047e076d05
NKAI: visual logger
2024-03-02 15:54:05 +02:00
Tomasz Zieliński
f650072da1
Remove useless code
2024-03-01 11:46:01 +01:00
Tomasz Zieliński
35c1ef7be2
How about now?
2024-03-01 11:18:08 +01:00
Tomasz Zieliński
7df36279c5
Compile fix?
2024-03-01 11:10:40 +01:00
Tomasz Zieliński
5f95955535
Store and load last difficulty setting
2024-03-01 10:57:48 +01:00
Tomasz Zieliński
17fc1604ca
Remove unused file
2024-02-29 20:20:35 +01:00
Ivan Savenko
22f23ba6f8
Restore previously disabled functionality
2024-02-29 16:47:44 +02:00
Ivan Savenko
ddb2acb9c2
Code cleanup
2024-02-29 15:39:13 +02:00
Tomasz Zieliński
b7320bbc8a
Cleanup
2024-02-29 13:04:48 +01:00
Ivan Savenko
20008cd5a5
Replaced premade buttons on hero screen with generated ones
2024-02-29 13:57:25 +02:00
Ivan Savenko
0051ffa7a9
Implemented configurable buttons. Replaced 'animateLonelyFrame' logic.
2024-02-29 13:57:25 +02:00
Ivan Savenko
07d201502e
Refactoring of button class to prepare for configurable button
2024-02-29 13:57:25 +02:00
Tomasz Zieliński
2c32c770f7
First version that works in lobby
2024-02-29 12:45:08 +01:00
Ivan Savenko
658747d342
Code cleanup
2024-02-27 14:45:15 +02:00
Ivan Savenko
99cb1df91d
Fixes for positioning on popups with components
2024-02-27 13:15:16 +02:00
Ivan Savenko
93b3cb3af5
Better size & positioning of infoboxes
2024-02-26 22:04:30 +02:00
Ivan Savenko
ec159f2fdd
Fixed bad line breaks in starting faction description popup
2024-02-26 22:04:02 +02:00
Ivan Savenko
4b4dedeab9
Code formatting
2024-02-26 18:53:12 +02:00
Ivan Savenko
e6b339448f
Refactoring & deduplication of infowindow code
2024-02-26 18:32:15 +02:00
Ivan Savenko
658cc14cd0
Removed direct usage of SDL_Surface in info windows
2024-02-26 15:49:27 +02:00
Ivan Savenko
5419df1140
Removed no longer used class
2024-02-26 15:49:27 +02:00
Ivan Savenko
922966dcf8
Renamed JsonNode::meta to more logical modScope. Member is now private
2024-02-26 12:55:49 +02:00
Ivan Savenko
08a27663f9
Reworked JsonNode constructors to more logical form
2024-02-26 12:55:49 +02:00
Ivan Savenko
54796c7c56
Rename toJson to toString/toCompactString for consistency
2024-02-26 12:55:49 +02:00
Ivan Savenko
8647abb94b
Merge pull request #3629 from IvanSavenko/ui_generation
...
Unify graphical primitives elements
2024-02-25 15:02:06 +02:00
Ivan Savenko
bd901cb001
Replaced lines in settings with primitives
2024-02-19 16:55:07 +02:00
Ivan Savenko
82eea1abc1
Remove unused variable
2024-02-19 16:49:59 +02:00
Ivan Savenko
fe918de2df
Remove invalid assertion
2024-02-19 00:36:21 +02:00
Ivan Savenko
ef8ff00973
Unified common primitive-based UI elements
2024-02-18 22:15:31 +02:00
Ivan Savenko
14e3c762c0
Fix slot selection in markets
2024-02-18 21:18:55 +02:00
Ivan Savenko
8b60275a6e
Hero exchange in town is now activated by clicking on hero portrait
2024-02-18 21:02:24 +02:00
Ivan Savenko
af671d109f
Made graphical primitive-based UI more configurable
2024-02-18 20:48:45 +02:00
Ivan Savenko
110ef5f66e
Merge pull request #3614 from IvanSavenko/sonarcloud_fixes_2
...
Sonarcloud fixes 2
2024-02-14 16:44:58 +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
c23953eac5
Remove custom casts
2024-02-14 12:56:37 +02:00
Ivan Savenko
7359b66f99
Do not use floating point equality checks
2024-02-14 12:07:07 +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
Alexander Wilms
c65794b9e3
Fix typos
2024-02-13 15:23:30 +01:00
Ivan Savenko
bfdb9a85f0
Merge pull request #3611 from IvanSavenko/lobby_fixes
...
Networking code fixes
2024-02-13 15:30:26 +02:00
Ivan Savenko
7c34d48258
Minor fixes and corrections to network-related code. No functionality
...
changes.
2024-02-12 18:57:20 +02:00
Ivan Savenko
74f9b03516
Fix crash on closing client while server is active
2024-02-12 16:36:13 +02:00
Ivan Savenko
62148e1506
Fix build
2024-02-12 15:08:46 +02:00
Ivan Savenko
4c70abbeb5
Reduced usage of global variables - removed or made const / constexpr
2024-02-12 13:49:45 +02:00
Ivan Savenko
6e399eb21a
Make some non-const static variables const or constexpr
2024-02-12 13:22:54 +02:00
Ivan Savenko
392c360f88
Replaced some usages of void * with more clear CPack *
2024-02-12 12:53:10 +02:00
Ivan Savenko
b796ed8626
Fix undefined behavior
2024-02-12 12:33:09 +02:00
Ivan Savenko
c577ea3e8d
Fix potentially uninitialized values
2024-02-12 12:31:27 +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
cded8b1999
Show human-readable thread name in log
2024-02-11 17:55:02 +02:00
Ivan Savenko
0fc0ad238b
Fixes for server shutdown logic, implemented connection aborting for
...
local server
2024-02-11 17:55:02 +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
ef8eb330d6
Merge branch 'develop' into random_template_description
2024-02-11 17:54:18 +02:00
Ivan Savenko
38ba42ef7a
Rename 'c' to 'logicConnection'
2024-02-11 16:26:27 +02:00
Ivan Savenko
f2ecd4cf11
Merge branch 'develop' into 'lobby'
2024-02-11 16:13:13 +02:00
Ivan Savenko
a3462acac3
Merge pull request #3602 from Laserlicht/campaignExtraButton
...
Campaign extra options button
2024-02-11 12:27:14 +02:00
Alexander Wilms
522cb571b3
Remove redundant virtual specifiers
...
`grep -nr virtual | grep -v googletest | grep override > ../redundant_virtual.txt`
```python
import os
with open("../redundant_virtual.txt") as f:
for line in f:
print()
line: str = line.strip()
print(line)
tmp = line.split(":")
file = tmp[0].strip()
code = tmp[-1].strip()
print(file)
print(code)
new_code = code.replace("virtual ", "", 1)
# https://superuser.com/a/802490/578501
command = f"export FIND='{code}' && export REPLACE='{new_code}' && ruby -p -i -e \"gsub(ENV['FIND'], ENV['REPLACE'])\" {file}"
os.system(command)
```
2024-02-10 20:46:13 +01:00
Ivan Savenko
1a144fc516
Some progress on private rooms support
2024-02-10 19:02:25 +02:00
Ivan Savenko
4a0dd2da2c
Added option to create new account even if player already have one
2024-02-09 23:02:41 +02:00
Laserlicht
4e8152f268
reorder gui
2024-02-07 22:04:50 +01:00
Laserlicht
c8b6d6a684
add extra button for campaigns
2024-02-07 21:40:56 +01:00
Ivan Savenko
b319d16de6
Merge pull request #3597 from IvanSavenko/bugfixing
...
Fixes for map/save loading
2024-02-07 00:16:43 +02:00
Ivan Savenko
c068c92c92
Merge pull request #3201 from Alexander-Wilms/fix-huge-texture-crash
...
Fix broken intro and crash when resizing window
2024-02-07 00:16:15 +02:00
Ivan Savenko
87059be67b
Added range checks to values read from h3m.
...
Fixes reading of morale/luck values (-3..3) as unsigned leading to
overflow.
2024-02-05 21:27:55 +02:00
Alexander Wilms
0495c52cf4
Don't call ScreenHandler::onScreenResize() when the window has been (un)maximized to avoid creating a huge texture and crashing
2024-02-05 18:59:55 +01:00
Ivan Savenko
156f1d9311
Merge pull request #3589 from Laserlicht/queue_adjust
...
adjustable queue size for embedded queue
2024-02-05 18:44:45 +02:00
Ivan Savenko
8cd6832297
Handle errors from global lobby on client
2024-02-04 21:23:21 +02:00
Ivan Savenko
d4bedd8d8d
Fixed handling of match server crash
2024-02-04 19:58:09 +02:00
Ivan Savenko
7dee24edae
Cleanup
2024-02-03 23:30:16 +02:00
Ivan Savenko
1b6ac1052a
Properly lock UI mutex on accessing GUI state from network thread
2024-02-03 22:24:32 +02:00
Ivan Savenko
80fc2bb695
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-02-03 21:11:34 +02:00
Ivan Savenko
bd4c7e3ac0
Added LobbyPrepareStartGame pack to replace old workarounds
2024-02-03 19:57:23 +02:00
Ivan Savenko
2c2bec791c
Fixes and cleanup of game client network shutdown and restart
2024-02-03 19:27:04 +02:00
Tomasz Zieliński
b7df6064cd
Add random map description and display it in RMG menu
2024-02-03 16:23:56 +01:00
Ivan Savenko
03fcfe3392
Use std::byte in serializer
2024-02-02 13:09:12 +02:00
Alexander Wilms
caa22ad9d8
Don't call recreateWindowAndScreenBuffers() in ScreenHandler::onScreenResize() to fix crash due to a huge texture being created
2024-02-02 08:52:59 +01:00
Ivan Savenko
29c0989849
Use std::byte to manage network data
2024-02-02 02:02:09 +02:00
Ivan Savenko
c12558bf8a
Simplified code
2024-02-02 01:26:53 +02:00
Ivan Savenko
c9ebf32efd
Send error messages if operation fails
2024-02-02 00:12:30 +02:00
Ivan Savenko
58ee72f684
Merge pull request #3588 from IvanSavenko/fix_regressions
...
Fix regressions
2024-02-01 22:27:52 +02:00
Ivan Savenko
7247038458
Merge pull request #3574 from SoundSSGood/altar-fixes
...
Artifacts altar related fixes
2024-02-01 22:27:41 +02:00
Laserlicht
5e3f0e631c
possibility to show small queue outside
2024-02-01 21:17:08 +01:00
Laserlicht
25188aead8
change config name
2024-02-01 20:50:58 +01:00
Laserlicht
aa2fc4b88a
adjustable queue size for embedded queue
2024-02-01 20:38:38 +01:00
Ivan Savenko
46fe6c1b09
Fixed crash on missing campaign audio files
2024-02-01 18:08:01 +02:00
SoundSSGood
a42b60feb9
suggested changes
2024-02-01 13:28:08 +02:00
Ivan Savenko
facdc9f993
Merge pull request #3583 from Laserlicht/town_portal
...
town portal dialog adjustments
2024-02-01 11:30:51 +02:00
Laserlicht
9e7fbc3ca2
use localstate
2024-01-31 21:29:04 +01:00
Laserlicht
9cd6a6838b
fix
2024-01-31 11:32:35 +01:00
Laserlicht
ebb2cce8b8
rework town portal
2024-01-31 02:30:10 +01:00
Ivan Savenko
a9866bb5c6
Added RandomGeneratorUtil::nextItemWeighted convenience method
2024-01-31 00:17:40 +02:00
Ivan Savenko
7992144763
Gem class is now Sorceress
2024-01-30 23:34:27 +02:00
Ivan Savenko
3abc26e789
Moved checks for campaign heroes to CGHeroInstance class
2024-01-30 23:33:58 +02:00
Ivan Savenko
c5c46a7c9a
Implemented connecting to server via proxy
2024-01-30 21:31:41 +02:00
Ivan Savenko
5d8b65befd
Merge pull request #3575 from Laserlicht/infobox_pos
...
fix infobox position while disabling
2024-01-30 17:36:30 +02:00
Ivan Savenko
26703af8b0
Merge pull request #3576 from Alexander-Wilms/conditional-screen-clearing
...
CVideoHandler: Call SDL_RenderClear() when playing intro, call SDL_Re…
2024-01-30 17:36:18 +02:00
Ivan Savenko
9051cd9654
Merge pull request #3569 from Laserlicht/end_autocombat
...
instant finish of battle with autocombat
2024-01-30 17:34:56 +02:00
Ivan Savenko
48006307e1
Merge pull request #3563 from Laserlicht/quick_combat
...
quick combat vs ai
2024-01-30 17:33:34 +02:00
SoundSSGood
d16632b54c
cleanup & fix build & sonarcloud fixes
2024-01-30 01:23:50 +02:00
Laserlicht
1124b43d91
check tactic side
2024-01-29 21:52:11 +01:00
Laserlicht
4aaebc834e
Merge branch 'develop' into end_autocombat
2024-01-29 21:36:11 +01:00
Laserlicht
7cc004e139
code review
2024-01-29 21:33:20 +01:00
Laserlicht
7ddc87f4a2
removed unused param; optimized pos
2024-01-29 21:11:18 +01:00
Alexander Wilms
6085893c0d
CVideoPlayer: Make overlay an argument of playVideo() instead of an attribute
2024-01-29 20:27:00 +01:00
Alexander Wilms
70ce090bc4
CVideoHandler: Use EVideoType::INTRO and EVideoType::SPELLBOOK
2024-01-29 16:08:53 +01:00
Ivan Savenko
dc2f8cb81d
Merge pull request #3553 from Laserlicht/sync_subtitle
...
sync subtitle with audio
2024-01-29 12:54:43 +02:00
Alexander Wilms
33e170d562
CVideoHandler: Call SDL_RenderClear() when playing intro, call SDL_RenderFillRect() for spellbook animation
2024-01-28 22:53:51 +01:00
Ivan Savenko
bed05eb52d
WIP: Implemented joining public rooms
2024-01-28 00:04:54 +02:00
Laserlicht
36881c226f
fix infobox position while disabling
2024-01-27 22:08:15 +01:00
SoundSSGood
c6ca6ad835
sacrifice routine
2024-01-27 23:01:57 +02:00
Laserlicht
0225590bb5
add info for not implemented replay; reorder button code; fix exit position
2024-01-27 17:36:19 +01:00
Laserlicht
cad0d5db16
consider unlimited replay (or not)
2024-01-27 15:02:03 +01:00
Laserlicht
3e71cbcc39
Block feature is battle against human
2024-01-27 14:35:54 +01:00
SoundSSGood
f66918ea14
bulk move to altar
2024-01-27 15:28:23 +02:00
SoundSSGood
652f009181
arts altar - arts holder
2024-01-27 15:28:21 +02:00
Laserlicht
a2fd5039ab
setting
2024-01-27 01:16:55 +01:00
Laserlicht
e8c541f873
end with auto combat
2024-01-26 23:15:56 +01: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
Laserlicht
c426382687
Apply suggestions from code review
...
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2024-01-26 20:09:17 +01:00
Ivan Savenko
eaca128c99
Code cleanup
2024-01-26 19:15:57 +02:00
Ivan Savenko
322c5faf63
Merge remote-tracking branch 'vcmi/develop' into lobby
2024-01-26 16:52:23 +02:00
