1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Commit Graph

5211 Commits

Author SHA1 Message Date
Ivan Savenko
060e1cef21
Merge pull request #3182 from Alexander-Wilms/fix-fps-counter
Move FPS counter to bottom left, set width of black background to suf…
2023-11-15 13:56:27 +02:00
Ivan Savenko
1192dbff15
Merge pull request #3180 from IvanSavenko/bugfixing
Fixes for miscellaneous accumulated issues
2023-11-13 16:26:33 +02:00
Alexander Wilms
c0c16fed75 Move FPS counter to bottom left, set width of black background to suffice for 3 digit FPS
Fixes #3171
2023-11-13 02:52:19 +01:00
Ivan Savenko
c6f9434c8e
Merge pull request #3170 from gamestales/gamestales/2903-morale-description-1442
#2903-morale-description-#1442
2023-11-13 01:53:29 +02:00
Ivan Savenko
b86060d729
Merge pull request #3169 from Alexander-Wilms/intro-clear-screen
CVideoHandler.cpp: Clear screen before rendering each frame of the intro
2023-11-12 19:38:02 +02:00
Ivan Savenko
bc51d9c772
Merge pull request #3161 from SoundSSGood/art-swap-optimization
Artifacts swap optimization
2023-11-12 19:37:25 +02:00
Ivan Savenko
833051cced Display exit confirmation dialog on Alt-F4 2023-11-12 17:35:43 +02:00
Ivan Savenko
59806bf112 Fix right-click tooltips for starting hero/towns 2023-11-12 17:17:07 +02:00
Ivan Savenko
07472d3b05
Merge pull request #3147 from IvanSavenko/serialization_refactor
Serialization refactor - remove VLC from saved games
2023-11-11 17:35:01 +02:00
Ivan Savenko
5c810df36f Reorganized types registration code 2023-11-11 00:39:08 +02:00
gamestales-com
a574f18e69 #2903-morale-description-#1442 2023-11-10 15:58:19 +01:00
Alexander Wilms
eee1a4d061 CVideoHandler.cpp: Clear screen before rendering each frame of the intro
This way, the background is black instead of showing glitchy artifacts when one resizes the window
2023-11-10 03:37:42 +01:00
Ivan Savenko
359af84d59 Fix crash on starting battle in MP 2023-11-09 01:22:09 +02:00
Ivan Savenko
864462b84a Reduce excessive updates of garrisons. Fixes selection reset in simturns 2023-11-09 00:01:48 +02:00
Ivan Savenko
4a7fa9bf8c Simplified CTypeList class 2023-11-08 22:05:36 +02:00
SoundSSGood
57e3abc548 ask assemble regression fixed 2023-11-08 21:59:55 +02:00
SoundSSGood
ce3d407396 artifacts swap optimization 2023-11-08 21:58:48 +02:00
Ivan Savenko
eb167d94a6 Mod compatibility check is now in a separate class and not part of
ModHandler
2023-11-08 21:27:05 +02:00
Ivan Savenko
6b81012f31 Use variant identifier in netpacks where applicable 2023-11-08 14:00:23 +02:00
Ivan Savenko
0b4fa20bdc
Merge pull request #3152 from SoundSSGood/CAltar-widget
Altar rework
2023-11-08 13:42:00 +02:00
SoundSSGood
41ee52d9d4 fix build & suggested changed 2023-11-08 01:51:13 +02:00
Ivan Savenko
86a3806bec MetaString refactor to eliminate integer usage for identifiers
- entity names are now stored and serialized as text ID's
- added helper methods for convenience to get entities names to
metastring
2023-11-07 22:47:10 +02:00
Ivan Savenko
f4feaea177
Merge pull request #3141 from IvanSavenko/better_tooltips
Better tooltips
2023-11-07 22:46:02 +02:00
Tomasz Zieliński
c909bd766e Merge remote-tracking branch 'origin/develop' into fix_rmg_teams
# Conflicts:
#	lib/rmg/CMapGenOptions.cpp
#	lib/rmg/CMapGenOptions.h
2023-11-07 20:54:04 +01:00
Ivan Savenko
f039b20653 Improvement for wandering monster tooltip/hover text:
- show Visions information only on right-click (H3 logic)
- show threat level only on right-click and only if UI tweaks are on
2023-11-06 20:37:07 +02:00
SoundSSGood
539b2e596d adjusting the placement of artifact slots 2023-11-06 14:31:32 +02:00
SoundSSGood
75ebd954af Creatures altar & Artifacts altar 2023-11-06 14:31:32 +02:00
SoundSSGood
9f9317a8a0 CTradeBase initial commit 2023-11-06 14:31:31 +02:00
SoundSSGood
fbe3e0fe12 CArtPlace preparation 2023-11-06 14:01:13 +02:00
Andrii Danylchenko
0927d3e3e8
Merge pull request #3145 from vcmi/fix-3142
#3142 - fi custom campaign selection screen
2023-11-05 11:12:58 +02:00
Andrii Danylchenko
060079cfc6
Merge pull request #3146 from vcmi/fix-3006
#3006 - fix starting move from teleport
2023-11-05 11:12:41 +02:00
Ivan Savenko
8dc5837395
Merge pull request #3144 from IvanSavenko/remove_identifier_implicit_int_conversion
Remove (some of) implicit conversions of Identifier to integer
2023-11-04 19:36:11 +02:00
Ivan Savenko
5487f07d3b added toEntity overload that accepts generic Services class 2023-11-04 17:04:53 +02:00
Andrii Danylchenko
91c04f4718 #3006 - fix starting move from teleport 2023-11-04 15:43:08 +02:00
Andrii Danylchenko
d50ebd7d58 #3142 - fi custom campaign selection screen 2023-11-04 14:34:18 +02:00
Andrii Danylchenko
a8cc5e1d60
Merge pull request #3140 from vcmi/fix-3003
#3003 - fix hypnotize
2023-11-04 10:50:58 +02:00
Ivan Savenko
184f5a72cc Use toEntity/toXXX methods in Identifier instead VLC objects access 2023-11-03 16:03:29 +02:00
Ivan Savenko
8d5fa41a19 Minor fixes 2023-11-03 16:03:29 +02:00
Ivan Savenko
87f6c7354b
Merge pull request #3139 from IvanSavenko/component_variant_identifier
Refactoring of Component class
2023-11-03 15:52:07 +02:00
Ivan Savenko
4a24da3804
Merge pull request #3114 from Laserlicht/fix-highscore
fix high scores screen
2023-11-03 15:51:37 +02:00
Ivan Savenko
7a254dd55f
Merge pull request #3135 from IvanSavenko/file_corruption_check
Ignore corrupted .def files
2023-11-03 15:49:43 +02:00
Andrii Danylchenko
3b27e07385 #3003 - fix hypnotize 2023-11-03 13:50:16 +02:00
Ivan Savenko
056ef00f74 Bugfixing 2023-11-02 13:52:58 +02:00
Ivan Savenko
10e50548e7 Converted Component class to use VariantIdentifier instead of int 2023-11-02 12:00:04 +02:00
Ivan Savenko
0376873cb3
Merge pull request #3125 from IvanSavenko/reduce_subid_usage
Reduce usage of CGObjectInstance::subID
2023-11-02 11:58:01 +02:00
Andrii Danylchenko
5cd16e5b27
Merge pull request #3124 from vcmi/fix-2977
#2977 - fix obstackle path deserialization
2023-11-01 15:27:14 +02:00
Ivan Savenko
8346d71c98 Remove more subID access 2023-11-01 14:44:05 +02:00
Ivan Savenko
7107b3202f
Merge pull request #3069 from SoundSSGood/artifact-location-id
ArtifactLocation now use ID for artHolder identification
2023-11-01 14:41:36 +02:00
Laserlicht
8a9f10ec3a
fix asset failures 2023-10-31 22:05:22 +01:00
Ivan Savenko
858ba22a27 Ignore corrupted .def files 2023-10-31 12:11:41 +02:00