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

184 Commits

Author SHA1 Message Date
Dydzio
1d153f4ee9 "ForceMovementInfo" support + make other settings tab 2023-02-14 23:45:45 +01:00
Dydzio
daa2b63dde Further UI improvements 2023-02-14 22:22:11 +01:00
Dydzio
be9c71934c Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-14 21:00:17 +01:00
Dydzio
fb06aca0bb Further progress - UI tweaks, new settings etc 2023-02-14 20:30:06 +01:00
Dydzio
80a5595d6c Adding some settings options, minor UI fixes 2023-02-13 23:53:28 +01:00
Konstantin
203b7ed364 vcmi: russian translation 2023-02-12 22:05:25 +03:00
Dydzio
2f171fcc0e Merge branch 'develop' into settings-rework 2023-02-12 15:03:33 +01:00
Ivan Savenko
c8c38ac922
Merge pull request #1386 from IvanSavenko/resolutions_filter
Do not allow selecting resolutions not supported by display
2023-02-12 14:33:39 +02:00
Dydzio
fc7d2b9778 Merge remote-tracking branch 'origin/develop' into settings-rework 2023-02-12 11:55:21 +01:00
Dydzio
b9030fe9cc
Better name for bonus 2023-02-05 00:56:37 +01:00
Dydzio
719a11bdf6 Translate VCMI essential files 2023-02-04 18:51:30 +01:00
Dydzio
a9f279d1ab Add polish translations, tiny improvement of english translations 2023-02-04 18:45:32 +01:00
Ivan Savenko
01322aa4c5 Do not allow selecting resolution no supported by display 2023-02-03 12:57:38 +02:00
Dydzio
9dd692cea4 Initial draft of tabbed settings window 2023-01-30 20:18:59 +01:00
Ivan Savenko
17b510703e Added german, polish, and ukrainian translations 2023-01-25 12:36:03 +02:00
Ivan Savenko
35775b90f8 Moved bonus names to translation 2023-01-25 12:36:02 +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
e4e5278f60 Merge with vcmi/develop 2022-12-25 23:10:52 +02:00
Ivan Savenko
a0c78e8ecb Added german translation by Laserlicht 2022-12-25 21:58:20 +02:00
Ivan Savenko
1696db8a3c Launcher translation upgrade, still WIP:
- launcher can be re-translated without restart
- mod info (name/description/etc) can have localized versions
2022-12-25 13:19:16 +02:00
Ivan Savenko
e8daf4033f Added missing files 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
Ivan Savenko
4a42ef29d9
VCMI mod version bump 2022-11-29 19:07:21 +02:00
Ivan Savenko
3d1f6df0e2 Added simple icon for tower shooter creature, fixes #791 2022-11-29 12:18:27 +02:00
Nordsoft91
99a9680f62 Final preparations for merge into develop (#780)
* version updated, change log updated from release draft
* horse sounds for terrains
* Update and freeze essential files
2022-09-11 11:31:27 +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
Dydzio
e3f52d74af
Stop launcher from asking to update essential files 2019-07-21 09:01:57 +02:00
AlexVinS
0b70baa95e Spells configuration version 2 (effect-based)
* Indirect spell effects loading
* Json serializer improvements
* spell->canBeCastAt do not allow useless cast for any spell
* Added proxy caster class for spell-created obstacles
* Handle damage from spell-created obstacles inside mechanics
* Experimental GameState integration/regression tests
* Ignore mod settings and load only "vcmi" mod when running tests
* fixed https://bugs.vcmi.eu/view.php?id=2765 (with tests)
* Huge improvements of BattleAI regarding spell casts
* AI can cast almost any combat spell except TELEPORT, SACRIFICE and obstacle placement spells.
* Possible fix for https://bugs.vcmi.eu/view.php?id=1811
* CStack factored out to several classes
* [Battle] Allowed RETURN_AFTER_STRIKE effect on server side to be optional
* [Battle] Allowed BattleAction have multiple destinations
* [Spells] Converted limit|immunity to target condition
* [Spells] Use partial configuration reload for backward compatibility handling
* [Tests] Started tests for CUnitState
* Partial fixes of fire shield effect
* [Battle] Do HP calculations in 64 bits
* [BattleAI] Use threading for spell cast evaluation
* [BattleAI] Made AI be able to evaluate modified turn order (on hypothetical battle state)
* Implemented https://bugs.vcmi.eu/view.php?id=2811
* plug rare freeze when hypnotized unit shots vertically
* Correctly apply ONLY_MELEE_FIGHT / ONLY_DISTANCE_FIGHT for unit damage, attack & defense
* [BattleAI] Try to not waste a cast if battle is actually won already
* Extended JsonSerializeFormat API
* fixed https://bugs.vcmi.eu/view.php?id=2847
* Any unit effect can be now chained (not only damage like Chain Lightning)
** only damage effect for now actually uses "chainFactor"
* Possible quick fix for https://bugs.vcmi.eu/view.php?id=2860
2018-02-08 11:37:21 +03:00
FeniksFire
1331c81a8b Update graphics for QuickRecruitmentWindow
Adding graphics maded by edeksumo
2018-01-13 09:49:29 +01:00
FeniksFire
bf4024c3ac Adding bacground for QuickRecruitmentWindow
Adding bacground for CreaturePurchaseCard in QuickRecruitmentWindow
2017-12-23 13:15:05 +01:00
DjWarmonger
db13d7a708 Version 0.99 updates. 2016-11-01 18:25:09 +01:00
DjWarmonger
6122186efa Removed old template duplicated by new package. 2016-09-04 13:31:04 +02:00
AlexVinS
0c21efb202 Start integration of map format into engine 2016-02-09 20:20:03 +03:00
DjWarmonger
c6f714db9c Fixed generation of CPU teams. 2015-06-01 21:57:43 +02:00
DjWarmonger
34a59a2788 - Fixed issues with number of players selection
- Added new template for testing multiple players
2015-05-27 18:58:14 +02:00
DjWarmonger
4388566342 Now each map template is separate submod 2015-05-26 19:04:15 +02:00
DjWarmonger
2e70d8a084 - VCMI will now read templates from mods
- Added partial schema for RMG template
2015-05-26 18:19:41 +02:00
ArseniyShestakov
7dc0fbcca7 Improved Quest Log window graphics
Source can be found in vcmi-assets repository
2015-02-14 00:47:22 +03:00
AlexVinS
53016300ca Restore files accidentely deleted in 01491f9f1e 2014-11-06 22:23:49 +03:00
DjWarmonger
01491f9f1e Fixed #1718 2014-10-01 14:20:00 +02:00
Ivan Savenko
b1285bc506 Merged GUI refactoring into develop, fixed conflicts 2014-08-09 15:01:55 +03:00
DjWarmonger
0763b9a758 - Implemented object per zone limit
- Various tweaks for Travis & repo
2014-07-15 22:33:51 +02:00
Ivan Savenko
9f5704f8ba Uploaded recreated stack queue backgrounds 2014-07-14 22:38:13 +03:00
Ivan Savenko
52da593292 New resolution selection button 2014-07-14 21:49:52 +03:00
Ivan Savenko
5111bff6cc Implemented new button for commander window 2014-07-14 20:43:38 +03:00
Ivan Savenko
7f790f9d6a Quest window now uses new background, using same gfx sources as creature window 2014-07-14 18:07:57 +03:00
DjWarmonger
a076277e2b Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG
Conflicts:
	Mods/WoG/mod.json
2014-07-05 15:27:47 +02:00
DjWarmonger
2b0b6cca61 Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG 2014-07-05 15:25:47 +02:00
Ivan Savenko
60e5815014 Implemented stack artifact handling, no tested yet 2014-07-05 01:22:56 +03:00
Ivan Savenko
079866d99d Implemented leveling up abilities. TODO: implement visible selection/descriptions 2014-07-03 19:05:19 +03:00
DjWarmonger
60a5c764b8 Correct zone placement & sizing for underground maps. 2014-07-03 12:28:51 +02:00
Ivan Savenko
b58bbcbdd8 Leveling up commander skills seems to be working. Optimized some png's to decrease size 2014-07-02 21:38:38 +03:00
Ivan Savenko
617ea79d3c Button overlays are now more generic (not necessarily text), removed old version of creature window 2014-07-02 21:38:38 +03:00
Ivan Savenko
7a9547bb44 New creature window made without use of H3 graphics
This is import of ancient unfinished branch from svn. As of now window is largely finished but commander-related elements are still TODO.

Note that I also uploading graphical content - this is intended and necessary for final goal - to make VCMI functional without any additional graphical pack.
2014-07-02 21:38:38 +03:00
Ivan Savenko
150933d1a1 Updated WoG files to 0.96
- converted remaining bank configs to object format
- implemented missing dwellings from wog, fixes #1819
2014-07-02 20:57:57 +03:00
DjWarmonger
fb5152254d Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup
Conflicts:
	client/CKingdomInterface.cpp
2014-05-02 12:03:02 +02:00
alexvins
4203d69525 Part 2 of new spell configuration
1) spell handler refactored to support modding in general way
2) imunnity icons moved to WoG as they depends on wog`s graphics
3) introduced new class template for handlers (todo: use this in other handlers)
4) save format changed
5) introduced "absolute immunity" - unaffected by "the Orb" etc. (todo: use it in config)
6) new format documented on wiki, added json schema.

* more split of registertypes - fixes 32 mingw build
2014-03-07 13:21:09 +00:00
Ivan Savenko
7d7e65a316 changes in hero class format:
- new property: affinity (might/magic) since in mods it is impossible to
rely on odd/even numeric indexes
- property commander is now part of hero class
2013-12-13 18:27:54 +00:00
Ivan Savenko
2b3405fa50 - minor optimizations
- fixed incorrect error reporting in launcher
- set WoG version to "0.0.0" so full version will be installed from repo
in future
- updated debian required packages list
- launcher will be enabled by default
2013-11-14 13:21:09 +00:00
Ivan Savenko
c4716d0a9a - reordered files in cmake so files with long compile times will be
compiled first.
- changed format of modSettings.json, VCMI should properly update file
on the first run.
- implemented property "defaultTavern" that acts as default value for
"tavern" entry in hero class and town formats.
2013-11-03 12:07:23 +00:00
DjWarmonger
c3e75b799e Fixed reverted changes from old files. 2013-10-13 11:17:39 +00:00
DjWarmonger
78264a625a WoG creature abilities by Kuririn. 2013-10-13 10:12:45 +00:00
Ivan Savenko
208df34fc2 bigfixing & new file: launcher/jsonutils.cpp
- launcher uses json parser from vcmi lib instead of one from Qt #1469
- fixed abilities overrides for some creatures #1476
- fixed hero portraits in seer huts #1402
- ttf fonts will render text in utf-8 mode. Not really useful at this point
- new settings entry, available in launcher: encoding. Unused for now.
2013-09-21 18:29:26 +00:00
Ivan Savenko
cf4b3c91cb - updated wog/vcmi mod.json files
- found situation where JsonNode parser won't report warning: comma after last element in arrays or objects. Fixed this in our config files but parser change is disabled for now due to huge number of warnings from mods.
2013-08-20 19:32:21 +00:00
DjWarmonger
479d63288e WoG will no loger override module settings, which is confusing and not useful, unfortunatelly. 2013-08-20 07:43:45 +00:00
Ivan Savenko
5654fef901 - ZipArchive namespace for operations with zip archives, located in CZipLoader.h/cpp.
- new fields in mod format, for use with mod manager (check config/shemas/mod.json for details)
- removed some 0.92 compatibility from mods loading
- several compile fixes
2013-08-19 11:50:53 +00:00
Ivan Savenko
c81a31c74a - catapult attacks should be identical to H3
- catapult may miss and attack another part of wall instead (this is how it works in H3)
- minor fixes
2013-08-06 11:20:28 +00:00
DjWarmonger
886ef13bec Levels for WoG neutral creatures - fixes #1282.
Renamed Myriad and Medusa Queen (sic?) to Arctic & Lava Sharpshooter.
2013-07-12 19:13:39 +00:00
Ivan Savenko
1c0ccd2b02 - fixed some bugs with artifacts icons 2013-05-31 11:46:19 +00:00
Ivan Savenko
09e2f0f021 minor fixes:
- fixed duplicated bode dragon ability
- fixed enchanter animation
- removed plural ID from wog sorceress
2013-05-25 11:01:27 +00:00
Michał W. Urbańczyk
0eb19dc16d WoG map version is 0x33, not 33. 2013-05-09 11:45:20 +00:00
Ivan Savenko
b3bbe27089 - ignore wog maps if wog is not present 2013-05-04 19:20:32 +00:00
Ivan Savenko
8be801a6dc - CMappedFileLoader class to remap WoG files to h3 names
- WoG should be optional, all remapped files are listed in WoG/config/wogFileOverrides.json
- fixed several cases of incorrect positioning of creatures in battles
- some missing sounds for battle effects
- negative luck support, disabled by default
- a bit hackish detection of WoG presence, VCMI should work on SoD-only installs
2013-05-04 13:14:23 +00:00
Ivan Savenko
8297102350 - some groundwork for wog optionality
- moved wog artifacts to wog mod
2013-04-25 21:50:55 +00:00
Ivan Savenko
8273f323b1 - it is possible to edit data of another mod or H3 data via mods
- mods can access only ID's from dependenies, virtual "core" mod and itself (optional for some mods compatibility)
- metadata field for JsonNode, used to track source mod
- moved wog creatures into wog mod
- (linux) convertMP3 option for vcmibuilder for systems where SDL_Mixer can't play mp3's
2013-04-25 14:03:35 +00:00
Ivan Savenko
3285f1910b - finally, solution for imageIndex fields. All image lists will be generated in runtime
- iconIndex fields from json are no longer used
- simple check for missing icons on startup
2013-04-22 19:51:22 +00:00
Ivan Savenko
ff4b05ccdd - missing changes 2013-01-16 16:19:45 +00:00
Ivan Savenko
5deb499e7e Last breaking change into mod system (will explain on forum)
- paths in "filesystem" node are now relative to mod directory
- "filesystem" entry in mod.json is now optional
- made "register object" log messages visible only in log
- minor fixes, including #1173
2013-01-16 14:28:49 +00:00
Ivan Savenko
7e7d12095b - basic support for dependencies\conflicts for mods
- adventure map objects transparency should be more similar to h3
2013-01-10 18:53:49 +00:00
Ivan Savenko
04358ed0c6 multiple changes in config system, breaks existing mods. See upcoming post on forums.
- filesystem initialization works in conjuction with modHandler
- (config) split buildings.json in multiple files in "factions" directory
- (mods) merged filesystem.json and config/mod.json into mod.json
2012-12-12 11:13:57 +00:00
Ivan Savenko
1c5a4c669c - merged minimap.json into terrains.json
- removed no longer used fields from Graphics + portraits.json
 - work on pregame:
 - - new code for map options window icons + popups
 - - fixed bugs related to new towns
 - - less hardcoded magic numbers
2012-12-10 14:28:27 +00:00
Ivan Savenko
fcc66b7bb9 - fixed RPATH in cmake
- minor fixes
2012-10-08 15:21:59 +00:00
Ivan Savenko
b0f669a764 - moved Sprites and Data directory to vcmi "mod'
- some bugfixing:
- - teleporting animation fixed #1087, partially - #818
- - gui adjustments for #1093 and #1090
2012-09-29 08:35:31 +00:00
Ivan Savenko
99dcb73a72 - filesystem.json files for wog and vcmi data
- merged puzzle map into town configuration (todo: sieges, adventure map, icons)
2012-09-20 21:28:18 +00:00