d3ecd43aba
Merge remote-tracking branch 'vcmi/develop' into battle_improvements
2023-01-04 16:20:53 +02:00
660d25a335
Make control panel configurable
2023-01-03 13:02:54 +04:00
5d80457eda
Merge with vcmi/develop branch
2022-12-30 00:52:23 +02:00
7a35bcc812
Merge pull request #1221 from IvanSavenko/warnings_fix
...
Fix remaining compiler warnings
2022-12-29 21:51:55 +02:00
fa355c3356
Fix build
2022-12-26 01:38:25 +02:00
bb65246aa3
Merge remote-tracking branch 'vcmi/develop' into battle_improvements
2022-12-26 01:15:44 +02:00
325c29da0d
Merge remote-tracking branch 'vcmi/develop' into battle_improvements
2022-12-23 14:51:34 +02:00
eb20a4b208
Merge remote-tracking branch 'vcmi/develop' into warnings_fix
2022-12-23 14:40:45 +02:00
ad5bf2ac4f
Fix msvc build
2022-12-22 02:10:56 +04:00
e245dbaf9d
Use kind-of-factory approach for widget builders
2022-12-22 02:05:29 +04:00
8f7025328f
Read default template from config, named custom types
2022-12-22 01:37:33 +04:00
7e7071fc95
Merge remote-tracking branch 'upstream/develop' into interface-builder
2022-12-22 01:24:29 +04:00
521328addd
Adding macros for targeted object binding
2022-12-22 00:54:06 +04:00
d29c9d6445
Fortify CLabel interface to prevent unchecked access
2022-12-19 22:04:50 +02:00
d7b0770b71
Remove excessive code
2022-12-17 20:50:33 +04:00
9b76a8000f
Making team alignments widget customizable
2022-12-17 20:38:16 +04:00
b590e4a0e4
Fixes for multiplyer
2022-12-17 08:38:33 +04:00
b1f2c7aed4
Team alignments implemented
2022-12-17 08:19:16 +04:00
4f5fab702e
Support roads selection in random map tab
2022-12-17 04:54:37 +04:00
42281f51e8
Revert "Remove uncompleted code"
...
This reverts commit 0c41787ca5
2022-12-17 03:53:26 +04:00
8f089b3302
Rename folder
2022-12-16 02:19:23 +04:00
0c41787ca5
Remove uncompleted code
2022-12-16 02:17:10 +04:00
d3c3feb037
Configurable template selection
2022-12-16 02:15:53 +04:00
864990db13
Implemented Bloodlust & Petrification effect
...
- ColorFilter is now in separate file
- Moved lerp function into global.h
- Bloodlust visuals mostly matches H3
- Petrify visual matches H3
- TODO: Adjust timing of all ColorFilter efects to match H3
- TODO: Petrify should pause stack animations
- TODO: ColorFilter-powered effects should be configurable in Spell system
2022-12-15 23:24:03 +02:00
1d4209d97e
Continue refactoring
2022-12-16 00:57:10 +04:00
2371e3e9a2
Interface builder refactored
2022-12-16 00:46:36 +04:00
2fe951f819
Merge remote-tracking branch 'upstream/develop' into interface-builder
...
# Conflicts:
# client/lobby/RandomMapTab.cpp
2022-12-15 04:47:11 +04:00
4c3288dd61
Fix teams
2022-12-14 05:45:50 +04:00
fc7f1dbc5a
Fix template selection
2022-12-14 05:23:21 +04:00
53b2f68560
Serialize template
2022-12-14 04:37:11 +04:00
1e2abae62b
Template selections works
2022-12-13 04:38:18 +04:00
f90cb1be90
Template list prototype looks fine
2022-12-13 03:47:29 +04:00
cd58e8a860
Rename InterfaceBuilder
2022-12-12 11:48:39 +04:00
5e3504f578
Add improvements
2022-12-12 11:38:27 +04:00
8dbc5c1c1f
Make each windows coniguration in separate file
2022-12-12 04:52:44 +04:00
b3d60ec418
Add new map sizes
2022-12-12 04:46:42 +04:00
3be9969154
Prevent crashes for custom config
2022-12-12 03:58:39 +04:00
0104c77d61
Interface builder for random map tab
2022-12-12 03:27:59 +04:00
facf77b3ae
vstd::unique -> std::unique
2022-12-07 23:36:20 +02:00
a512e0d58f
Fixed ugly solid-white status bars in pregame, removed operator* from
...
CPicture
2022-11-29 17:07:21 +02:00
a0157d6117
replaced C array with std::array
2022-11-28 21:20:46 +02:00
3e58d1e3c5
Merge remote-tracking branch 'refs/remotes/vcmi/develop' into battleint_refactor
2022-11-28 16:10:13 +02:00
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
41e652dad2
Move buttons blocks at proper place
2022-11-25 14:36:17 +04:00
ebb65b5d0e
Prevent multiple clicks
2022-11-25 14:26:59 +04:00
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
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
625c18a889
Fix #3234
2022-11-18 04:05:35 +04:00
f0b909f772
code improvement
2022-09-27 11:56:12 +03:00
9f46bf5bff
Apply suggestions from code review
...
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com >
2022-09-24 15:55:26 +03:00
