games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity
12,756 Commits 30 Branches 75 Tags
0d7f3e61c2f5c532e53c7f8871ce314d71eaf962
Commit Graph
78 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nordsoft91andGitHub 0d7f3e61c2 Merge pull request #2789 from vcmi/Nordsoft91-patch-2 
Update mod.json schema
 2023-09-10 02:08:48 +02:00
Nordsoft91andGitHub d011e1ff0d Update mod.json schema 2023-09-09 15:24:52 +02:00
Nordsoft91andGitHub 93b889eb0f Merge pull request #2785 from vcmi/Nordsoft91-patch-1 2023-09-09 10:14:42 +02:00
Nordsoft91andGitHub d6ff553cac Fix typo 2023-09-09 02:14:27 +02:00
Nordsoft91andGitHub 24ad06b5c3 Merge pull request #2726 from Nordsoft91/launcher-size-support 2023-09-08 05:47:06 +04:00
Nordsoft91andGitHub 43ef20efc5 Merge pull request #2748 from Nordsoft91/lobby-chat 
Advanced chat in lobby
 2023-09-07 22:01:43 +04:00
Nordsoft91andGitHub a0fead361b Merge pull request #2750 from Nordsoft91/editor-improvements 2023-09-05 12:28:41 +04:00
Nordsoft91andGitHub 2eaed0c983 Merge pull request #2743 from Laserlicht/fix_difficulty_widget 
[fix] difficulty widget
 2023-09-03 17:57:43 +04:00
Nordsoft91andGitHub 2057624cbc Merge pull request #2741 from Laserlicht/folder_order 
[fix] folder order
 2023-09-03 17:56:56 +04:00
Nordsoft91andGitHub 244db2da33 Merge pull request #2739 from Gwart/bugfix/#2646-hero-exchange-server-compliant 
#2646 add a null check if creature is empty
 2023-09-03 11:45:32 +04:00
Nordsoft91andGitHub 9af73c2212 Merge pull request #2723 from Nordsoft91/versions-fix 
Launcher & lib versions unification
 2023-09-02 19:42:46 +04:00
Nordsoft91andGitHub 48e6e0228c Merge pull request #2722 from Nordsoft91/launcher-doubleclick 
Launcher mod double click behavior
 2023-09-02 19:42:28 +04:00
Nordsoft91andGitHub 91565225c6 Merge pull request #2728 from Nordsoft91/turn-timer-fix 2023-09-02 16:29:20 +04:00
Nordsoft91GitHubIvan Savenko
 		348b6b0f32 Update launcher/modManager/cmodlistview_moc.cpp 
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
 2023-09-02 14:11:56 +04:00
Nordsoft91andGitHub c45ab07d0b Merge pull request #2698 from Nordsoft91/turn-timer 
Turn timer fixes
 2023-09-01 00:31:52 +04:00
Nordsoft91andGitHub 49614f5851 Merge pull request #2695 from Nordsoft91/mod-compatibility 2023-08-31 12:14:54 +04:00
Nordsoft91andGitHub 2022d55d40 Merge pull request #2692 from Nordsoft91/accept-turn 
Accept turn query
 2023-08-28 19:44:46 +04:00
Nordsoft91andGitHub 8e9dd697ff Merge pull request #2674 from Nordsoft91/turn-timer 
Chess Timer UI and battle timer fixes
 2023-08-28 18:53:41 +04:00
Nordsoft91andGitHub 1586c6c6a0 Merge pull request #2668 from IvanSavenko/remove_current_player 
Remove "currentPlayer" from gamestate
 2023-08-28 17:10:28 +04:00
Nordsoft91andGitHub 6394a77270 Merge pull request #2683 from Laserlicht/zoom_dead_area 
dead area for zooming
 2023-08-28 17:09:15 +04:00
Nordsoft91andGitHub ffc4b989f0 Merge pull request #2679 from Laserlicht/smooth_scroll 
Smooth scroll
 2023-08-28 17:08:57 +04:00
Nordsoft91andGitHub 979cf129bc Merge pull request #2637 from Laserlicht/autosave 2023-08-25 00:09:49 +04:00
Nordsoft91andGitHub 07210973f4 Merge pull request #2653 from Nordsoft91/turn-timer 2023-08-25 00:09:00 +04:00
Nordsoft91andGitHub db542d2710 Merge pull request #2664 from Nordsoft91/fix-ai-movement-freeze 2023-08-25 00:08:40 +04:00
Nordsoft91andGitHub 1bad0e96ef Merge pull request #2635 from Nordsoft91/loading-bar 
Loading progress bar
 2023-08-23 17:28:19 +04:00
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
Nordsoft91GitHubAndrey FilipenkovIvan Savenko
 		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
Nordsoft91GitHubAndrey Filipenkov
 		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
Nordsoft91GitHubAndrey Filipenkov
 		824aec8416 Apply suggestions from code review 
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
 2022-09-24 13:03:46 +04:00
Nordsoft91GitHubAndrey Filipenkov
 		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
Nordsoft91GitHubAndrii Danylchenko
 		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