games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-28 23:06:24 +02:00
Code Issues Releases Activity
15,074 Commits 19 Branches 63 Tags 113 MiB
829b754091
Commit Graph

357 Commits

Author SHA1 Message Date
Ivan Savenko
b30db5fc1f
Merge pull request #2301 from Laserlicht/haptic_feedback 
Haptic feedback
 2023-07-13 12:56:54 +03:00
Ivan Savenko
78415c573b
Merge pull request #2289 from IvanSavenko/resolution_fixes 
Fix issues with changing game resolution
 2023-07-11 14:35:07 +03:00
Dydzio
fbf0bf78d6 Configurable autosave limit and prefix - ingame handling 2023-07-08 23:04:01 +02:00
Michael
ff51b8f46b
Setting for haptic feedback 2023-07-08 18:47:38 +02:00
heroesiiifan
108e768ae2
fix language syntax error 2023-07-07 22:59:40 +00:00
Ivan Savenko
0c83e34093 Implemented reserved area for iOS notch / cutout 2023-07-07 14:29:03 +03:00
Ivan Savenko
fa4a0004b2
Merge pull request #2291 from IvanSavenko/terrain_animations_config 
Moved hardcoded terrain palette-cycling animations to config
 2023-07-07 14:28:39 +03:00
DjWarmonger
f9e1a70ab8
Merge pull request #2278 from vcmi/rmg_factions 
Rmg factions
 2023-07-06 22:15:36 +02:00
Tomasz Zieliński
fcf7a29f45 Update schemat for RMG template 2023-07-06 17:39:09 +02:00
Ivan Savenko
3bce245780 Moved hardcoded terrain palette-cycling animations to config 2023-07-05 22:07:20 +03:00
Ivan Savenko
02f23086b6 Updated according to review 2023-07-03 14:34:53 +03:00
Ivan Savenko
8ac56f06b0 Added Hungarian 2023-07-03 14:34:53 +03:00
Ivan Savenko
4b366e1fe8 Added new languages: Czech, Italian, Korean 2023-07-03 14:34:53 +03:00
Ivan Savenko
21c45bd84f Added new settings to Launcher: 
- UI Scaling selection
- Allied AI selection
- Separate main/secondary mod repo
 2023-07-03 14:34:53 +03:00
Ivan Savenko
e0ea994656 Moved some pathfinding options to game settings 2023-06-25 17:42:36 +03:00
krs
afe0146021 Renamed settings option to reflect that same option is used for both ranges. 2023-06-23 19:50:39 +03:00
Ivan Savenko
56680e102d
Merge pull request #2245 from IvanSavenko/platform_settings 
Allow defining default values of settings per platform
 2023-06-23 13:32:30 +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
Mike
fe535ec470 Updated settings.json 
Corrected comma related formatting errors
 2023-06-21 16:05:29 -07:00
Ivan Savenko
8f602b2ef6 Allow defining default values of settings per platform 2023-06-21 10:55:30 +03:00
Ivan Savenko
ffdac314e9 Added selection of long touch duration 2023-06-20 19:58:05 +03:00
Ivan Savenko
d1917898a9 Update validation schemas 2023-06-20 19:37:27 +03:00
Ivan Savenko
77b58bc66d Cleaned up object constructors to reduce duplicated code 2023-06-16 17:59:50 +03:00
Ivan Savenko
8614419954
Merge pull request #2208 from IvanSavenko/obstacles_foreground 
Implemented foreground/background obstacles
 2023-06-14 15:49:08 +03:00
krs
9496cb4058 rangedFullDamageLimitHighlightOnHover is now turned off by default 2023-06-11 19:36:46 +03:00
krs
c0591573bf Working Version 2023-06-11 18:40:47 +03:00
Ivan Savenko
428fb832c6 Implemented foreground/background obstacles: 
- obstacles now have "foreground" field
- if "foreground" field set, obstacle will appear on top of other
objects, such as units
- if "foreground" is not set, obstacle will appear below units
- updated schema and cleared up obstacles config
 2023-06-06 15:53:14 +03:00
Ivan Savenko
238a02eb5e It is now possible to cancel attack-via-swiping by moving finger away 2023-06-05 19:20:20 +03:00
Ivan Savenko
6283329aeb Added option to disable edge scrolling 2023-06-05 19:20:20 +03:00
Ivan Savenko
a08ff1e6ef Removed no longer used touchscreen option 2023-06-05 19:20:08 +03:00
Ivan Savenko
b20109c830 Test version of swipe gesture for in-combat attacks 2023-06-05 19:20:08 +03:00
Ivan Savenko
2c7b94d17f Remove unused map swipe option 2023-06-05 19:20:08 +03:00
krs
289a6da3d7 Merge fix for battlefield 2023-05-19 21:23:08 +03:00
krs
105dcf5a9f Fixed white spaces 2023-05-19 21:14:01 +03:00
krs
2e6cae80a9 Schemas rearranged 
Artifact Schema rearranged


Battlefield schema rearanged


Bonus schema rearranged


Faction Schema rearanged


Hero Schema rearranged


HeroClass schema rearranged


MapHeader schema updated, something fishy in events


Mod schema updated. Settings not complete


Object schema rearranged


Object schema rearranged


object type schema rearranged


obstacles schema rearranged


Rivers schema updated


roads schema updated


script schema updated


skill schema updated


spell schema updated


template schema update


terrain schemas updated


town buildings schema update


town siege schema updated


town structure schema updated
 2023-05-19 21:04:47 +03:00
Ivan Savenko
805721f8d7 Add missing check for file presence 2023-05-16 21:58:09 +03:00
Ivan Savenko
5e3a0a1a75 Fixed json validation 2023-05-15 22:22:54 +03:00
Ivan Savenko
a4b102e46f Implemented UI scaling (non-selectable option for now) 2023-05-09 13:10:33 +03:00
Ivan Savenko
4c93b8f3f2 Use separate json for vcmi-1.3 2023-05-04 19:38:36 +03:00
Konstantin
05eccbc2bb vcmi: split bonus to enumerator and HeroBonus.h 2023-05-03 18:01:06 +03:00
nordsoft
bfc75ccd39 Merge remote-tracking branch 'upstream/develop' into battle-dialog 2023-04-11 02:22:42 +04:00
krs
709a8a6eb3 movementHighlightOnHover is now saved with settings 2023-04-08 20:42:16 +03:00
nordsoft
52b53ab307 Feature and setting implemented 2023-04-08 01:49:59 +04:00
nordsoft
ece8a2a41f Merge branch 'battle-dialog' into battle-dialog2 
# Conflicts:
#	AI/BattleAI/BattleAI.h
#	AI/StupidAI/StupidAI.h
#	client/CPlayerInterface.cpp
#	client/CPlayerInterface.h
#	client/Client.cpp
#	client/NetPacksClient.cpp
#	client/battle/CBattleInterface.cpp
#	client/battle/CBattleInterface.h
#	client/battle/CBattleInterfaceClasses.cpp
#	client/battle/CBattleInterfaceClasses.h
#	config/schemas/settings.json
#	lib/CGameInterface.h
#	lib/IGameEventsReceiver.h
#	lib/NetPacks.h
#	lib/NetPacksLib.cpp
#	lib/battle/BattleInfo.cpp
#	server/CGameHandler.cpp
#	server/CQuery.h
 2023-04-06 19:53:52 +04:00
Ivan Savenko
307065a633 Merge beta into develop 2023-04-04 16:06:20 +03:00
Ivan Savenko
220f4531a1 Changed default mod repository path 2023-03-31 23:18:45 +03:00
Konstantin
a639bd2606 spells: rework isMagical() 
Now it is a flag of a spell, and not a target condition.
This fixes resistance to bind effect
 2023-03-31 01:01:25 +03:00
Konstantin
aab5b47038 vcmi: setup moats using MoatAbility 
Setup moats using moat ability, need playtest for now.
-3 to defence not added for now.
 2023-03-31 01:01:25 +03:00
Ivan Savenko
8a3e1b0230
Merge pull request #1789 from IvanSavenko/beta_fixes 
Fixes for 1.2 release
 2023-03-30 00:09:51 +03:00
Ivan Savenko
21ea50ca1e Check obstacle image for existance in schema 2023-03-28 17:02:18 +03:00
Ivan Savenko
b3b2426b19 Updated mod.json schema 2023-03-27 22:33:36 +03:00
Ivan Savenko
d1f6497bc8
Merge pull request #1768 from vcmi/default_ai 
Make NKAI default AI
 2023-03-27 21:20:01 +03:00
Ivan Savenko
7fd0d0beb1 Made English first language so invalid values would reset to it 2023-03-25 23:54:51 +02:00
Tomasz Zieliński
ab57941f0a Make NKAI default AI. 2023-03-25 12:17:35 +01:00
Ivan Savenko
aea2a1e22e Fixed loading of settings from mods 2023-03-16 18:11:36 +02:00
Konstantin
b91d7418dd vcmi: remove ONLY_ENEMY_ARMY range 
It should be used directly instead of alias, propagation updater
also can be useful for any other updaters can be added.
 2023-03-16 16:46:42 +03:00
Konstantin
f26fac5562 vcmi: move obligatory marker to CSkillHandler 
It is working, now it is possible to
define other obligatory skills than wisdom or magic schools,
but only 2 types of obligatory skills exists - like wisdom and
like magic school
 2023-03-16 16:46:41 +03:00
Konstantin
9280d70819 vcmi: remove deprecated "specalties" node 
Use new bonus system format
 2023-03-16 16:46:41 +03:00
Konstantin
d9496dd9f7 vcmi: remove vector speciality format 
It is deprecated and will not be used anymore.
 2023-03-16 16:46:41 +03:00
Konstantin
7e9a15c20b vcmi: add PERCENT_TO_TARGET_SOURCE value type 
It will break saves!!!

Added a new value type to bonuses which allows to add percentage
only to one foreign bonus source, for example, to add percentage to all
bonuses from secondary skills from hero special.
 2023-03-16 16:46:41 +03:00
Ivan Savenko
a062e5e425 - Implemented proposition to install translation mod when necessary 2023-03-14 16:02:16 +02:00
Ivan Savenko
c3d78ba761 Partially implemented Setup Window 2023-03-14 16:02:16 +02:00
Ivan Savenko
6fe319329b Fix language selection 2023-03-14 16:02:16 +02:00
Konstantin
a0c644a0e5 vcmi: actually implement AUTO for CInfoWindow 
This is possible to use infobar interactions now.
 2023-03-11 21:41:57 +03:00
Ivan Savenko
58cfea02f1 Added option to skip validation of mods 2023-03-07 00:06:58 +02:00
Ivan Savenko
f768a5543e Removed deprecated encoding option 2023-03-07 00:06:58 +02:00
Ivan Savenko
499496f9d0 Restored Simplified Chinese support 2023-03-07 00:06:58 +02:00
Ivan Savenko
2e69a4769d Implemented framerate limit option (not available in UI) 2023-03-05 21:06:52 +02:00
Ivan Savenko
7ef5163d9d
Merge pull request #1581 from IvanSavenko/map_render_rewrite 
Adventure Map - rendering rewrite
 2023-03-05 19:51:07 +02:00
Ivan Savenko
b9056ef248 Moved swipe handling to TerrainRect class 2023-03-05 17:57:34 +02:00
Ivan Savenko
cda78fb30f Added option to disable animations for very low-end systems 2023-03-05 17:48:02 +02:00
Ivan Savenko
ebe996fa74 Hero movement speed and map scrolling speed now matches H3 2023-03-05 17:48:02 +02:00
Ivan Savenko
6643408cdd Fixed localization validation 2023-03-05 17:30:38 +02:00
Ivan Savenko
ad87735d8d Updated schema 2023-03-05 17:30:38 +02:00
Konstantin
f6695737d6 vcmi: allow loads bonuses info from mods 
It is useful for making custom bonus graphics into mods, now
mods just replace game config, which is not good.
 2023-03-04 22:50:00 +03:00
Dydzio
775db89241 Fix battle settings UI labels, add "dont show battle intro" setting 2023-02-15 20:29:29 +01:00
Dydzio
1d153f4ee9 "ForceMovementInfo" support + make other settings tab 2023-02-14 23:45:45 +01:00
Dydzio
d04c53e7e0 Merge branch 'develop' into settings-rework 2023-02-02 11:55:13 +01:00
Ivan Savenko
0ba74fea73
Merge pull request #1515 from IvanSavenko/time_based_animations 
Time based animations
 2023-02-01 12:25:54 +02:00
Dydzio
cc9d65a341 Make battle settings callable without battle, save last settings tab 2023-01-30 22:15:37 +01:00
Ivan Savenko
57ee9a9bf3 Merge vcmi/beta into vcmi/develop 2023-01-29 18:21:55 +02:00
Ivan Savenko
3749074a4d Renamed speed setting name to force-reset it to new scale 2023-01-28 16:49:35 +02:00
Ivan Savenko
a853045509 Removed unused value from creature config 2023-01-28 13:56:51 +02:00
Ivan Savenko
bc27faea57 All objects will register single name per object type 2023-01-26 23:32:55 +02:00
Ivan Savenko
f71cbc5d9b Fixed loading of object names 2023-01-26 23:27:26 +02:00
Ivan Savenko
6f324216db Bugfixing 2023-01-26 23:27:24 +02:00
Ivan Savenko
6c472339ce Refactoring of ObjectClassesHandler 2023-01-26 23:26:49 +02:00
Ivan Savenko
39131eba3e Added translation support for mods. VCMI translations are now in mod. 
Moved existing (English) translation to vcmi mod
Added translations for:
- German
- Polish
- Ukrainian
 2023-01-25 12:33:54 +02:00
Ivan Savenko
f5a7f5173f Cursor type is now configurable in Launcher 2023-01-20 15:15:19 +02:00
Ivan Savenko
e684300715 Fix mod validation for terrains 2023-01-18 15:48:10 +02:00
Andrii Danylchenko
6c843bce0b SDL relative pointer for android 2023-01-18 10:38:55 +02:00
Ivan Savenko
c400416058
Merge pull request #1409 from IvanSavenko/translate_terrain 
Refactoring of terrain handlers
 2023-01-18 00:12:31 +02:00
Ivan Savenko
05ac217b0f Merge with vcmi/develop 2023-01-17 23:02:25 +02:00
Ivan Savenko
633b9ef3be Native terrain is now required for faction, opt-out with value "none" 2023-01-17 22:59:14 +02:00
Ivan Savenko
96141f010b Merge remote-tracking branch 'vcmi/develop' into translate_launcher 2023-01-15 23:55:49 +02:00
Ivan Savenko
6985f2e050 Cursor type can now be set in settings.json 2023-01-15 21:18:34 +02:00
Ivan Savenko
246281e62a Merged vcmi/beta with vcmi/develop 2023-01-15 17:46:42 +02:00
Ivan Savenko
bec894c348 Implemented automatic detection of H3 files language/encoding 2023-01-15 17:32:39 +02:00
Andrey Filipenkov
efbed6000b fix typo 2023-01-15 17:28:09 +02:00
Ivan Savenko
192e856797 merge with vcmi/develop 2023-01-11 16:47:53 +02:00
Ivan Savenko
668aee71ff Added schemas for rivers & roads, updated terrain schema 2023-01-10 00:01:35 +02:00
Ivan Savenko
d9aab0a847
Merge pull request #1318 from IvanSavenko/translate_mapeditor 
Translate mapeditor
 2023-01-09 21:25:09 +02:00
Ivan Savenko
84aefc3362 Changed log file format: print timestamp instead of thread ID 2023-01-09 18:34:37 +02:00
Ivan Savenko
67f7e5d042 Apply review suggestions 2023-01-07 16:15:45 +02:00
Ivan Savenko
f9575d6690 Added languages validation to settings schema 2022-12-28 17:57:03 +02:00
Ivan Savenko
abc7c890bf Backported required changes from Launcher branch 2022-12-26 23:26:19 +02:00
Ivan Savenko
9d2704adc3 Updated mod.json schema to include localization support 2022-12-26 00:03:00 +02:00
Ivan Savenko
e4e5278f60 Merge with vcmi/develop 2022-12-25 23:10:52 +02:00
Ivan Savenko
4cd91ffbed Save & load language selection 2022-12-25 23:06:22 +02:00
Ivan Savenko
01e8a83c56 Expanded schema accoring to Nordsoft info 2022-12-20 01:55:59 +04:00
Ivan Savenko
5ae17cb1ff Moved tower shooters info to "vcmi" mod 
Required for file presence validation checks to pass since tower shooter
icons reside in vcmi mod
 2022-12-20 01:55:59 +04:00
Andrii Danylchenko
82179a9cdb
Merge pull request #1176 from IvanSavenko/tower_shooter_icons 
Tower shooter icons fix
 2022-12-01 12:30:24 +02:00
nordsoft
b7cab0e01d Merge remote-tracking branch 'upstream/develop' into battle-dialog 2022-11-30 01:03:57 +04:00
Ivan Savenko
8b7ca176f8 Updated schema 2022-11-29 15:14:10 +02:00
nordsoft
44e469a2c7 Merge branch 'develop-upstream' into battle-dialog 2022-11-25 14:38:49 +04:00
Nordsoft91
3133c238b8 Merge pull request #1146 from IvanSavenko/ray_projectile 
Implemented ray-like projectiles for shooters
 2022-11-22 03:36:50 +04:00
Ivan Savenko
9afc1eed49 Expanded schema to validate ray configuration 2022-11-16 12:26:56 +02:00
nordsoft
15ba4cda70 Cosmetic improvements for lobby 2022-11-16 04:22:48 +04:00
nordsoft
b253b19dc3 Support draw scenario (doesnt work properly) 2022-11-16 02:50:47 +04:00
Ivan Savenko
6678a747bb Implemented ray-like projectiles for shooters 
- Added missing support for ray-like projectiles
- Archmages, Evil Eyes and Beholders now use ray for shooting
- New method to draw 1 pixel-wide line with color gradient at arbitrary
angle
- fixed incorrect attackClimaxFrame field for Archmages
 2022-11-15 21:42:16 +02:00
nordsoft
e7a8466e2b Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-15 22:09:46 +04:00
Nordsoft91
072e2d72bb
Merge branch 'develop' into battle-dialog 2022-11-12 17:14:15 +04:00
nordsoft
97e5fc8a07 Lobby works 2022-11-08 04:44:34 +04:00
nordsoft
dcda359567 Enable quick combat by default 2022-11-05 22:51:02 +04:00
krs
aab394ff93 #1071 - In latest night builds there are problems with schema obstacle.json and file obstacles.json 2022-11-04 00:06:15 +02:00
nordsoft
1c84cc4521 Merge remote-tracking branch 'upstream/develop' into lobby 2022-11-01 16:30:27 +04:00
nordsoft
dd45d1a9cf Develop game part 2022-10-25 05:27:53 +04:00
nordsoft
aac859a030 Store settings 2022-10-23 23:24:33 +04:00
Andrii Danylchenko
b43e0ff9e4
Merge pull request #972 from vcmi/cpp-map-editor 
Cpp map editor
 2022-10-22 12:42:27 +03:00
nordsoft
5743310aec Revert settings.json 2022-10-09 00:13:39 +04:00
nordsoft
4cb31ea912 Merge remote-tracking branch 'upstream/develop' into cpp-map-editor 2022-10-08 23:24:57 +04:00
nordsoft
0ea5a8fbe7 Merge remote-tracking branch 'upstream/develop' into mp-disconnection 
# Conflicts:
#	server/CVCMIServer.cpp
 2022-10-04 17:41:43 +04:00
nordsoft
16a5414247 Reconnection partially works 2022-10-04 05:09:03 +04:00
nordsoft
512cf014aa Freeze current state 2022-10-03 20:47:00 +04:00
Andrey Filipenkov
e8396401f9 fetch Extra Resolutions mod path from the settings schema 2022-09-27 11:56:13 +03:00
nordsoft
89d0de53da Merge remote-tracking branch 'upstream/develop' into features/cpp-map-editor 
# Conflicts:
#	.github/workflows/github.yml
#	launcher/modManager/cmodlist.cpp
#	lib/CModHandler.cpp
#	lib/CModHandler.h
 2022-09-22 17:09:47 +04:00
nordsoft
0b9f601d2c Squashing editor 2022-09-18 03:23:17 +04:00
Nordsoft91
ad01c7ffce
Vlc obstacles [part 1] (#888) 
* obstacles content handler, entity service and VLC integration
 2022-09-15 11:06:54 +03:00
Andrii Danylchenko
4b4cc3cf4b battlefields in VLC and custom bonuses for terrain patches 2022-09-11 11:31:27 +03:00
Nordsoft91
5862c192b0
Mod from GitHub (#785) 
* Make new dialog for checking updates
* update on startup
* Implemented auto-update
 2022-09-04 19:32:48 +03:00
Nordsoft91
0b29fec63c Rmg water support (#754) 
* Final changes before merge
 2022-06-11 18:40:24 +03:00
Nordsoft91
5054ee011a Rmg water support (#751) 
* Roads added to shipyard
* Load general rmg parameters from config
* Fix issue with default zone guard
* Move magic numbers related to balance to randomMap.json
 2022-06-11 18:40:24 +03:00
Nordsoft91
9d06e51631
Place proper towns in underground (#743) 
Implement feature of proper town selection in underground and surface
* Some minor refactoring of rmg
 2022-05-28 16:03:50 +03:00
Andrii Danylchenko
55b8aac63e fix missed required fields in settings 2022-05-16 12:09:10 +03:00
Andrii Danylchenko
e220918230 full crash dump 2022-05-14 13:23:09 +03:00
Andrii Danylchenko
2fc7cf02b0 tray notification for windows 2022-05-14 13:23:09 +03:00
kdmcser
10cfefdf9d
fix bug: valid json will failed when object template contains zIndex (#698) 2021-07-18 10:44:44 +03:00
AlexVinS
ecaa9f5d0b Entities redesign and a few ERM features 
* Made most Handlers derived from CHandlerBase and moved service API there.
* Declared existing Entity APIs.
* Added basic script context caching
* Started Lua script module
* Started Lua spell effect API
* Started script state persistence
* Started battle info callback binding
* CommitPackage removed
* Extracted spells::Caster to own header; Expanded Spell API.
* implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C
* !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented
* Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key)
* Re-enabled VERM macros.
* !?GM0 added
* !?TM implemented
* Added !!MF:N
* Started !?OB, !!BM, !!HE, !!OW, !!UN
* Added basic support of w-variables
* Added support for ERM indirect variables
* Made !?FU regular trigger
* !!re (ERA loop receiver) implemented
* Fixed ERM receivers with zero args.
 2021-02-14 19:05:43 +03:00
Dmitry Orlov
854a2e6c39 Feature: Mods system improvement, Part III. Bunusing buildings customization. 2021-01-14 01:02:13 +03:00
Dmitry Orlov
f4816b0824 Mod system improvement Part I : Special buildings should work in the modders towns 2020-10-07 12:35:11 +03:00