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

14777 Commits

Author SHA1 Message Date
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
Ivan Savenko
6eef197cea Removed no longer used mutexes from match server 2024-02-03 17:04:14 +02:00
DjWarmonger
cb841e2e02
Merge pull request #3592 from godric3/map-editor-fixes
Map editor - fix submod list and mine resources
2024-02-03 13:13:19 +01:00
godric3
ec735aa959 Fix mine resource and productivity on map load, also made them non editable 2024-02-03 11:30:09 +01:00
godric3
b2cd92d937 Fix initializing map editor mod settings with more than one level of submods 2024-02-03 10:36:47 +01:00
Ivan Savenko
f97ffd8e9a Better handling of disconnects, code cleanup 2024-02-02 15:32:06 +02:00
Ivan Savenko
03fcfe3392 Use std::byte in serializer 2024-02-02 13:09:12 +02: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
ad547fcae0 Added basic logging 2024-02-02 00:21:52 +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
Ivan Savenko
64347a46c9
Merge pull request #3585 from IvanSavenko/changelog_january
Updated changelog
2024-02-01 22:25:38 +02:00
Ivan Savenko
dabb719c5f
Merge pull request #3586 from Alexander-Wilms/ci-badge
Readme: Point CI badge to runs that were triggered by a push to the d…
2024-02-01 18:48:08 +02:00
Ivan Savenko
b25d4d76a7 Fix Grail digging success message 2024-02-01 18:22:11 +02:00
Ivan Savenko
e66a982c96 Fix backpack availability check in Grail digging 2024-02-01 18:21:54 +02:00
DjWarmonger
ca3225325b
Merge pull request #3587 from vcmi/dydzio0614-patch-1
Replace VCMI 1.4.4 download badge with 1.4.5
2024-02-01 17:09:15 +01:00
Ivan Savenko
46fe6c1b09 Fixed crash on missing campaign audio files 2024-02-01 18:08:01 +02:00
Dydzio
5209e5ffa2
Replace VCMI 1.4.4 download badge with 1.4.5 2024-02-01 14:06:56 +01:00
Alexander Wilms
4197c82f43
Readme: Point CI badge to runs that were triggered by a push to the develop branch 2024-02-01 13:45:55 +01:00
SoundSSGood
a42b60feb9 suggested changes 2024-02-01 13:28:08 +02:00
Ivan Savenko
1860dcf97c Updated changelog to include recent changes 2024-02-01 11:43:59 +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
Ivan Savenko
f329bfbe71
Merge pull request #3582 from IvanSavenko/campaign_fixes
Campaign fixes
2024-02-01 11:30:38 +02:00
Laserlicht
9e7fbc3ca2
use localstate 2024-01-31 21:29:04 +01:00
Ivan Savenko
0949160fed
Merge pull request #3580 from Alexander-Wilms/run-ci-on-push-to-develop
Run CI on every push to develop branch instead of on a schedule
2024-01-31 22:18:02 +02:00
Ivan Savenko
626087ab14
Merge pull request #3561 from MnHebi/develop
Try to improve VCAI building build order
2024-01-31 21:48:36 +02:00
Ivan Savenko
290cc1510b Added text container with map translations to campaign state
Fixes missing translations for heroes names customized on maps after
their transfer to next scenario
2024-01-31 20:01:24 +02:00
Ivan Savenko
5c5fb523a4 Implemented transfer of artifacts held by non-transferred heroes 2024-01-31 19:32:59 +02:00
Ivan Savenko
6d0803dab6 Fixed decompression of slayer.h3c from french version from gog.com 2024-01-31 16:41:42 +02:00
Ivan Savenko
049c352511 Added loss condition "lose part of Angelic Alliance" to Yog campaign 2024-01-31 12:52:16 +02:00
Ivan Savenko
709d05205d Yog will now receive Angelic Alliance in his campaign 2024-01-31 12:42:02 +02: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
2e4895766a Implemented tracking of objects destroyed by players 2024-01-31 01:37:33 +02:00
Ivan Savenko
ccea7fc1fb Yog will now only get Attack or Defence on leveling up 2024-01-31 00:18:10 +02: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
Alexander Wilms
5222495701 Run CI on every push to develop branch instead of on a schedule
Also remove logic to skip CI if it already ran for the same commit

This prevents the CI badge in the README from showing a failure due to a skipped CI run and
results in more up-to-date ccache caches for each PR's initial CI run
2024-01-30 20:51:27 +01: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