1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Commit Graph

12793 Commits

Author SHA1 Message Date
nordsoft
ef3f0174dd Rewardable seer hut and quest gate 2023-09-13 01:40:07 +02:00
nordsoft
6a0b26d402 Object picker for victory/loss conditions 2023-09-11 20:37:26 +02:00
nordsoft
1ac886ca71 Refactor abstract settings to have map controller 2023-09-11 20:37:26 +02:00
nordsoft
3024aaae30 Town picker in player settings implemented 2023-09-11 20:37:26 +02:00
nordsoft
727284c05e Bump editor version 2023-09-11 20:37:26 +02:00
nordsoft
19407954ed Object picker implemented 2023-09-11 20:37:26 +02:00
nordsoft
082e1194ff Little refactoring 2023-09-11 20:37:26 +02:00
nordsoft
94c6adb28c Temporary fix for vic/loss conditions string 2023-09-11 20:37:25 +02:00
nordsoft
a89a8019ab Added skills customization 2023-09-11 20:37:25 +02:00
nordsoft
445e39ad20 Improved inspector 2023-09-11 20:37:25 +02:00
nordsoft
d07fbc2204 Improve bool fields in inspector 2023-09-11 20:37:25 +02:00
nordsoft
5136305455 Fix hero type for random hero 2023-09-11 20:37:25 +02:00
nordsoft
e912a2db38 Better army widget 2023-09-11 20:37:25 +02:00
Nordsoft91
96433436dd
Merge pull request #2782 from Nordsoft91/editor-improvements-1.4
Map editor: events, rumors
2023-09-11 20:36:13 +02:00
Nordsoft91
a18aa2cf7e
Merge pull request #2802 from Laserlicht/voice_camp
Voice for campaigns
2023-09-11 18:15:23 +02:00
Ivan Savenko
f13f213d8c
Merge pull request #2780 from IvanSavenko/fix_siege_regression
Fix crash on obstacle creation (e.g. moat)
2023-09-11 15:56:33 +03:00
Laserlicht
994da3fcf2
code review 2023-09-11 14:44:07 +02:00
Laserlicht
fa19ed4e7c
format 2023-09-11 14:11:16 +02:00
Laserlicht
00f07f93d1
wait while audio playing; no audio on custom campaigns 2023-09-11 14:04:44 +02:00
Laserlicht
fc1ce85a72
basic voice support 2023-09-11 12:57:10 +02:00
Ivan Savenko
fd3217c875 Fix few more missing BattleID's 2023-09-11 13:20:16 +03:00
Nordsoft91
0d7f3e61c2
Merge pull request #2789 from vcmi/Nordsoft91-patch-2
Update mod.json schema
2023-09-10 02:08:48 +02:00
nordsoft
6e3817f18c Events serialization 2023-09-10 01:54:55 +02:00
Nordsoft91
d011e1ff0d
Update mod.json schema 2023-09-09 15:24:52 +02:00
nordsoft
52cbb613ae Use pragma once 2023-09-09 11:03:19 +02:00
Nordsoft91
93b889eb0f
Merge pull request #2785 from vcmi/Nordsoft91-patch-1 2023-09-09 10:14:42 +02:00
Nordsoft91
d6ff553cac
Fix typo 2023-09-09 02:14:27 +02:00
nordsoft
8f848d8ceb Merge remote-tracking branch 'upstream/develop' into editor-improvements-1.4
# Conflicts:
#	mapeditor/inspector/inspector.cpp
2023-09-08 17:58:14 +02:00
nordsoft
320cd6bf16 Add rumors 2023-09-08 17:54:34 +02:00
Ivan Savenko
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +03:00
Ivan Savenko
7aef40dfb6
Merge pull request #2781 from vcmi/IvanSavenko-patch-1
Fix typo
2023-09-08 16:56:06 +03:00
Ivan Savenko
89c31d0d52
Fix typo 2023-09-08 16:54:51 +03:00
Ivan Savenko
fccd564d8d
Merge pull request #2769 from IvanSavenko/touch_tolerance
(1.3.2) Implemented tolerance for touch events
2023-09-08 16:45:04 +03:00
Ivan Savenko
c4e2417326 Fix crash on obstacle creation (e.g. moat) 2023-09-08 16:35:43 +03:00
Ivan Savenko
8112b8082e Add new option to settings 2023-09-08 13:23:18 +03:00
Ivan Savenko
9e6424c545
Merge pull request #2775 from IvanSavenko/radial_fill_ones
(1.3.2) Add "Fill with single creatures" option to radial wheel
2023-09-08 13:16:00 +03:00
Ivan Savenko
5d67481aaf
Merge pull request #2774 from IvanSavenko/beta_bugfixing
(1.3.2) Beta bugfixing
2023-09-08 13:15:52 +03:00
Ivan Savenko
72858cd0d8
Merge pull request #2768 from IvanSavenko/cherry_picked_fixes
(1.3.2) Cherry picked fixes
2023-09-08 13:15:34 +03:00
Nordsoft91
24ad06b5c3
Merge pull request #2726 from Nordsoft91/launcher-size-support 2023-09-08 05:47:06 +04:00
nordsoft
0148662847 Merge remote-tracking branch 'upstream/develop' into editor-improvements-1.4
# Conflicts:
#	lib/mapObjects/CGObjectInstance.cpp
2023-09-08 03:22:50 +02:00
nordsoft
ad8d7016b6 Resources in time events 2023-09-08 03:21:31 +02:00
nordsoft
bb4905af48 Change resourceID with ResourcePath 2023-09-08 01:54:29 +02:00
nordsoft
8c94d082c8 Merge remote-tracking branch 'upstream/develop' into launcher-size-support 2023-09-08 01:51:52 +02:00
nordsoft
446c61cce1 Timed events implemented 2023-09-08 01:43:01 +02:00
nordsoft
e8b9034149 Add event settings ui 2023-09-07 23:57:56 +02:00
nordsoft
9e14d8d170 Refactoring map settings 2023-09-07 20:19:31 +02:00
Nordsoft91
43ef20efc5
Merge pull request #2748 from Nordsoft91/lobby-chat
Advanced chat in lobby
2023-09-07 22:01:43 +04:00
nordsoft
40ea45498f Rename 2023-09-07 19:57:57 +02:00
Ivan Savenko
587be4c7d5
Merge pull request #2767 from IvanSavenko/dwelling_recruit_fix
Fixes ownership checks for creature recruitment
2023-09-07 15:09:55 +03:00
Ivan Savenko
635884cb05 Replaced show unit info with fill with one's option in radial 2023-09-07 13:55:58 +03:00