Ivan Savenko
9e11b8f38a
Fixes for creature rendering order
2022-11-28 22:35:38 +02:00
Ivan Savenko
f5f719b78e
Enabled -Wmismatched-tags warning for gcc/clang since this apparently
...
lead to MSVC linker error
2022-11-28 21:46:24 +02:00
Ivan Savenko
95e6035a23
Attempt to fix MSVC compilation
2022-11-28 21:44:16 +02:00
Ivan Savenko
a0157d6117
replaced C array with std::array
2022-11-28 21:20:46 +02:00
Ivan Savenko
6f6d350228
Formatting cleanup
2022-11-28 16:43:38 +02:00
Ivan Savenko
3e58d1e3c5
Merge remote-tracking branch 'refs/remotes/vcmi/develop' into battleint_refactor
2022-11-28 16:10:13 +02:00
Ivan Savenko
7c4e04c1ec
Refactoring/cleanup of classes in CBattleAnimations.cpp
2022-11-28 16:02:46 +02:00
Ivan Savenko
8a059301d2
Fix blitting order of battlefield objects
2022-11-27 23:42:18 +02:00
Ivan Savenko
055824654e
(partially) fix catapult explosion effect
2022-11-27 23:26:28 +02:00
Ivan Savenko
9f21569a79
Next batch of siege fixes
2022-11-27 22:50:18 +02:00
Ivan Savenko
35576834c9
Fixing sieges, part 1
2022-11-27 20:21:51 +02:00
Ivan Savenko
b5d1cb4996
Fixes for projectile playback. TODO: check catapult projectile
2022-11-27 17:24:45 +02:00
Ivan Savenko
15b588b164
Fix stack reactivation leading to broken spellcasting
2022-11-27 15:10:27 +02:00
Andrii Danylchenko
3b072b80d5
Merge pull request #1168 from Nordsoft91/fix-obstacles-generation
...
Fix obstacles generation
2022-11-27 09:56:11 +02:00
Andrii Danylchenko
dfee2eda68
Merge pull request #1148 from SoundSSGood/ask-assemble
...
Feature to assemble/disassemble arts in backpack
2022-11-27 09:48:57 +02:00
Andrii Danylchenko
f04bd02df1
Merge pull request #1163 from Nordsoft91/fix-camp-multiclick
...
Prevent multiple clicking for start campaign
2022-11-27 09:25:05 +02:00
Ivan Savenko
e76cd1b6a7
Bugfixing: fix crashes on battle start & most noticeable glitches
2022-11-27 02:26:02 +02:00
Ivan Savenko
0cae259f53
Most of rendering in BattleInt is done via canvas
...
- refactoring of CBattleStacksController.cpp
- moved EAlignment enum to Geometries.h from CIntObject
- renamed EAlignment to ETextAlignment, to avoid conflict with good/evil
alignemt
- ETextAlignment is now enum class
2022-11-26 23:12:20 +02:00
nordsoft
8e324603bf
Remove extra lines
2022-11-27 00:08:47 +04:00
nordsoft
2c88e35749
Fix obstacles generation
2022-11-27 00:04:14 +04:00
Ivan Savenko
4f91b062db
Refactoring of projectile controller
...
- projectiles now separated based on type
- each type has its own rendering method
- refactoring of CShootingAnimation
2022-11-25 16:32:23 +02:00
nordsoft
41e652dad2
Move buttons blocks at proper place
2022-11-25 14:36:17 +04:00
nordsoft
ebb65b5d0e
Prevent multiple clicks
2022-11-25 14:26:59 +04:00
Ivan Savenko
abb553d975
Next step of code refactoring:
...
- refactoring of CBattleFieldController code (except for 2 arcane
methods)
- introduced class CCanvas for encapsulated rendering surface
- battleint rendering is now partially done with CCanvas
- removed unused includes of CBitmapHandler
2022-11-25 11:46:47 +02: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
Ivan Savenko
6b3beb05e5
BattleInt split is finished, start of refactoring:
...
- Refactoring of siege controller code
- Replaced some usages of C struct SDL_Surface with proper c++ class
IImage
- Refactoring of rendering of battlefield objects (WIP)
2022-11-25 00:26:14 +02:00
Ivan Savenko
cb6fe1eedf
Moved battle effects into a new class
2022-11-24 16:30:04 +02: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
Ivan Savenko
02fe0425c7
Moved battle actions handling into a separate class
2022-11-20 22:56:42 +02:00
Ivan Savenko
b01737daf2
Moved stacks & animations handling into a separate class
2022-11-20 19:11:34 +02:00
SoundSSGood
584f6a6230
Update lib/CArtHandler.cpp
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-20 10:15:57 +02:00
SoundSSGood
4b52d38c57
artifact assemble fixed
2022-11-19 16:35:06 +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
SoundSSGood
e6e669d024
ArtifactUtils::isSlotBackpack() func + refactoring
2022-11-18 23:13:44 +02:00
Nordsoft91
fef3b7652b
Update BitmapHandler.cpp
2022-11-19 01:02:18 +04:00
SoundSSGood
30bbb57619
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
2022-11-18 22:15:03 +02: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
