1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Commit Graph

12932 Commits

Author SHA1 Message Date
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
Ivan Savenko
3c23b1bbfa Integrated recent changes from wiki's 2023-09-07 13:09:41 +03:00
Ivan Savenko
ba017f0e8d
Merge pull request #2749 from SoundSSGood/artifacts-related-fixes
Artifacts related fixes
2023-09-07 13:03:52 +03:00
Ivan Savenko
33bf367dc0 Updated docs and all internal links 2023-09-07 12:57:03 +03:00
SoundSSGood
1b810b5b93 combined arts assembling fixed 2023-09-07 11:54:52 +03:00
SoundSSGood
f1a6116088 CHeroArea fix 2023-09-07 11:54:50 +03:00
SoundSSGood
3675d88730 fixed highlighting slots 2023-09-07 11:39:29 +03:00
Ivan Savenko
4204e895bc Updated links 2023-09-07 11:04:01 +03:00
Ivan Savenko
9994452ae0 Updated links 2023-09-07 11:04:01 +03:00
Ivan Savenko
c9dfb6e0f8 Updated developer docs 2023-09-07 11:04:01 +03:00
Ivan Savenko
43e52577cc Fix links 2023-09-07 11:04:01 +03:00
Ivan Savenko
704772d6ce Added navigation to player and modders docs 2023-09-07 11:04:01 +03:00
Ivan Savenko
a75d9860db Attempt to fix syntax highlight for json on github 2023-09-07 11:04:01 +03:00
Ivan Savenko
3dcd4c7a6f Modders docs update iteration 2023-09-07 11:04:01 +03:00
Ivan Savenko
06f9513b32 Updated modders docs 2023-09-07 11:04:01 +03:00
Ivan Savenko
489faef604 Updated user docs 2023-09-07 11:04:01 +03:00
Ivan Savenko
6cbc0b6a1f Test moving readme to docs directory 2023-09-07 11:03:59 +03:00
Ivan Savenko
d78106b52b Files renamed for consistency, updated some pages 2023-09-07 11:02:39 +03:00
Ivan Savenko
0f07870f4b Added missing file 2023-09-07 11:02:39 +03:00
Ivan Savenko
4cb10460a8 Moved files from Github wiki to appropriate locations 2023-09-07 11:02:39 +03:00
Ivan Savenko
d8f986815d updated cheat codes info 2023-09-07 11:02:39 +03:00
Ivan Savenko
f65e9e2268 Added few missing pages from website wiki 2023-09-07 11:02:39 +03:00
Ivan Savenko
3e75209939 Added github wiki as it 2023-09-07 11:02:39 +03:00
Ivan Savenko
243094b1ea Imported all data from website wiki 2023-09-07 11:02:39 +03:00
Ivan Savenko
6ac0dabcab First part of documentation import 2023-09-07 11:02:39 +03:00
Ivan Savenko
bef97889e9
Merge pull request #2773 from wb180/blindedStackMoraleFix
Blinded stack should not be able to get morale
2023-09-07 10:54:51 +03:00
Ivan Savenko
ef0eb8e930
Merge pull request #2772 from wb180/tavernPoolHeroesFix
Remove(reduce durations) of bonuses for tavern heroes
2023-09-07 10:54:44 +03:00
Ivan Savenko
4615a4e3ea
Merge pull request #2761 from IvanSavenko/fix_launcher_freeze
(1.3.2) Fix Launcher freeze on startup
2023-09-07 10:51:09 +03:00
Ivan Savenko
f39fbe5151
Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
Ivan Savenko
346eead8e0 Show spell cursor when casting spell in touch input mode 2023-09-06 23:01:43 +03:00
Ivan Savenko
e5719daf11 Added "vcmiartifacts angelWings" form to cheat 2023-09-06 22:44:41 +03:00
Ivan Savenko
d7fb2bcf83 Show message on cancelling spell in combat 2023-09-06 21:54:26 +03:00
Ivan Savenko
5f07f3f091
Merge pull request #2673 from IvanSavenko/concurrent_battles
Concurrent battles support
2023-09-06 19:24:27 +03:00
Ivan Savenko
1f1f978328 Fixed battle replay 2023-09-06 16:03:47 +03:00
Ivan Savenko
8bdddd1324 Fix tests compilation 2023-09-06 16:03:47 +03:00