games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-11 13:15:38 +02:00
Code Issues Releases Activity
10,701 Commits 22 Branches 67 Tags
Commit Graph

585 Commits

Author SHA1 Message Date
Ivan Savenko
a512e0d58f Fixed ugly solid-white status bars in pregame, removed operator* from 
CPicture
 2022-11-29 17:07:21 +02:00
Andrii Danylchenko
d6ca8017bf Clickable status bar to send messages with on mobile 2022-11-29 08:05:54 +02:00
SoundSSGood
909dcb82fa use ArtifactID 2022-11-29 00:32:18 +02:00
Ivan Savenko
7c4e04c1ec Refactoring/cleanup of classes in CBattleAnimations.cpp 2022-11-28 16:02:46 +02:00
Ivan Savenko
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
Ivan Savenko
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
Ivan Savenko
cb6fe1eedf Moved battle effects into a new class 2022-11-24 16:30:04 +02:00
Ivan Savenko
7a6ad671ab Separated battle control panel into new class, refactoring of 
CGStatusBar to allow shared API with battle console
 2022-11-18 17:54:10 +02:00
Andrii Danylchenko
6974d4ea53
Merge pull request #1130 from IvanSavenko/banned_skills_fix 
Fixes #1096 - do not propose banned skills on levelup
 2022-11-15 09:32:12 +02:00
Andrii Danylchenko
8b964be71f
Merge pull request #1111 from GermanAizek/develop 
Code refactor and fix condition bug
 2022-11-15 09:23:16 +02:00
lainon
7fdad4e0f6 Code refactor following C++ standard and condition fixes 2022-11-15 03:20:55 +03:00
Ivan Savenko
729357824b Added common method for secondary skill availability checks 2022-11-14 19:08:49 +02:00
Andrii Danylchenko
86972d7164
Merge pull request #1112 from SoundSSGood/bulk-move-swap-artifacts-rev2 
Bulk move and swap artifacts rev2
 2022-11-14 08:31:48 +02:00
Ivan Savenko
38b8fc0af8 Formatting: space -> tabs 2022-11-13 14:24:15 +02:00
Ivan Savenko
4af9bc2461 Music: remember playback position of music tracks 
Town & terrain themes will now resume from previously stopped position
instead of playing from start, as it was in original game.
Fixes #965
 2022-11-13 14:05:51 +02:00
SoundSSGood
3142f32cbb Fix for callback return. More code optimization 2022-11-11 01:28:04 +02:00
SoundSSGood
9647758812 Apply suggested changes next part 2022-11-10 23:24:41 +02:00
SoundSSGood
ad47a7573c Code style. Typo. Code clean up. 2022-11-10 18:29:39 +02:00
SoundSSGood
ff63167553
warnings fixed 2022-11-07 18:31:22 +02:00
SoundSSGood
f72a3e3884 function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder 2022-11-07 00:18:05 +02:00
SoundSSGood
d0895e30ef callback functions and cleaning up unused code 2022-11-06 23:41:29 +02:00
Andrii Danylchenko
288f36c0c3
Merge pull request #1052 from Nordsoft91/mp-disconnection 
MP handle disconnection
 2022-10-19 09:56:18 +03:00
nordsoft
895ec2d302 Make console available during other players' turn 2022-10-05 19:04:51 +04:00
Andrii Danylchenko
b83a40db87 #1054 - fix crash and UI 2022-10-04 21:54:14 +03:00
Andrii Danylchenko
34ef0efa74
Merge pull request #1029 from kambala-decapitator/options-highlight-current-resolution 
highlight current resolution in the resolution selector in game options
 2022-10-01 18:32:17 +03:00
Andrey Filipenkov
ebeff94130 inherit CHeroWindow from CStatusbarWindow for proper status bar support 2022-10-01 11:21:16 +03:00
Andrey Filipenkov
c9ae43abe8 highlight current resolution in the resolution selector in game options 2022-10-01 10:33:48 +03:00
Andrii Danylchenko
a2dbb6c8ac
Merge pull request #978 from kambala-decapitator/hide-unsupported-resolutions 
Hide unsupported resolutions
 2022-09-30 17:34:07 +03:00
Andrii Danylchenko
4835387004
Merge pull request #1015 from kambala-decapitator/prohibit-dig-while-waiting 
prohibit digging while waiting for your turn to start
 2022-09-30 08:39:48 +03:00
DjWarmonger
58a3abb643
Merge pull request #963 from vcmi/terrain-rewrite 
Terrain rewrite
 2022-09-29 18:24:05 +02:00
Andrii Danylchenko
878aabd4d6
Merge pull request #981 from kambala-decapitator/fix-analyzer-warnings 
Fix Clang Analyzer warnings
 2022-09-29 19:23:24 +03:00
Andrey Filipenkov
836d7dc2d6 prohibit digging while waiting for your turn to start 2022-09-29 15:52:28 +03:00
Andrey Filipenkov
76b36b8951 iOS can use any resolution 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
6e6bf1e77b don't list resolutions larger than the current screen's in the game options 2022-09-27 11:56:12 +03:00
Andrey Filipenkov
f0b909f772 code improvement 2022-09-27 11:56:12 +03:00
Tomasz Zieliński
f386f42166 Merge remote-tracking branch 'origin/develop' into terrain-rewrite 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
#	lib/battle/CBattleInfoEssentials.cpp
#	lib/rmg/ObstaclePlacer.cpp
#	lib/rmg/RiverPlacer.cpp
 2022-09-27 07:50:17 +02:00
Andrii Danylchenko
127a7e6653
Merge pull request #959 from kambala-decapitator/fix-cursor-attack 
fix cursor image on hover when there're multiple creatures nearby
 2022-09-25 17:44:10 +03:00
Andrey Filipenkov
96c2db4d56 remove useless variable 2022-09-25 13:13:37 +03:00
Andrey Filipenkov
72feb538ce add explicit null pointer checks 2022-09-25 10:05:16 +03:00
Andrey Filipenkov
ff635edc0b wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined 
preparation for having client and server in a single process
 2022-09-24 15:55:21 +03:00
Andrey Filipenkov
27b7cb8f1f show long press hints higher 
kambala-decapitator/vcmi#29
 2022-09-24 15:55:19 +03:00
Andrey Filipenkov
d2b1cc00e8 enable same adventure map tweaks as on android 2022-09-24 15:55:17 +03:00
Andrey Filipenkov
2e18299897 make server a static lib, run it in a separate thread 
issues to solve:
- dynamic_cast error 2: One or more of the following type_info's has hidden visibility or is defined in more than one translation unit. They should all have public visibility. 13CPackForLobby, 20LobbyClientConnected, 20LobbyClientConnected.
- error setting socket option: set_option: No buffer space available
 2022-09-24 15:55:16 +03:00
Tomasz Zieliński
a5077245a8 Merge remote-tracking branch 'origin/develop' into terrain-rewrite 
# Conflicts:
#	lib/Terrain.cpp
#	lib/Terrain.h
 2022-09-23 20:01:13 +02:00
Andrii Danylchenko
2b0f02c832
Merge pull request #944 from AgostonSzepessy/dev/agos/937 
Add right click to Quick Recruit Window
 2022-09-23 14:01:52 +03:00
Andrii Danylchenko
43a1a8b76d
Merge pull request #928 from kambala-decapitator/quick-recruit-no-creatures 
show message instead of the Quick Recruit dialog when there're no creatures in town
 2022-09-22 18:21:45 +03:00
Andrey Filipenkov
2ce78ba8c9 fix operator precedence 2022-09-22 11:54:09 +03:00
Tomasz Zieliński
494b0f0226 First version that compiles 2022-09-21 11:34:23 +02:00
Agoston Szepessy
411038195c Add clickeable area on top of creature picture 
A class that wraps an instance of `CIntObject` creates an area
that users can right click to view information about the creature
they're buying.

The constants were based off the existing ones in the code and were
refined by guessing and checking where clicking falls inside/outside
the border of the rectangle.
 2022-09-18 22:53:11 -07:00
Agoston Szepessy
dfdaf57803 Set position for CreaturePurchaseCard 
This will make it pick up on right clicks. It was 0 before, so it wasn't
doing it.
 2022-09-18 16:00:54 -07:00