games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-16 10:19:47 +02:00
Code Issues Releases Activity
14,778 Commits 19 Branches 61 Tags 108 MiB
d4bedd8d8d
Commit Graph

424 Commits

Author SHA1 Message Date
Ivan Savenko
7d54f6a9c0 Implemented basic support for plural forms in translations 2023-11-13 19:06:56 +02:00
Ivan Savenko
7391f2a6ee Added custom-made blue version of checkbox 2023-11-13 19:06:56 +02:00
Ivan Savenko
e160b8557b Implement min/max simturns callbacks 2023-11-13 19:06:56 +02:00
Ivan Savenko
1f045ab128 Layout improvements for turn options tab 2023-11-13 19:06:56 +02:00
Ivan Savenko
32633d5f52 Initial version of Turn Options tab screen 2023-11-13 19:06:56 +02:00
Ivan Savenko
05e861c862 Added tooltip for revisit object button 2023-11-12 17:42:03 +02:00
Tomasz Zieliński
e105b23a37 Merge remote-tracking branch 'origin/develop' into fix_rmg_teams 
# Conflicts:
#	Mods/vcmi/config/vcmi/rmg/heroes3/newcomers.JSON
#	Mods/vcmi/config/vcmi/rmg/heroes3/southOfHell.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm0k.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/2sm2i(2).JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/3sb0c.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0a.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/5sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0b.JSON
#	Mods/vcmi/config/vcmi/rmg/symmetric/7sb0c.JSON
#	client/lobby/RandomMapTab.cpp
 2023-10-30 20:08:13 +01:00
Tomasz Zieliński
3504cd4e6c More EOL conversions 2023-10-30 19:58:58 +01:00
Tomasz Zieliński
d3352cc6da Fix line endings 2023-10-30 19:54:58 +01:00
Tomasz Zieliński
ec0bf05163 Rename "cpu" parameter to correct "humans" 2023-10-30 17:21:03 +01:00
Tomasz Zieliński
1028041eae Fixed messed up player count in 7sb0c non-standard template 2023-10-30 07:48:17 +01:00
Tomasz Zieliński
b0830a837b Fixed template with no starting towns for players 3 and 4. 2023-10-29 09:35:38 +01:00
Alexander Wilms
0ff423ff0e Change remaining CRLF line endings to LF 
find . -type f -name "*.JSON" -exec dos2unix {} \+;
 2023-10-22 16:41:09 +00:00
Ivan Savenko
3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Laserlicht
9003e55158
color mode to rgb 2023-10-21 19:31:44 +02:00
Nordsoft91
f3acc939b9
Merge pull request #3062 from Laserlicht/sort_towns 
sort town/hero feature
 2023-10-20 22:51:26 +02:00
Johannes Schauer Marin Rodrigues
a1a5bc28c2
convert line endings from CRLF (Windows) to LF (Linux/Unix) 
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
 2023-10-19 16:23:21 +02:00
Laserlicht
e05102192b
heroes and more buttons 2023-10-17 21:13:08 +02:00
Laserlicht
464577be28
new icons 2023-10-17 20:06:35 +02:00
Laserlicht
0401b4a071
adjusted icons 2023-10-15 21:34:58 +02:00
Laserlicht
3b853bff08
sort town feature 2023-10-15 14:31:33 +02:00
Laserlicht
23e1b0b0d5
radial wheel for hero 2023-10-15 02:43:42 +02:00
Alexander Wilms
8d1b5e24dd Add russian translation for connection error message 2023-10-11 18:49:47 +02:00
Alexander Wilms
7c627d8163 Show info dialog when connection to multiplayer server fails 2023-10-10 18:11:11 +02:00
Ivan Savenko
b75a67ef7c
Merge pull request #2973 from IvanSavenko/identifier_explicit_constructor 
Improvements to type safety of Identifier class
 2023-10-05 00:33:07 +03:00
Fabrice Tiercelin
99221c2d56 Fix Chinese translation 2023-10-04 21:04:06 +02:00
Ivan Savenko
d97a7ac5d3
Merge pull request #3000 from Nordsoft91/russian-translation 
Update russian translation
 2023-10-04 19:33:01 +03:00
Ivan Savenko
037efdf5fc Improvements to type safety of Identifier class 
- Constructor of Identifier from integer is now explicit
- Lobby hero/town selection now uses Identifiers instead of int's
- Removed serialization workaround for hero portraits
- Added dummy objects for custom heroes portraits for ID resolver to use
- HeroInstance now stores portrait ID only in case of custom portrait
- Fixed loading of campaign heroes portraits on RoE maps
 2023-10-04 18:05:23 +03:00
nordsoft
7c3329a184 Update translation 2023-10-02 20:46:20 +02:00
Laserlicht
7f4361eb10
name -> path 2023-10-01 01:11:11 +02:00
Laserlicht
23b8a321f6
file ending 2023-10-01 00:46:29 +02:00
Laserlicht
648a37310f
description 2023-10-01 00:35:11 +02:00
Laserlicht
c6adcc40f5
add date; cleanup 2023-09-30 17:56:51 +02:00
Ivan Savenko
71a1ed816a
Merge pull request #2892 from Laserlicht/highscore_menu 
Highscore Menu & end video
 2023-09-27 15:48:47 +03:00
Ivan Savenko
efe3393408
Merge pull request #2947 from Laserlicht/enableUiEnhancements_button 
enableUiEnhancements button
 2023-09-27 15:47:25 +03:00
Nordsoft91
c803b57c33
Merge pull request #2889 from Nordsoft91/mod-compatibility-check 
Proper mod compatibility check logic
 2023-09-26 19:29:46 +02:00
Laserlicht
d40eb03d5b
description 2023-09-26 15:44:35 +02:00
Laserlicht
5061792cce
enableUiEnhancements button 2023-09-25 13:11:08 +02:00
An Vu
b8eba01b7d add Launcher and Map Editor 2023-09-24 21:09:09 +07:00
An Vu
59e1ec3ae7 add vietnamese 2023-09-23 10:59:38 +07:00
nordsoft
dce1ac1538 Redesign mod incompatibility message 2023-09-23 00:32:48 +02:00
Laserlicht
fe0adfa4bd
fix 2023-09-22 02:21:23 +02:00
Laserlicht
92b0e2b400
initial highscore support 2023-09-22 01:39:35 +02:00
Nordsoft91
648e8c7acb
Merge pull request #2856 from Laserlicht/hero_overview 
Hero overview
 2023-09-19 19:36:19 +02:00
Laserlicht
95e8c7ce2e
suggestions 2023-09-18 16:45:05 +02:00
Laserlicht
a994fa00aa
fixes; translation 2023-09-17 16:15:17 +02:00
Alexander Wilms
ee935e9fa7 Fix JSON files 2023-09-17 12:36:57 +00:00
Ivan Savenko
f8541d0ae4 Merge branch 'vcmi/master' into 'vcmi/develop' 2023-09-15 13:59:02 +03:00
Ivan Savenko
8980286ef7
Merge pull request #2817 from cewbdex/czech-init 
Initial Czech translation 2
 2023-09-14 12:23:58 +03:00
Kryštof Černý
db8da40e2c Last minute fixes 2023-09-13 23:20:37 +02:00
Kryštof Černý
26d8981221 More work on Czech translation 2023-09-13 08:32:55 +02:00
Kryštof Černý
abfd1394b7
Add dots to english.json for improved consistency 2023-09-13 08:19:20 +02:00
Kryštof Černý
d93d84a668 Add Czech to mod.json 2023-09-12 20:41:16 +02:00
Kryštof Černý
7adce2c661 Initial Czech translation 2023-09-12 20:35:01 +02:00
Ivan Savenko
d070953c28 Fix open backpack strings 2023-09-12 21:28:36 +03:00
Kryštof Černý
8639d5ff7c
Remove dot in english.json for consistency 2023-09-12 16:27:43 +02:00
Ivan Savenko
e8453916cf Merge remote-tracking branch 'vcmi/beta' into develop 2023-09-08 18:49:06 +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
635884cb05 Replaced show unit info with fill with one's option in radial 2023-09-07 13:55:58 +03:00
Alexander Wilms
c0f0211098 Update VCMI icon (#2672) 
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
 2023-09-05 23:57:19 +03:00
Alexander Wilms
d2f0a80573
Update VCMI icon (#2672) 
* Update VCMI icon

Fixes #1993

Sources will be added to https://github.com/vcmi/vcmi-assets

* Use entire canvas height for shield, add remaining icons

* Use a slighty more saturated brown

* Align VCMI letters to pixel grid for 32px icons

* Align VCMI letters to pixel grid for 48px icon

* Align VCMI letters to pixel grid for 64px icon

* Add 96px icon to .ico

* Update Android and iOS icons

* Install 22px icon on Linux

* Update macOS .icns file

* Add more icons

* Update iOS icons

* Add more sizes to .ico files

* Don't use .png inside .ico

* Only include resolutions up to 256px in .ico files

* Center map editor icon
 2023-09-01 22:36:32 +03:00
Nordsoft91
c45ab07d0b
Merge pull request #2698 from Nordsoft91/turn-timer 
Turn timer fixes
 2023-09-01 00:31:52 +04:00
nordsoft
d7f0698651 Change text hints 2023-08-31 20:46:48 +04:00
Dydzio
03ef5b6b0f Split artifacts bag button background and icon 2023-08-29 18:53:50 +02:00
nordsoft
c8243313b8 Translations for turn timers 2023-08-29 14:53:15 +04:00
Michael
44ece25042
disable unavailable heroes 2023-08-29 00:14:49 +02:00
Ivan Savenko
695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
nordsoft
d50edc28ab Merge remote-tracking branch 'upstream/develop' into turn-timer 
# Conflicts:
#	server/CGameHandler.cpp
#	server/CGameHandler.h
 2023-08-22 00:54:38 +04:00
Dydzio
b53894ac2d Add artifact slots backgrounds 2023-08-20 18:57:53 +02:00
Dydzio
3b99f09495 Update backpack icons 2023-08-20 18:25:57 +02:00
Dydzio
cab6fb76aa Draft version of backpack button + new setting for original H3 UI mode 2023-08-20 17:45:43 +02:00
Nordsoft91
ef4fddd0c4
Merge pull request #2570 from Laserlicht/town_selection_window 
Town selection window
 2023-08-20 17:37:45 +04:00
Nordsoft91
4a6deedd5e
Merge pull request #2530 from Nordsoft91/tutorial 
Support tutorial
 2023-08-19 18:06:15 +04:00
Nordsoft91
96e820ddac
Merge pull request #2517 from Laserlicht/folders 2023-08-17 10:09:37 +04:00
nordsoft
647c7c15a3 Add sound notification for timer 2023-08-17 01:10:03 +04:00
Michael
0452dbd80d
remove copy of cropped asset 2023-08-14 23:08:20 +02:00
Michael
b2c8cab9f1
use playerColored 2023-08-14 22:22:43 +02:00
Michael
c14448ee32
change design 2023-08-13 15:09:48 +02:00
Michael
f71f4a874b
Grid and Activaed 2023-08-12 22:59:45 +02:00
Michael
48747eea9d
bigger line for folder 2023-08-10 23:37:19 +02:00
nordsoft
04c0124759 Remove unnecessary strings 2023-08-09 14:59:26 +04:00
nordsoft
1def98a862 Tutorial implemented 2023-08-09 03:54:09 +04:00
Michael
bbe04c747d
Folder Icon, Save, Folder on top... 2023-08-08 23:46:30 +02:00
Ivan Savenko
77dcac19a0 Version bump for vcmi core mod 2023-08-05 12:48:04 +03:00
Dydzio
852c681e9b Minor fix 2023-08-02 21:12:58 +02:00
Dydzio
915283e126 Update polish translations 2023-08-02 21:10:09 +02:00
Ivan Savenko
bf7d8ba6de Fix typo 2023-07-24 23:16:44 +03:00
DjWarmonger
9b3618b664
Merge pull request #2378 from vcmi/default_template_to_random 
Rename default map template to random map template
 2023-07-24 19:16:02 +02:00
Tomasz Zieliński
d26e46ddfe Remove old id, replace with randomTemplate 2023-07-24 17:39:32 +02:00
Tomasz Zieliński
9eda30f162 Update Russian translation 2023-07-24 16:20:01 +02:00
Tomasz Zieliński
c40c1bf1b0 Added translation for the most common languages 2023-07-24 08:47:37 +02:00
Michael
1ebbb21eea
Update german.json 2023-07-23 15:36:53 +02:00
Tomasz Zieliński
83daef8362 Rename default map template to random map template 2023-07-21 17:28:11 +02:00
Ivan Savenko
4a6d1d0f8b Updated localization 2023-07-21 16:47:49 +03:00
Ivan Savenko
da20665fab Slightly better icon 2023-07-21 15:47:42 +03:00
Ivan Savenko
3a3306863a Moved new texts to config 2023-07-21 15:47:42 +03:00
Ivan Savenko
e2ad8bbf58 Added initial version of selection highlight 2023-07-21 15:47:42 +03:00
Ivan Savenko
8c4faa24f4 Add alpha channel to radial menu items 2023-07-21 15:47:42 +03:00
Ivan Savenko
e3f5ab57f2 Fixed input event ordering. Fixes radial menu show/hide logic 2023-07-21 15:47:42 +03:00
Ivan Savenko
d26595cef7 Radial menu is now a proper window. Minor fixes to positioning. 2023-07-21 15:47:42 +03:00
Ivan Savenko
dca3785f84 Initial version of radial wheel for army management 2023-07-21 15:47:42 +03:00
Michael
36e870ae45
Descriptions 2023-07-20 21:37:23 +02:00
Ivan Savenko
ddda46a7fd
Merge pull request #2358 from dydzio0614/persistent-hero-info-window 
Add option for persistent hero info window as in HD mod
 2023-07-19 14:46:16 +03:00
Dydzio
dea9c6327d
Update english.json 2023-07-18 15:15:38 +02:00
Ivan Savenko
317183e00d
Merge branch 'develop' into info-box-army-management 2023-07-18 16:05:09 +03:00
Dydzio
48a72f90f7 Add option for persistent hero info window as in HD mod 2023-07-17 23:25:16 +02:00
Dydzio
fe26ab4501 Add settings entry, immediately refresh info bar on setting toggle 2023-07-16 14:52:43 +02:00
Ivan Savenko
61750d30c2 Implemented dragging map via left mouse click (off by default) 2023-07-16 12:00:40 +03:00
Michael
ff51b8f46b
Setting for haptic feedback 2023-07-08 18:47:38 +02:00
Ivan Savenko
0c9e23edfa
Merge pull request #2295 from dydzio0614/update-translations 
Update polish translation
 2023-07-08 14:48:30 +03:00
heroesiiifan
ab8da5bcae
Update german.json 2023-07-07 22:56:11 +00:00
heroesiiifan
54775462d4
Update german.json 2023-07-07 22:38:50 +00:00
heroesiiifan
6af81bfe89
Update german.json 2023-07-07 22:37:08 +00:00
Fabrice Tiercelin
8b96f8bab4 French in-game captions 2023-07-07 07:36:44 +02:00
Dydzio
c055a6aaa4 Update polish translation 2023-07-06 20:52:15 +02:00
Tomasz Zieliński
50bed178ca Unban conflux & necro on many templates, suggested by PvP community. 2023-07-02 17:40:12 +02:00
Tomasz Zieliński
b94eb20ddf Update templates to allow new town types and factions wherever possible. 2023-07-02 12:18:46 +02:00
DjWarmonger
a560eaea51
Merge pull request #2237 from vcmi/fictive_connections 
Wide, fictive, repulsive connections
 2023-06-25 19:57:08 +02:00
krs
afe0146021 Renamed settings option to reflect that same option is used for both ranges. 2023-06-23 19:50:39 +03:00
krs
33bbbefdeb First working prototype that mimics rangedFullDamageLimit code 
Next step is to create more generic functions that can be shared between the 2.
 2023-06-23 19:13:39 +03:00
Ivan Savenko
69dc95c3c8
Merge pull request #2235 from IvanSavenko/hota_h3m_support 
Hota h3m support
 2023-06-23 13:32:10 +03:00
Ivan Savenko
a4ecec0a10 Fix swapped localizations 2023-06-23 12:19:26 +03:00
Ivan Savenko
2885694eff Update translation 2023-06-20 20:15:04 +03:00
Ivan Savenko
ffdac314e9 Added selection of long touch duration 2023-06-20 19:58:05 +03:00
Ivan Savenko
7c62146cd6 Update localization 2023-06-20 19:37:28 +03:00
Ivan Savenko
d4728f78ce Support for hota victory conditions 2023-06-20 19:37:27 +03:00
Tomasz Zieliński
9cee751026 Add wide connections to some OH3 templates that had them 2023-06-17 19:10:11 +02:00
DjWarmonger
3be7720868
Merge pull request #2218 from vcmi/pregenerate_treasures 
Okay, merging this for PvP feedback.
 2023-06-13 20:46:34 +02:00
Tomasz Zieliński
6ebbdf0537 More cleanup of Long Run template 2023-06-12 20:51:04 +02:00
Tomasz Zieliński
5219f1db9d Fix useless template setting 2023-06-12 20:33:21 +02:00
krs
0a8daf4d02 Now less source images are used. Flipped versions will be calculated. 2023-06-11 18:46:38 +03:00
krs
4a3426bb70 Hex Edge Highlight Images moved to VCMI mod 2023-06-11 18:44:42 +03:00
krs
c0591573bf Working Version 2023-06-11 18:40:47 +03:00
Ivan Savenko
18105aa96d Minor fixes for settings window 2023-06-05 21:19:10 +03:00
Ivan Savenko
6283329aeb Added option to disable edge scrolling 2023-06-05 19:20:20 +03:00
Ivan Savenko
b04b11b9d1
Merge pull request #2175 from IvanSavenko/map_format_mappings 
HotA map format support  - object mapping
 2023-06-01 22:06:18 +03:00
Ivan Savenko
029322f8bb Removed old test map that requires wog 2023-05-31 23:18:39 +03:00
Ivan Savenko
daaaf84392 Icon index for map format is now defined in config 2023-05-31 23:01:57 +03:00
Michael
8672fc7e3d
Allows to translate default playername 2023-05-28 16:57:24 +02:00
Michael
ee49487dc8
german translation 2023-05-28 15:29:42 +02:00
Michael
3ee7610015
added missing translation strings 2023-05-28 14:58:21 +02:00
Ivan Savenko
d18b240d6d Added separate borderless & exclusive fullscreen options 2023-05-19 22:43:52 +03:00
Ivan Savenko
a0f1bf3928 Implemented user-selectable UI scaling mode 2023-05-09 13:10:33 +03:00
Ivan Savenko
63a1efbdc2 Fixed system options window 2023-05-09 13:10:33 +03:00
Konstantin
b0d2787e86 vcmi: remove DIRECT_DAMAGE_IMMUNITY bonus 
Replace by SPELL_DAMAGE_REDUCTION bonus with 100 value
 2023-05-05 18:57:40 +03:00
Asirome
1fa252add7
Update spanish.json 2023-05-05 13:49:42 +02:00
Asirome
84127e6104
Update spanish.json 2023-05-04 20:03:28 +02:00
Konstantin
1f54a1474c vcmi: remove SHval (replace by simple val) 2023-05-02 00:53:50 +03:00
Ivan Savenko
b0a11ac9d6
Merge pull request #2097 from vcmi/fix_3SM3d 
Add some non-zero value treasures to fix empty zones
 2023-05-01 21:54:46 +03:00
Tomasz Zieliński
67c5381ae8 Add some non-zero value treasures to fix empty zones. 2023-04-29 11:48:47 +02:00