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

9185 Commits

Author SHA1 Message Date
Andrii Danylchenko
b26c874446
Merge pull request #1185 from Nordsoft91/editor-crash
Fix editor crashes [1.1]
2022-12-04 09:39:28 +02:00
Andrii Danylchenko
f8165bfceb
Merge pull request #1191 from vcmi/fix-1186
#1186 - disable status bar with other advmap controls
2022-12-04 08:57:24 +02:00
Andrii Danylchenko
a72d1270cd #1186 - disable status bar with other advmap controls 2022-12-03 21:32:47 +02:00
nordsoft
bc37ceb7f3 Smart invalidation for move/erase/new object 2022-12-03 23:11:40 +04:00
nordsoft
8d1024fcfc Clear error message 2022-12-03 20:56:05 +04:00
nordsoft
2f2c980a0c Fix crash on map destroying 2022-12-03 20:56:05 +04:00
nordsoft
fc6026969f Fix town building inspector 2022-12-03 20:56:05 +04:00
nordsoft
00789cb0d7 Cleanup undo stack for new map 2022-12-03 20:56:05 +04:00
nordsoft
40300972bc Add undo/redo icons 2022-12-03 20:56:05 +04:00
nordsoft
c290153cd0 Fix crash related to unblocked menu item 2022-12-03 20:56:05 +04:00
nordsoft
522cb00edd Fix crash related to zeros stored in settings 2022-12-03 20:56:05 +04:00
Andrii Danylchenko
3a30d8fb13
Merge pull request #1182 from IvanSavenko/ragdoll_fix
HoMM3 bug workaround: fixes missing slot on artifact merchant background image
2022-12-03 13:25:00 +02:00
Andrii Danylchenko
b50b86ca55
Merge pull request #1183 from IvanSavenko/artifact_fix
Fixed access violation in artifacts code and potentially non-finisheable battles
2022-12-03 13:21:48 +02:00
Ivan Savenko
848454d48a Check for end-of-battle after opening spells are cast, fixes potentially
infinite battle
2022-12-02 21:38:59 +02:00
Ivan Savenko
1248292503 Fixed access violation - do NOT return address to temporary created on
stack
2022-12-02 21:37:58 +02:00
Ivan Savenko
397371b969 HoMM3 bug workaround: fixes missing slot on artifact merchant background
image
2022-12-02 18:52:05 +02:00
Ivan Savenko
1b4c5be4de Implemented proper rendering order generation for battlefield objects 2022-12-02 17:49:38 +02:00
Andrii Danylchenko
47b7c618a9
Merge pull request #1181 from IvanSavenko/version_bump1.1.0
[beta] Version bump of Linux packaging to 1.1.0
2022-12-02 14:51:51 +02:00
Andrii Danylchenko
162b3017ce allow building beta branch 2022-12-02 13:16:22 +02:00
Ivan Savenko
d7cf5a0479
Version bump for Appstream metadata 2022-12-02 12:57:36 +02:00
Ivan Savenko
0fcfb95d6b
Version bump to 1.1.0 for .deb packages 2022-12-02 12:55:48 +02:00
Andrii Danylchenko
fd21f9ead2
Merge pull request #1180 from vcmi/beta
allow uploading beta to build server
2022-12-02 11:47:19 +02:00
Andrii Danylchenko
c7510cb8ae allow uploading beta to build server 2022-12-02 09:23:06 +02:00
Andrii Danylchenko
d9c4b28ccc
Merge pull request #1177 from IvanSavenko/fix_mod_identifiers
Fix mod identifiers registration & incorrect mod validation
2022-12-02 09:20:49 +02:00
Ivan Savenko
90a25cb28d Fix tower shooter rendering 2022-12-02 02:13:02 +02:00
Ivan Savenko
15051c33ce Remove casting sound from quick sands - should be applied on obstacle
creation
2022-12-02 01:57:04 +02:00
Ivan Savenko
58ba5f1aee Fixes to effects of earthquake, obstacle-creating and offensive spells 2022-12-02 01:55:09 +02:00
Ivan Savenko
d8742dac3f Show correct error message on attempting to cast Remove Obstacle on
fields with no removable obstacles
2022-12-02 00:27:48 +02:00
Ivan Savenko
215932b520 Fix compile after merge 2022-12-02 00:06:57 +02:00
Ivan Savenko
495e0b3657 Merge remote-tracking branch 'vcmi/develop' into battleint_refactor 2022-12-01 23:58:01 +02:00
Ivan Savenko
2442d38b9a Fix ranged attack animations 2022-12-01 23:40:03 +02:00
Ivan Savenko
bbd4d361e4 Send hover event to buttons in battle UI 2022-12-01 23:39:43 +02:00
Ivan Savenko
c721d7c4f3 Fix overwriting of hover text of buttons in combat 2022-12-01 23:36:41 +02:00
Ivan Savenko
5094fab4d9 Refactoring of spell animations, multiple fixes for spell visuals 2022-12-01 22:06:42 +02:00
Nordsoft91
2a857cf0b9
Merge pull request #1179 from Nordsoft91/ios-files-browser 2022-12-01 16:43:42 +04:00
nordsoft
632ffb4462 Alphabetical order for parameters 2022-12-01 14:56:42 +04:00
Andrii Danylchenko
82179a9cdb
Merge pull request #1176 from IvanSavenko/tower_shooter_icons
Tower shooter icons fix
2022-12-01 12:30:24 +02:00
Andrii Danylchenko
ab365fdaef
Merge pull request #1175 from SoundSSGood/refactoring-art
Refactoring of artifacts code
2022-12-01 11:13:31 +02:00
nordsoft
09c681ca64 Implement browsing data 2022-12-01 00:24:09 +04:00
Ivan Savenko
92ca0d9877 cleared up rendering of tower shooters 2022-11-30 22:05:25 +02:00
SoundSSGood
45a3064e5d suggested changes 2022-11-30 18:28:33 +02:00
Ivan Savenko
7c410ab5ce Fix potential crash due to iterator invalidation 2022-11-30 18:07:21 +02:00
Ivan Savenko
5cd405bce8 Fixed meta field handling in JsonUtils::inherit function, removed
workarounds
2022-11-30 17:38:53 +02:00
Ivan Savenko
79c96e94fa Cleared up comments 2022-11-30 17:37:36 +02:00
Andrii Danylchenko
6015e160cf
Merge pull request #1178 from Nordsoft91/editor-icons
Add icons for map editor toolbal
2022-11-30 14:43:37 +02:00
nordsoft
e9e8fdecb5 Update icon for underground toggle 2022-11-30 15:33:59 +04:00
nordsoft
4b8403be4b Add icons into search path 2022-11-30 15:22:53 +04:00
nordsoft
3c4d2a4b92 Add icons for map editor toolbal 2022-11-30 02:59:36 +04:00
Ivan Savenko
36ae26bc37 Fixed several scenarios which could lead to json with incorrectly set
mod origin info, leading to non-resolving identifiers
2022-11-29 22:34:32 +02:00
SoundSSGood
3bf0cfe4fa
Merge branch 'vcmi:develop' into refactoring-art 2022-11-29 22:34:08 +02:00