Commit Graph
53 Commits
Author SHA1 Message Date
Nordsoft91andGitHub e09b13c00a Merge pull request #2576 from Nordsoft91/turn-timer
Implement turn timer feature
2023-08-23 01:48:12 +04:00
Nordsoft91andGitHub ec4da06b56 Merge pull request #2631 from Laserlicht/date_alignment
date alignment
2023-08-22 02:00:49 +04:00
Nordsoft91andGitHub 4edee00a97 Merge pull request #2605 from Laserlicht/map_preview
Map preview
2023-08-21 14:56:21 +04:00
Nordsoft91andGitHub 2f5bd1423c Merge pull request #2623 from Nordsoft91/tutorial 2023-08-20 23:20:27 +04:00
Nordsoft91andGitHub ef4fddd0c4 Merge pull request #2570 from Laserlicht/town_selection_window
Town selection window
2023-08-20 17:37:45 +04:00
Nordsoft91andGitHub e283a80146 Merge pull request #2584 from krs0/feature/Remove_wog_artifacts_from_SoD
Removed WoG artifacts from core. Replaced with unused to avoid crashes.
2023-08-20 03:32:49 +04:00
Nordsoft91andGitHub 4a6deedd5e Merge pull request #2530 from Nordsoft91/tutorial
Support tutorial
2023-08-19 18:06:15 +04:00
Nordsoft91andGitHub 96e820ddac Merge pull request #2517 from Laserlicht/folders 2023-08-17 10:09:37 +04:00
Nordsoft91andGitHub e23936f6dc Merge pull request #2107 from Nordsoft91/town-buildings 2023-05-07 06:04:52 +04:00
Nordsoft91andGitHub 3a731b62b8 Merge pull request #2119 from macomarivas/spanish_translation
Spanish translation updated
2023-05-05 19:23:48 +04:00
Nordsoft91andGitHub 9f5ee885b4 Merge pull request #2105 from rilian-la-te/bonuses-refactor
Split HeroBonus.h to pieces: part1
2023-05-02 15:39:49 +04:00
Nordsoft91andGitHub c9b59735cf Merge pull request #2101 from Nordsoft91/rewardable-expand
Part 2: refactoring for rewardable object
2023-05-02 01:19:57 +04:00
Nordsoft91andGitHub f39f208e05 Merge pull request #1915 from Nordsoft91/vcmi-campaign
VCMI campaigns format
2023-04-23 19:09:59 +04:00
Nordsoft91andGitHub a553a4aa66 Merge pull request #2030 from Nordsoft91/boats 2023-04-22 03:27:00 +04:00
Nordsoft91andGitHub 6b12ee044f Merge pull request #1969 from Nordsoft91/spectator
Single player spectator
2023-04-15 03:33:18 +04:00
Nordsoft91andGitHub 3951bbb395 Merge pull request #1108 from Nordsoft91/battle-dialog
[HDMod features] Quick combat
2023-04-11 21:18:04 +04:00
Nordsoft91andGitHub ebd17c9e4a Merge pull request #1928 from Nordsoft91/cast-reward
Spell cast reward
2023-04-10 22:49:36 +04:00
Nordsoft91andGitHub 03066fd0ba Update changelog 2023-04-02 02:45:40 +04:00
Nordsoft91andGitHub 672bcb488b Merge pull request #1381 from dydzio0614/client-commands-improvements
Client commands code improvements + ingame support
2023-01-18 02:04:38 +04:00
Nordsoft91andGitHub fba76489e2 Merge pull request #1328 from Nordsoft91/editor-lasso
[MapEditor] Implement lasso brush
2023-01-16 21:05:00 +04:00
Nordsoft91andGitHub ea33fed15c Merge branch 'develop' into editor-lasso 2023-01-16 21:04:44 +04:00
Nordsoft91andGitHub 37d1e1e748 Merge pull request #1277 from Nordsoft91/editor-cutcopypaste 2022-12-27 17:28:39 +04:00
Nordsoft91andGitHub a7f521cbd9 Merge pull request #1225 from Nordsoft91/interface-builder 2022-12-25 10:25:57 +04:00
Nordsoft91andGitHub 64fb4a744e Merge pull request #1269 from vcmi/beta
Merge android fix into develop
2022-12-24 22:07:04 +04:00
Nordsoft91andGitHub 785787e454 Merge branch 'develop' into interface-builder 2022-12-24 21:56:29 +04:00
Nordsoft91andGitHub 52782713f8 Merge pull request #1262 from vcmi/beta
Release 1.1
2022-12-23 14:52:00 +04:00
Nordsoft91andGitHub be6b5fc0e5 Merge pull request #1195 from Nordsoft91/editor-drapndrop 2022-12-09 12:05:56 +04:00
3cd8da6a8b Changelog and authors for 1.1 (#1184)
* Changelog and authors for 1.1

* Apply suggestions from code review

Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>

* Update ChangeLog

Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>

* Update ChangeLog

Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>

* Apply suggestions from code review

Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>

Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
2022-12-09 02:40:39 +04:00
Nordsoft91andGitHub 923d4e6e6b Merge pull request #1205 from krs0/feature/PCX_file_conversion_in_Resource_Extractor_throws_exception_on_IOS_(boost__locale_stuff)
PCX file conversion in Resource Extractor throws exception on IOS (boost::locale stuff)
2022-12-06 04:38:27 +04:00
Nordsoft91andGitHub 2a857cf0b9 Merge pull request #1179 from Nordsoft91/ios-files-browser 2022-12-01 16:43:42 +04:00
Nordsoft91andGitHub c6d317e409 Merge pull request #1119 from krs0/feature/H3_original_files_extractor
VCMI H3 original archives extractor #1118
2022-11-29 21:54:57 +04:00
Nordsoft91andGitHub 89b8b87a6b Merge pull request #1156 from vcmi/features/online
Online mode
2022-11-29 20:43:39 +04:00
Nordsoft91andnordsoft 3133c238b8 Merge pull request #1146 from IvanSavenko/ray_projectile
Implemented ray-like projectiles for shooters
2022-11-22 03:36:50 +04:00
Nordsoft91andGitHub 4912f4d5ae Merge pull request #1151 from Nordsoft91/editor-fix-imageload
Fix loading images which aren't divided by 4
2022-11-19 15:08:55 +04:00
Nordsoft91andGitHub 640ebcdca4 Update BitmapHandler.cpp 2022-11-19 01:52:21 +04:00
Nordsoft91andGitHub fef3b7652b Update BitmapHandler.cpp 2022-11-19 01:02:18 +04:00
Nordsoft91andGitHub 1893212abb Merge pull request #1146 from IvanSavenko/ray_projectile
Implemented ray-like projectiles for shooters
2022-11-16 22:45:00 +04:00
Nordsoft91andGitHub 072e2d72bb Merge branch 'develop' into battle-dialog 2022-11-12 17:14:15 +04:00
Nordsoft91andGitHub e5809ac9f7 Add downloads badge 2022-11-08 18:31:09 +04:00
64a801004c Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-10-08 19:41:38 +04:00
Nordsoft91andGitHub d4f97aadf0 Merge branch 'develop' into incomatibility-response 2022-09-25 13:26:07 +04:00
824aec8416 Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-09-24 13:03:46 +04:00
60264aae29 Apply suggestions from code review
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-09-19 01:18:17 +04:00
Nordsoft91andGitHub 9b96fa2351 Merge pull request #44 from Nordsoft91/gui-ux-improvements
Editor UX improvements
2022-09-11 21:14:45 +04:00
Nordsoft91andGitHub 205bb09880 Launcher fixes for mod filesystem (#860)
* Show submods as disabled if parent mod is disabled
* [845] disable button for local mods
Fixes for #812 #851 #852
2022-09-10 19:30:41 +03:00
Nordsoft91andGitHub 59f38fc43a Merge pull request #30 from Nordsoft91/EraseAction
- Erase operation (hotkey: DELETE)
2022-09-07 02:38:07 +04:00
Nordsoft91andGitHub ce2ab1a431 Merge branch 'cpp-map-editor' into EraseAction 2022-09-07 01:46:33 +04:00
Nordsoft91andGitHub cb09ea9814 Merge branch 'cpp-map-editor' into EraseAction 2022-09-06 21:24:07 +04:00
Nordsoft91andGitHub 684fa5c96c Merge branch 'cpp-map-editor' into EraseAction 2022-09-06 20:18:19 +04:00
Nordsoft91andGitHub 2aab315f9c Merge pull request #25 from Nordsoft91/Actions
Undo / redo
2022-09-05 21:06:11 +04:00
Nordsoft91andGitHub 4793ed9679 Merge branch 'cpp-map-editor' into Actions 2022-09-05 21:04:38 +04:00
1b60405487 Update config/schemas/obstacle.json
Co-authored-by: Andrii Danylchenko <doctordoom88@hotmail.com>
2022-08-28 21:01:18 +04:00
Nordsoft91andGitHub a8265c7052 [0002285] Implement feature with extra resources near mines (#742)
* RMG: clear start position
* [0002285] some heaps of resources are placed nearby mines
* Fix leak in case of inability to place resource
* Fix indentation according to vcmi style
* Add constant for random amount of resources
* Code review fixes
2022-05-23 13:08:36 +03:00