Ivan Savenko
|
083e75e80e
|
Merge pull request #2372 from vcmi/fix_rmg_teams
Fix teams on random maps
|
2023-11-07 22:45:51 +02:00 |
|
Tomasz Zieliński
|
01f70475ad
|
Missing change
|
2023-11-07 20:58:22 +01: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
|
3fe10f9c7b
|
Merge pull request #3154 from gamestales/gamestales/3151-windows-build-symlinks
#3151-windows-build-symlinks
|
2023-11-07 12:13:08 +02:00 |
|
gamestales-com
|
afc0d8665a
|
#3151-windows-build-symlinks
|
2023-11-06 15:57:39 +01:00 |
|
Ivan Savenko
|
2bf599bbee
|
Merge pull request #3119 from Nordsoft91/rmg-fix
Fix crash caused by duplicated delete
|
2023-11-05 17:09:52 +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
|
04aeea9b68
|
use toEnum instead of getNum for switch'es
|
2023-11-03 19:20:25 +02:00 |
|
Ivan Savenko
|
f1032063bc
|
Restore implicit conversion
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
cac37df334
|
Remove unused constructor
|
2023-11-03 16:03:29 +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
|
3634fb2158
|
Remove int <=> Identifier comparisons
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
885dce0c27
|
Replace static_cast's of Identifiers with getNum call
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
8f25f1fd4b
|
Serialize identifiers without implicit conversion to int
|
2023-11-03 16:03:29 +02:00 |
|
Ivan Savenko
|
2b9c362d5b
|
Explicitly convert identifier to underlying enumeration
|
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
|
eea4cbf242
|
Merge pull request #3136 from IvanSavenko/fix_teleport
Fix crash on teleport cast
|
2023-11-03 15:49:55 +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 |
|
Ivan Savenko
|
cc06492488
|
Merge pull request #3134 from IvanSavenko/initialize_allied_ai
Correctly initialize current value of allied AI in Launcher
|
2023-11-03 15:49:33 +02:00 |
|
Andrii Danylchenko
|
3b27e07385
|
#3003 - fix hypnotize
|
2023-11-03 13:50:16 +02:00 |
|
Ivan Savenko
|
02b4947db9
|
Fix build
|
2023-11-02 20:01:20 +02:00 |
|
Ivan Savenko
|
056ef00f74
|
Bugfixing
|
2023-11-02 13:52:58 +02:00 |
|
Ivan Savenko
|
f201e3019a
|
Fix crash on right-clicking rewardable objects with no hero selected
|
2023-11-02 12:00:05 +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 |
|
Ivan Savenko
|
b42f073f0c
|
Stabilization
|
2023-11-01 18:26:57 +02:00 |
|
Ivan Savenko
|
e57276b7c5
|
Correctly initialize battleID for teleport action
|
2023-11-01 17:24:41 +02:00 |
|
Ivan Savenko
|
71d6c4e953
|
Correctly initialize current value of allied AI in Launcher
|
2023-11-01 16:57:17 +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
|
5cdbf408c7
|
Slightly simplified heroes initialization
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
461c481ef3
|
Fix game startup
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
cc30bdda04
|
Remove few more subID usages
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
7a09646009
|
Cleaned up dwelling randomization
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
dcb8f4fc7b
|
Moved object type randomization to object class
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
03e1169781
|
Reduced number of accesses to CGObjectInstance::subID
|
2023-11-01 14:43:20 +02:00 |
|
Ivan Savenko
|
455d8d4738
|
Merge pull request #3130 from vcmi/iOS-ipa-install-options
describe how to put ipa on iOS device
|
2023-11-01 14:41:55 +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 |
|
Andrii Danylchenko
|
caffc8f3cd
|
Merge pull request #3122 from vcmi/fix-2993
#2993 - destruct battle info first when destructing CGameState
|
2023-10-31 21:43:55 +02:00 |
|
Andrii Danylchenko
|
25b64dd08b
|
Update lib/gameState/CGameState.cpp
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
|
2023-10-31 21:43:06 +02:00 |
|
Andrey Filipenkov
|
5623d3fb11
|
describe how to put ipa on iOS device
|
2023-10-31 17:58:33 +03:00 |
|