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
krs
82c1bb5c93
ExtractionOptions extractionOptions is no longer global in mainwindow.h
2022-11-27 19:35:11 +02:00
krs
7aa30a5d7a
Fixed extractionOptions formatting.
2022-11-27 19:35:11 +02:00
krs
ea2fe78776
(char*)&data[0] changed to (char*)data.data()
2022-11-27 19:35:11 +02:00
krs
c32cd190f2
ResourceExtractor code moved to a static class.
2022-11-27 19:35:11 +02:00
krs
8377944fd1
ExtractionOptions removed from MainWindow Class
2022-11-27 19:35:11 +02:00
krs
9b3cab1181
IVCMIDirs::userExtractedPath() created
2022-11-27 19:35:11 +02:00
krs
6130776fe4
removed one too many implementation of extractToFolder.
...
changed parameter 2 from CFileInputStream to CInputStream
2022-11-27 19:35:11 +02:00
krs
14b031118c
exportBitmaps now uses QT libs
2022-11-27 19:35:11 +02:00
krs
ec1a995218
export bitmaps now by default prepends def name to exported PNG
2022-11-27 19:35:11 +02:00
krs
cbd3dffb7c
Reverted changes in CAnimation.h and .cpp
2022-11-27 19:35:11 +02:00
krs
75b4b64b6f
Final checks according to review
2022-11-27 19:35:11 +02:00
krs
31b7a81cd2
Data types in CArchiveLoader::extractToFolder() made more simple.
2022-11-27 19:35:10 +02:00
krs
d516a5f529
More changes following review.
2022-11-27 19:35:10 +02:00
krs
f0b66b6192
Animation.cpp fixes after review
2022-11-27 19:35:10 +02:00
krs
221a9e14b9
Linux Compile Fix: ../../lib/filesystem/CArchiveLoader.cpp:236:52: error: invalid initialization of non-const reference of type 'std::unique_ptr<CInputStream>&' from an rvalue of type 'std::unique_ptr<CInputStream>'
2022-11-27 19:35:10 +02:00
krs
62e479ae16
Linux Compile Fix: removed old code related to std::locale
2022-11-27 19:35:10 +02:00
krs
eecaa20693
Resource extractor "enablers" are now command line options
...
In VCMI_lib the extractArchives will be passed all the way down the call chain!
2022-11-27 19:35:10 +02:00
krs
cca1f074bf
Convert PCX to PNG, Final touches, everything deactivated.
2022-11-27 19:35:10 +02:00
krs
d1cdd7d59f
Reverted changes made in client for Extractor
2022-11-27 19:35:10 +02:00
krs
10ec486251
Extractor moved to Editor
2022-11-27 19:35:10 +02:00
krs
93cf2682f3
Working Extractor, DefSplitter and pcx convertor
2022-11-27 19:35:10 +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
nordsoft
b9ef95be3e
Extend protocol
2022-11-27 05:35:05 +04:00
Ivan Savenko
e76cd1b6a7
Bugfixing: fix crashes on battle start & most noticeable glitches
2022-11-27 02:26:02 +02:00
nordsoft
63a402a7fa
Some ui improvements
2022-11-27 03:41:06 +04: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
