b1ef0f6301
#1912 Some logging and fix for allied garrison
2023-07-09 10:21:58 +03:00
7a5775a9f9
vcmi: use std::optional
2023-04-17 00:43:13 +03:00
0d35606a44
vcmi: use std::variant
2023-04-17 00:43:13 +03:00
bfc75ccd39
Merge remote-tracking branch 'upstream/develop' into battle-dialog
2023-04-11 02:22:42 +04:00
ea7dd14d8b
client is able to erase artifact
2023-04-08 00:41:55 +03:00
3e28b58c80
Fixes
2023-04-06 19:59:22 +04:00
ece8a2a41f
Merge branch 'battle-dialog' into battle-dialog2
...
# Conflicts:
# AI/BattleAI/BattleAI.h
# AI/StupidAI/StupidAI.h
# client/CPlayerInterface.cpp
# client/CPlayerInterface.h
# client/Client.cpp
# client/NetPacksClient.cpp
# client/battle/CBattleInterface.cpp
# client/battle/CBattleInterface.h
# client/battle/CBattleInterfaceClasses.cpp
# client/battle/CBattleInterfaceClasses.h
# config/schemas/settings.json
# lib/CGameInterface.h
# lib/IGameEventsReceiver.h
# lib/NetPacks.h
# lib/NetPacksLib.cpp
# lib/battle/BattleInfo.cpp
# server/CGameHandler.cpp
# server/CQuery.h
2023-04-06 19:53:52 +04:00
ce3028bd73
Intermediate commit
2023-04-06 19:34:07 +04:00
0c7dae0913
Allow formation change while in hero exchange query
2023-03-28 19:12:35 +03:00
8d549bf030
Fix town portal query when it calls level up query
2023-03-20 16:08:18 +01:00
5366f9190e
vcmi: reduce boost::lexical_cast usage
2023-03-09 16:36:46 +03:00
fa6f7513e8
All heroes-related strings are passed through translator
2023-01-20 15:18:36 +02:00
25bceda4ea
Added convertToVisitablePos/convertFromVisitablePos to CGHeroInstance
...
This method replaces old convertPosition, but with more clear names and
without hardcoded magic constants.
2022-12-09 14:42:47 +02:00
d85ee019ec
Removed CGHeroInstance::convertPosition method
2022-12-07 22:51:32 +02:00
49cbd5adc9
CGHeroInstance::convertPosition is no longer static method
2022-12-07 22:34:08 +02:00
e9e172164c
Implemented correct logic for battle queries
2022-11-25 03:02:34 +04:00
9b597fc8d4
Merge remote-tracking branch 'upstream/develop' into battle-dialog
2022-11-15 23:08:20 +04:00
ad47a7573c
Code style. Typo. Code clean up.
2022-11-10 18:29:39 +02:00
a35db9a696
server blocksPack upd
2022-11-07 00:19:43 +02:00
0c4e50b63c
Initial prototype works
2022-11-05 03:35:51 +04:00
48925a50f2
Development
2022-11-05 03:35:46 +04:00
219a282916
First step
2022-11-05 03:35:32 +04:00
8cae3398ba
Feature: Army Management Shortcuts should work as in HD+ Mod
2021-11-28 20:00:43 +02:00
b25baf66be
Fix level up crashes: 1) Crash on double level up. 2) Crash on custom class level up.
2020-10-19 22:39:57 +03:00
96215233bc
macOS: fix packet deserialization ( #479 )
2018-08-14 01:03:45 +03:00
8cec07afbd
Replaced CGHeroInstance and CGObjectInstance with ObjectInstanceID in NetPacks
2018-03-17 13:24:12 +08:00
da117e9255
Code style: remove void from constructors without arguments
2018-01-13 11:51:47 +03:00
26a222ac62
Change JsonType to enum class ( #393 )
...
Change enum JsonType to enum class JsonType
2017-11-27 00:18:18 +03:00
15138c23de
Finished conversion to new logging API
...
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
2017-08-11 23:06:27 +03:00
f1e5797834
Code style: move or add licensing information on top of every file
2017-07-14 01:26:03 +03:00
dbaf3cb023
Cleanup & formatting
2017-07-04 01:32:40 +03:00
a65befaa08
Moved town portal logic to mechanics class
2017-07-03 21:43:04 +03:00
3d1a84875e
Queries refactoring
...
* Moved SUMMON_BOAT special case to mechanics
* Partially moved Town portal logic to mechanics class
* Added generic query reply to CCallback
* Redesigned Queries so that base API do not depends on CGameHandler
* Got rid of CGameHandler::castSpellRequest
* Removed CGameHandler::castSpell
* Added new Query type for town portal dialog (not used yet)
2017-07-03 21:43:04 +03:00
4113bdab01
Moving some files from lib to the battle subdirectory.
2017-06-26 15:26:08 +02:00
3de891b4b4
Moving/dividing classes from BattleState to separate files.
2017-03-17 16:48:44 +01:00
60b1a9ac52
Fixed CID 1197370, CID 1197369, CID 1197371, CID 1197372, CID 1197374, CID 1288881, CID 1197376
2016-11-27 23:18:21 +03:00
609c6f81bd
Fixed a few CWE-457
2016-11-27 22:37:41 +03:00
62d272f3e5
Cleanup
2016-09-22 21:35:37 +03:00
85f94676a5
Server: convert logging
2016-08-30 01:13:07 +03:00
4a05402c2f
Revert 5cd4e852d4 "Use portable cast in CTeleportDialogQuery also"
...
Actually, this leads to crash on MacOSX, I specially left that intact.
2016-01-18 10:45:09 +03:00
9fd1cff090
Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
...
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.
This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
5cd4e852d4
Use portable cast in CTeleportDialogQuery also
2015-12-13 15:59:48 +03:00
9a0161e4e2
Fix and unify CBattleQuery::blocksPack
2015-12-13 15:57:33 +03:00
0fab319c73
Merge remote-tracking branch 'remotes/origin/develop' into issue/2306
...
s reverts commit fa8a282696
2015-12-05 12:56:12 +03:00
c3ce4b25df
Removed all #include's of CMap.h from headers.
...
To all - please, avoid #include's in headers as much as possible
This kills incremental build compile times
2015-12-02 21:05:10 +02:00
5c623868bf
Fix invalid dynamic_cast replacement
2015-10-31 23:01:22 +03:00
68cc860133
Fix dynamic_cast on MacOSX in CQuery.cpp
2015-10-31 15:05:52 +03:00
b0c039bd7f
fix 2241
2015-09-15 10:54:55 +03:00
18535db0ef
Add TeleportDialog and CTeleportDialogQuery
...
TeleportDialog is based off BlockingDialog and it's needed for server to ask client what teleport hero should be teleported to.
It's also contain list of possible exits, identifier of currently used channel and also impassable option.
If impassable set to true then client will remember that current teleport channel is lack of exit point.
2015-03-08 16:37:33 +03:00
a0689fa377
Refactoring of hoverText from objects:
...
- removed hoverText field
- split getHoverText() method into 3:
- - getObjectName() for generic name
- - getHoverText(Player) for player-specific text
- - getHoverText(Hero) for hero-specific strings
2014-06-24 20:39:47 +03:00
