kodobi 2678665f67 Resolve merge conflict

2024-10-30 18:48:09 +01:00

..

adventureMap

Merge remote-tracking branch 'upstream/develop' into adv_search

2024-10-14 19:52:55 +02:00

battle

Split CHeroHandler.cpp/.h into 1 file per class

2024-10-13 14:01:09 +00:00

eventsSDL

fix shortcuts with Modifier Key

2024-10-19 15:59:02 +02:00

globalLobby

…

gui

Merge remote-tracking branch 'upstream/develop' into adv_search

2024-10-14 19:52:55 +02:00

ios

…

lobby

optimize layout

2024-10-20 02:26:40 +02:00

mainmenu

no scrollbar for hotseat title (with ttf fonts)

2024-10-20 03:16:57 +02:00

mapView

Replaced most of accesses to CGObjectInstance::pos with anchorPoint()

2024-10-09 15:43:46 +00:00

media

fix for defect mp3

2024-10-19 13:45:20 +02:00

render

Merge pull request #4763 from IvanSavenko/herohandler_split

2024-10-14 19:05:48 +03:00

renderSDL

Fix some of the new warnings from sonarcloud

2024-10-11 10:45:29 +00:00

widgets

Merge pull request #4812 from SoundSSGood/secSkillPlace

2024-10-30 13:33:39 +02:00

windows

Resolve merge conflict

2024-10-30 18:48:09 +01:00

xBRZ

…

ArtifactsUIController.cpp

Fused identical artifacts

2024-10-15 16:51:29 +03:00

ArtifactsUIController.h

…

CGameInfo.cpp

…

CGameInfo.h

…

Client.cpp

Replace more usages of pointers to packs with references

2024-10-07 14:59:14 +00:00

Client.h

Fix some of the new warnings from sonarcloud

2024-10-11 10:45:29 +00:00

ClientCommandManager.cpp

Added 'translate missing' command for convenience

2024-10-26 12:54:35 +00:00

ClientCommandManager.h

Added 'translate missing' command for convenience

2024-10-26 12:54:35 +00:00

ClientNetPackVisitors.h

rename; introduce factor

2024-09-28 15:05:13 +02:00

CMakeLists.txt

CSecSkillPlace

2024-10-22 01:54:04 +03:00

CMT.h

…

ConditionalWait.h

…

CPlayerInterface.cpp

Split CHeroHandler.cpp/.h into 1 file per class

2024-10-13 14:01:09 +00:00

CPlayerInterface.h

…

CServerHandler.cpp

Merge pull request #4736 from Laserlicht/fix_8th_portal_summoning

2024-10-07 22:19:17 +03:00

CServerHandler.h

Reduced usage of CPack, replaced with CPackForServer where applicable

2024-10-07 14:59:14 +00:00

GameChatHandler.cpp

…

GameChatHandler.h

…

HeroMovementController.cpp

Replaced most of accesses to CGObjectInstance::pos with anchorPoint()

2024-10-09 15:43:46 +00:00

HeroMovementController.h

…

LobbyClientNetPackVisitors.h

…

NetPacksClient.cpp

Split CHeroHandler.cpp/.h into 1 file per class

2024-10-13 14:01:09 +00:00

NetPacksLobbyClient.cpp

…

PlayerLocalState.cpp

Merge pull request #4770 from IvanSavenko/prison_fix

2024-10-14 18:16:53 +03:00

PlayerLocalState.h

Fix some of the new warnings from sonarcloud

2024-10-11 10:45:29 +00:00

resource.h

…

ServerRunner.cpp

…

ServerRunner.h

…

StdInc.cpp

…

StdInc.h

…