nordsoft
1d4209d97e
Continue refactoring
2022-12-16 00:57:10 +04:00
nordsoft
2371e3e9a2
Interface builder refactored
2022-12-16 00:46:36 +04:00
nordsoft
2fe951f819
Merge remote-tracking branch 'upstream/develop' into interface-builder
...
# Conflicts:
# client/lobby/RandomMapTab.cpp
2022-12-15 04:47:11 +04:00
nordsoft
4c3288dd61
Fix teams
2022-12-14 05:45:50 +04:00
nordsoft
fc7f1dbc5a
Fix template selection
2022-12-14 05:23:21 +04:00
nordsoft
53b2f68560
Serialize template
2022-12-14 04:37:11 +04:00
Ivan Savenko
155f776ae8
Merge pull request #1172 from IvanSavenko/battleint_refactor
...
[1.2] Refactoring of BattleInterface class
2022-12-13 21:31:18 +02:00
Ivan Savenko
d94076c618
Fix msvc build
2022-12-13 16:54:49 +02:00
Ivan Savenko
55d0f0ad9f
Fixed infinite loop
2022-12-13 15:17:42 +02:00
Ivan Savenko
99e5569ab5
Changes according to review
2022-12-13 15:10:31 +02:00
Ivan Savenko
264f5c91e8
Applied suggestions from review
2022-12-13 13:58:16 +02:00
nordsoft
1e2abae62b
Template selections works
2022-12-13 04:38:18 +04:00
nordsoft
f90cb1be90
Template list prototype looks fine
2022-12-13 03:47:29 +04:00
Ivan Savenko
602e52127b
Cleaned up forward declarations
2022-12-12 18:26:04 +02:00
Ivan Savenko
d40d5250b7
changes to status bar according to review comments:
...
- renamed IStatusBar API to more clear names
- removed "locking" of status bar
- added comments for IStatusBar API
- removed dynamic_casts to CGStatusBar, now IStatusBar API is fully
sufficient
2022-12-12 18:23:41 +02:00
nordsoft
690ff773f4
Remove files
2022-12-12 11:53:23 +04:00
nordsoft
cd58e8a860
Rename InterfaceBuilder
2022-12-12 11:48:39 +04:00
nordsoft
34bf741936
Fix compilation error
2022-12-12 11:43:54 +04:00
nordsoft
5e3504f578
Add improvements
2022-12-12 11:38:27 +04:00
nordsoft
8dbc5c1c1f
Make each windows coniguration in separate file
2022-12-12 04:52:44 +04:00
nordsoft
b3d60ec418
Add new map sizes
2022-12-12 04:46:42 +04:00
nordsoft
3be9969154
Prevent crashes for custom config
2022-12-12 03:58:39 +04:00
nordsoft
0104c77d61
Interface builder for random map tab
2022-12-12 03:27:59 +04:00
Ivan Savenko
1558c28c0a
Fix obstacle rendering
2022-12-12 00:05:00 +02:00
Ivan Savenko
c302efd315
Fix crash on accessing not yet created object
2022-12-12 00:04:46 +02:00
Ivan Savenko
ac839ad26a
Changes to rest of the code according to review:
...
- renamed status bar method clearMatching -> clearIfMatching
- renamed class ColorShifterAddMul -> ColorShifterMultiplyAndAdd
- fixed missing return from function
- fixed potential access to deleted object
2022-12-11 23:43:43 +02:00
Ivan Savenko
49a6d056d9
Changes for BattleInterface classes according to code review:
...
- added documentation comments for classes, members and methods
- added const specifier to methods where applicable
- renamed some methods with more clear name
- removed some commented-out or unused code
2022-12-11 23:16:23 +02:00
Ivan Savenko
7f5e5259c8
Changes to Canvas class according to review:
...
- renamed CCanvas -> Canvas.cpp
- replaced shared_ptr<Canvas> with Canvas&
- removed getSurface method
2022-12-11 22:09:57 +02:00
Ivan Savenko
c855823528
Renamed files in client/battle to match new names of classes
2022-12-09 13:38:46 +02:00
Ivan Savenko
3f9a0a855e
Renamed most of classes in client/battle directory to match current code
...
style
2022-12-09 13:26:17 +02:00
krs
ed70c69a2b
extractToFolder fix with entry.offset is set to 0
2022-12-08 02:52:30 +04:00
krs
35db24a443
Reverted extractToFolder() for texts, to old stand alone version.
2022-12-08 02:52:30 +04:00
Ivan Savenko
a06d7ec80e
Fix Armaggeddon visual effect
2022-12-06 14:29:31 +02:00
Ivan Savenko
3c037ed620
Fix spellcaster animations
2022-12-06 14:12:13 +02:00
Ivan Savenko
f247a98373
Fix non-siege battles
2022-12-06 14:11:37 +02:00
Ivan Savenko
2c05f588fd
Moved CBattleRenderer into a separate file
2022-12-06 13:41:29 +02:00
Nordsoft91
923d4e6e6b
Merge pull request #1205 from krs0/feature/PCX_file_conversion_in_Resource_Extractor_throws_exception_on_IOS_(boost__locale_stuff)
...
PCX file conversion in Resource Extractor throws exception on IOS (boost::locale stuff)
2022-12-06 04:38:27 +04:00
krs
117496cb23
PCX file conversion in Resource Extractor throws exception on IOS (boost::locale stuff)
2022-12-06 00:49:39 +02:00
Ivan Savenko
1b4c5be4de
Implemented proper rendering order generation for battlefield objects
2022-12-02 17:49:38 +02:00
Andrii Danylchenko
fd21f9ead2
Merge pull request #1180 from vcmi/beta
...
allow uploading beta to build server
2022-12-02 11:47:19 +02:00
Andrii Danylchenko
c7510cb8ae
allow uploading beta to build server
2022-12-02 09:23:06 +02:00
Andrii Danylchenko
d9c4b28ccc
Merge pull request #1177 from IvanSavenko/fix_mod_identifiers
...
Fix mod identifiers registration & incorrect mod validation
2022-12-02 09:20:49 +02:00
Ivan Savenko
90a25cb28d
Fix tower shooter rendering
2022-12-02 02:13:02 +02:00
Ivan Savenko
15051c33ce
Remove casting sound from quick sands - should be applied on obstacle
...
creation
2022-12-02 01:57:04 +02:00
Ivan Savenko
58ba5f1aee
Fixes to effects of earthquake, obstacle-creating and offensive spells
2022-12-02 01:55:09 +02:00
Ivan Savenko
d8742dac3f
Show correct error message on attempting to cast Remove Obstacle on
...
fields with no removable obstacles
2022-12-02 00:27:48 +02:00
Ivan Savenko
215932b520
Fix compile after merge
2022-12-02 00:06:57 +02:00
Ivan Savenko
495e0b3657
Merge remote-tracking branch 'vcmi/develop' into battleint_refactor
2022-12-01 23:58:01 +02:00
Ivan Savenko
2442d38b9a
Fix ranged attack animations
2022-12-01 23:40:03 +02:00
Ivan Savenko
bbd4d361e4
Send hover event to buttons in battle UI
2022-12-01 23:39:43 +02:00
