 Ivan Savenko
|
3d39963a1c
Merge branch 'master' into 'develop'
|
1 år sedan |
 MichalZr6
|
2a6525c5ef
Check battleInt->curInt instead of battleInt
|
1 år sedan |
|
MichalZr6
|
619b35ab33
Allow dialogs when in battle interface
|
1 år sedan |
|
MichalZr6
|
9daabd0710
Check battleInt->curInt instead of battleInt
|
1 år sedan |
|
MichalZr6
|
d0e0ab767c
Allow dialogs when in battle interface
|
1 år sedan |
|
Ivan Savenko
|
b6cc409772
Fix excessive removal of dialogs, e.g. new week or timed events
|
1 år sedan |
 Simeon Manolov
|
d05adfc5d5
Merge branch 'develop' into split-client+develop
|
1 år sedan |
|
Simeon Manolov
|
5a7dc7b552
Merge branch 'develop' into split-client+develop
|
1 år sedan |
 SoundSSGood
|
2e3e6b1553
market->getObjInstanceID()
|
1 år sedan |
|
SoundSSGood
|
58bb2b58e3
IMarket suggestions
|
1 år sedan |
|
SoundSSGood
|
cd7ebea9e3
cleanup unused code
|
1 år sedan |
|
SoundSSGood
|
fd45b5144d
IMarket serializeable
|
1 år sedan |
|
Ivan Savenko
|
6a6c13471c
Try more robust approach for waiting dialogs in battles in MP
|
1 år sedan |
|
Ivan Savenko
|
b94a61c255
Try to fix battle startup if player has waiting dialogs
|
1 år sedan |
|
Ivan Savenko
|
f29a687234
Clean up scaling code, implemented image size optimization
|
1 år sedan |
|
Simeon Manolov
|
f2cddaa21b
Split vcmiclient in two
|
1 år sedan |
|
Ivan Savenko
|
49c5f650f7
Merge pull request #4437 from IvanSavenko/battle_sides
|
1 år sedan |
|
Ivan Savenko
|
2a05fbdd50
Unified handling of battle sides ID's
|
1 år sedan |
|
Ivan Savenko
|
00605b5129
Remove largely unused defActions member from CIntObject
|
1 år sedan |
|
Ivan Savenko
|
b7391f49f6
Merge branch 'vcmi/master' into 'vcmi/develop'
|
1 år sedan |
|
Ivan Savenko
|
e8c3252214
Do not auto-remove dialogs such as new week
|
1 år sedan |
|
Ivan Savenko
|
5f0e6f7ce1
Close all dialogs on start of new turn in MP
|
1 år sedan |
|
Ivan Savenko
|
4aa73b40c9
Split CTownHandler into smaller chunks
|
1 år sedan |
|
Ivan Savenko
|
1aa391fdf8
Split CGeneralTextHandler file into 1 file per class form
|
1 år sedan |
|
Ivan Savenko
|
0d6ec0d224
Reviewed usage of EBlitMode, now specified clearly in all cases
|
1 år sedan |
|
Ivan Savenko
|
fcafe53da9
Restored previously disabled University code, add interface to notify
|
1 år sedan |
|
Ivan Savenko
|
47de9a62dc
Created separate classes for shared, unchangeable image and image
|
1 år sedan |
|
Ivan Savenko
|
63bcf7d83c
Replaced most of usages of CRandomGenerator with vstd::RNG in library
|
1 år sedan |
|
Ivan Savenko
|
ad9750ed3e
Merge pull request #4186 from SoundSSGood/end-of-battle-artifacts-transfer
|
1 år sedan |
|
SoundSSGood
|
ff5ddd76b7
suggestions
|
1 år sedan |
