Ivan Savenko
|
05550158ee
|
Merge pull request #1944 from Laserlicht/patch-1
Nullkiller -> Standard-AI
|
2023-04-12 12:48:13 +03:00 |
|
Michael
|
471aec9894
|
Nullkiller -> Standard-AI
|
2023-04-11 20:52:11 +02:00 |
|
DjWarmonger
|
d9a2621231
|
Merge pull request #1939 from vcmi/fix_top_of_map_objects
Merging after positive review.
|
2023-04-11 10:40:18 +02:00 |
|
Ivan Savenko
|
c9e9d93b60
|
Merge pull request #1937 from Nordsoft91/launcher-layout
[1.2] Adjustable layout for launcher
|
2023-04-11 11:12:15 +03:00 |
|
Ivan Savenko
|
7d92ef5f86
|
Merge pull request #1909 from vcmi/avoid-freeze-on-siege-selfblocking
BattleAI: avoid selfblocking on siege
|
2023-04-11 11:11:05 +03:00 |
|
Ivan Savenko
|
ef103290fa
|
Merge pull request #1938 from rilian-la-te/fix-orb-of-vulnerability
config: Orb of Vulnerability should block all resistances from work (Resistance skill, dwarves, unicorns and so on.
|
2023-04-11 11:10:33 +03:00 |
|
Ivan Savenko
|
7fcd750d0f
|
Merge pull request #1904 from vcmi/fix_pandora_amounts
Fix pandora amounts
|
2023-04-11 11:10:05 +03:00 |
|
Ivan Savenko
|
e25cd7f90f
|
Merge pull request #1934 from IvanSavenko/beta_fixes
Fixed bugs for 1.2 release
|
2023-04-11 11:08:40 +03:00 |
|
Konstantin
|
b82374c4a9
|
config: Orb of Vulnerability should block all resistances
Just set MAGIC_RESISTANCE and SPELL_RESISTANCE_AURA to 0
by INDEPENDENT_MIN, will work.
|
2023-04-10 22:07:22 +03:00 |
|
DjWarmonger
|
4bd3cc1679
|
Update lib/mapObjects/ObjectTemplate.h
Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>
|
2023-04-10 20:45:41 +02:00 |
|
Tomasz Zieliński
|
3c87b3934d
|
Do not place object visible tiles over the top of the map.
|
2023-04-10 19:26:53 +02:00 |
|
nordsoft
|
49255e5a3f
|
Adjustable layout for launcher
|
2023-04-10 20:33:02 +04:00 |
|
Ivan Savenko
|
9ea746a68c
|
Merge pull request #1935 from rilian-la-te/fix-spell-display
Fix spell display
|
2023-04-10 18:28:23 +03:00 |
|
Michael
|
94d339ca22
|
Android Launcher - Language (#1914)
* codepage -> language
* Update strings.xml
* change mod repo on android
|
2023-04-10 18:24:15 +03:00 |
|
Konstantin
|
2eaecfd1ae
|
ObstacleCasterProxy: beta branch
|
2023-04-10 15:41:58 +03:00 |
|
Konstantin
|
4f3c826196
|
vcmi: manaLimit should be spellcaster property
|
2023-04-10 15:35:21 +03:00 |
|
Konstantin
|
40bea35a26
|
CHeroWindow: fix picked art mana limit display
|
2023-04-10 15:35:21 +03:00 |
|
Ivan Savenko
|
07230f3b47
|
Attempt to fix stack splitting on macos
|
2023-04-10 14:34:17 +03:00 |
|
Ivan Savenko
|
5046f916d6
|
Fix filtering of objects by terrain in editor
|
2023-04-10 14:33:53 +03:00 |
|
Ivan Savenko
|
02c9a3f3d8
|
Correctly reset UI on aborting Clone/Sacrifice
|
2023-04-10 14:33:24 +03:00 |
|
Ivan Savenko
|
e2d0cd37e4
|
Merge pull request #1910 from IvanSavenko/beta_fixes
Fixes for 1.2 branch
|
2023-04-09 20:09:03 +03:00 |
|
Ivan Savenko
|
bfd77d871c
|
Merge pull request #1918 from IvanSavenko/fix_map_loading
Fix vcmi map loading
|
2023-04-09 20:08:23 +03:00 |
|
Ivan Savenko
|
6e90c0fd09
|
Merge pull request #1913 from IvanSavenko/fix_shooting_yourself_in_the_foot
Fix initialization of spell effects registry
|
2023-04-09 20:07:29 +03:00 |
|
Andrii Danylchenko
|
737c34b8c6
|
BattleAI: avoid selfblocking on siege
|
2023-04-09 16:22:37 +03:00 |
|
Ivan Savenko
|
a6ce99573c
|
Added fallback identifiers for reading older vcmi maps
|
2023-04-09 12:27:33 +03:00 |
|
Ivan Savenko
|
ae5d273df9
|
Merge pull request #1905 from IvanSavenko/fix_rewardables
Fixed UI of objects that provide one reward that can be refused
|
2023-04-08 22:15:22 +03:00 |
|
Adriankhl
|
1d6192ca62
|
Shut down the thread for tactic phase properly
|
2023-04-08 22:52:46 +04:00 |
|
Ivan Savenko
|
84af64ce6b
|
Removed magical initialization of registry via static variables
|
2023-04-08 21:29:04 +03:00 |
|
Ivan Savenko
|
454168897e
|
Fix handling of invalid hotkeys in configurable UI
|
2023-04-08 19:53:13 +03:00 |
|
Ivan Savenko
|
71ddaeea6e
|
Fix crash on missing music file
|
2023-04-08 19:47:16 +03:00 |
|
Ivan Savenko
|
4d37686eb3
|
Merge pull request #1901 from rilian-la-te/disable-info-bar-scroll
InfoBar: disable scrollbar
|
2023-04-08 19:12:48 +03:00 |
|
Ivan Savenko
|
d00fa5bf86
|
Merge pull request #1887 from Adriankhl/fix_dropbox_left_click
Fix: close dropbox with left mouse click outside of the dropbox
|
2023-04-08 19:11:50 +03:00 |
|
Ivan Savenko
|
0abc00f82e
|
Fix assertion failure in in-game console
|
2023-04-08 18:53:47 +03:00 |
|
Ivan Savenko
|
3dedc963f7
|
Fix double-playing of battle effects
|
2023-04-08 18:53:28 +03:00 |
|
Konstantin
|
50c9a57133
|
InfoBar: fix tiny selection with data
|
2023-04-08 01:44:08 +03:00 |
|
Ivan Savenko
|
50da080130
|
Fixed UI of objects that provide one reward that can be refused
|
2023-04-08 00:13:38 +03:00 |
|
Tomasz Zieliński
|
cf1f9c456b
|
Removed unrelated comment
|
2023-04-07 21:40:47 +02:00 |
|
Tomasz Zieliński
|
37f1bf9d78
|
Merge remote-tracking branch 'origin/beta' into fix_pandora_amounts
|
2023-04-07 21:26:36 +02:00 |
|
Tomasz Zieliński
|
f1c52f501d
|
Fix Pandora Box creature amounts to match OH3 exactly.
|
2023-04-07 21:23:34 +02:00 |
|
Konstantin
|
f8c15f3a4b
|
InfoBar: disable scrollbar
|
2023-04-07 20:50:47 +03:00 |
|
Ivan Savenko
|
1590c710dd
|
Merge pull request #1886 from rilian-la-te/fix-rmg-levels
vcmi: fix rmg header levels
|
2023-04-07 12:43:34 +03:00 |
|
Ivan Savenko
|
f3aed901fd
|
Merge pull request #1883 from rilian-la-te/fixup-healing-destination
CGameHandler: fixup healing destination
|
2023-04-07 12:42:52 +03:00 |
|
Ivan Savenko
|
e306e8f9ce
|
Merge pull request #1879 from kambala-decapitator/single-process-development-mode
fix "development mode" condition when building in single process mode
|
2023-04-07 12:42:03 +03:00 |
|
Ivan Savenko
|
c675e6878a
|
Merge pull request #1878 from IvanSavenko/fix_battle_ui
Fix visual glitches in battle UI
|
2023-04-07 12:41:29 +03:00 |
|
Ivan Savenko
|
d8faacc9f2
|
Merge pull request #1875 from IvanSavenko/ttf_fonts_fallback
TTF fonts fallback
|
2023-04-07 12:41:00 +03:00 |
|
Ivan Savenko
|
c304687b2a
|
Merge pull request #1873 from IvanSavenko/fix_stack_experience_bonuses
Fix stack experience bonuses
|
2023-04-07 12:38:23 +03:00 |
|
Adriankhl
|
57409a0d94
|
fix: close dropbox with left mouse click outside of the dropbox
|
2023-04-06 18:32:21 +02:00 |
|
Konstantin
|
a04d8b34f3
|
vcmi: fix rmg header levels
It was printed as char, not as int.
|
2023-04-06 12:48:53 +03:00 |
|
Konstantin
|
dc7d0297a7
|
CGameHandler: fixup healing destination
If it contains hex, not unit, server complains.
Add actual unit there.
|
2023-04-06 00:21:21 +03:00 |
|
Andrey Filipenkov
|
1da06e04cc
|
fix "development mode" condition when building in single process mode
|
2023-04-05 20:22:29 +03:00 |
|