nordsoft
e865f484ff
Fix some problems with network game
2022-11-30 00:10:40 +04:00
nordsoft
bdc59b18dd
Fix parameter name
2022-11-25 18:40:14 +04:00
nordsoft
44e469a2c7
Merge branch 'develop-upstream' into battle-dialog
2022-11-25 14:38:49 +04:00
Andrii Danylchenko
0ccb706782
Merge pull request #1155 from Nordsoft91/fix-camp-919
...
Fix for #919
2022-11-25 11:43:25 +02:00
Andrii Danylchenko
23c5aa95c6
Merge pull request #1159 from Nordsoft91/fix-mods-update
...
Fix mods updating
2022-11-25 10:02:48 +02:00
Andrii Danylchenko
59063a310b
Merge pull request #1160 from Nordsoft91/dwelling-accumulate
...
Change default value for DWELLINGS_ACCUMULATE_CREATURES
2022-11-25 10:01:34 +02:00
nordsoft
8f938c7c9b
Change default value for DWELLINGS_ACCUMULATE_CREATURES
2022-11-25 03:41:14 +04:00
nordsoft
e9e172164c
Implemented correct logic for battle queries
2022-11-25 03:02:34 +04:00
nordsoft
f785525508
Fix mods updating
2022-11-23 21:34:05 +04:00
Andrii Danylchenko
eed9de2ff5
Merge pull request #1154 from IvanSavenko/music_player_fixes
...
Minor improvements & fixes to music player
2022-11-23 15:20:20 +02:00
nordsoft
b3cdcc774e
Fix appearance for camp heroes
2022-11-23 14:34:57 +04:00
Andrii Danylchenko
e31beafa17
#1100 - fix visiting allied dwellings
2022-11-23 02:40:56 +04:00
nordsoft
aead3854b9
Fix for campaign advance
2022-11-23 02:06:43 +04:00
Ivan Savenko
8e6193ad6e
Actually use new locale for filesystem access
2022-11-21 16:58:36 +02:00
Ivan Savenko
e6afd8621c
Minor improvements & fixes to music player
...
- music will be selected correctly after rapid leaving and reentering
town screen
- music sets are now store as single std::map instead of unnecessary
"map of maps"
- fixed computation of resume time for restarted/looped music tracks
- updated & clarified some comments
- converted C functions for SDL_Mixer callbacks into lambdas
- formatting fixes
2022-11-21 16:20:20 +02:00
Ivan Savenko
61eca7e3be
Hotfix: erase stored music position once it has been used
...
Fixes infinite loop on attempts to resume music track from position
larger than music duration
2022-11-20 23:42:50 +02:00
Nordsoft91
4912f4d5ae
Merge pull request #1151 from Nordsoft91/editor-fix-imageload
...
Fix loading images which aren't divided by 4
2022-11-19 15:08:55 +04:00
Andrii Danylchenko
7ae35b95a3
Merge pull request #1149 from Nordsoft91/fix-crash-3234
...
Fix #3234
2022-11-19 12:40:43 +02:00
Nordsoft91
640ebcdca4
Update BitmapHandler.cpp
2022-11-19 01:52:21 +04:00
Nordsoft91
fef3b7652b
Update BitmapHandler.cpp
2022-11-19 01:02:18 +04:00
nordsoft
3e7e29c714
Fixes for pcx
2022-11-19 00:09:28 +04:00
nordsoft
0d9f7d15a2
Fix typo
2022-11-19 00:02:08 +04:00
nordsoft
7bac01f10a
More fixes on image loader
2022-11-19 00:01:48 +04:00
nordsoft
3a913140fd
Fix loading images
2022-11-18 23:26:19 +04:00
nordsoft
625c18a889
Fix #3234
2022-11-18 04:05:35 +04:00
Ivan Savenko
0b7edd471c
Merge pull request #1128 from IvanSavenko/movement_fix
...
Fix #1088 - Refactoring of hero movement animation code
2022-11-17 13:05:15 +02:00
Nordsoft91
1893212abb
Merge pull request #1146 from IvanSavenko/ray_projectile
...
Implemented ray-like projectiles for shooters
2022-11-16 22:45:00 +04:00
Ivan Savenko
b3067c0e3f
Attemts to improve timing of ranged attacks:
...
- when computing number of steps/frames to display projectile round to
nearest instead of rounding down
- end projectile animation only *after* last step was shown
2022-11-16 17:53:40 +02:00
Ivan Savenko
3771080a45
Merge pull request #1145 from vcmi/master_debian_build
...
Fixes building .deb packages on Launchpad PPA
2022-11-16 12:32:16 +02:00
Ivan Savenko
d1c95204c5
Code formatting
2022-11-16 12:29:07 +02:00
Ivan Savenko
48be492517
Fix parameter order in case of right-to-left lines, formatting
2022-11-16 12:28:07 +02:00
Ivan Savenko
9afc1eed49
Expanded schema to validate ray configuration
2022-11-16 12:26:56 +02:00
Ivan Savenko
1bdc4240d1
Remove unused include
2022-11-16 12:16:23 +02:00
nordsoft
b253b19dc3
Support draw scenario (doesnt work properly)
2022-11-16 02:50:47 +04:00
Ivan Savenko
6678a747bb
Implemented ray-like projectiles for shooters
...
- Added missing support for ray-like projectiles
- Archmages, Evil Eyes and Beholders now use ray for shooting
- New method to draw 1 pixel-wide line with color gradient at arbitrary
angle
- fixed incorrect attackClimaxFrame field for Archmages
2022-11-15 21:42:16 +02:00
nordsoft
9b597fc8d4
Merge remote-tracking branch 'upstream/develop' into battle-dialog
2022-11-15 23:08:20 +04:00
Andrii Danylchenko
6974d4ea53
Merge pull request #1130 from IvanSavenko/banned_skills_fix
...
Fixes #1096 - do not propose banned skills on levelup
2022-11-15 09:32:12 +02:00
Andrii Danylchenko
8b964be71f
Merge pull request #1111 from GermanAizek/develop
...
Code refactor and fix condition bug
2022-11-15 09:23:16 +02:00
lainon
7fdad4e0f6
Code refactor following C++ standard and condition fixes
2022-11-15 03:20:55 +03:00
Ivan Savenko
729357824b
Added common method for secondary skill availability checks
2022-11-14 19:08:49 +02:00
Andrii Danylchenko
b6bcfec329
Merge pull request #1129 from IvanSavenko/new_day_sound_fix
...
Fixes #825 - do not wait for new week dialog in single-player
2022-11-14 17:45:57 +02:00
Ivan Savenko
e06db2365d
Fixes #1096 - do not propose banned skills on levelup
...
Remove possibility to get banned skill on levelup as "obligatory skill"
if all other such skills have been learned before.
May happen under some conditions, e.g. if hero quickly learns other
magic schools - in witch hut/university, leading to case where banned
skill is the only obligatory skill that can be offered on levelup
2022-11-14 17:16:49 +02:00
Ivan Savenko
4fe8ff9b01
Fixes #825 - do not wait for new week dialog in single-player
2022-11-14 15:53:07 +02:00
Ivan Savenko
153315e8c3
Refactoring of hero movement animation code
...
Replaced ancient and obscure code that had separate routines for each
possible movement direction with generic version.
Fixes #1088 which apparently was due to bug in one of these routines
2022-11-14 12:32:40 +02:00
Ivan Savenko
c5c2f0ffb9
Added Lua library to Debian dependencies
2022-11-14 12:12:03 +02:00
Andrii Danylchenko
86972d7164
Merge pull request #1112 from SoundSSGood/bulk-move-swap-artifacts-rev2
...
Bulk move and swap artifacts rev2
2022-11-14 08:31:48 +02:00
Andrii Danylchenko
38f36fa720
Merge pull request #1127 from IvanSavenko/resume_music
...
Fix #985 - resume town & terrain themes
2022-11-13 21:18:46 +02:00
Ivan Savenko
6388b73204
Typo in library name
2022-11-13 20:46:17 +02:00
Ivan Savenko
2f0225600a
Update .deb packaging data
2022-11-13 20:46:02 +02:00
SoundSSGood
98bf6931a1
cosmetic correction
2022-11-13 19:01:28 +02:00