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
6,835 Commits 30 Branches 75 Tags
3764ec8be171d451d49dfa8658b046cc156536d3
Commit Graph
6835 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Henning Koehler 3764ec8be1 more code format issues 2017-08-30 19:47:06 +12:00
Henning Koehler 654ca96e9d fixed code format and other minor issues 2017-08-30 19:19:54 +12:00
Henning Koehler 36d671b093 changed indentation from spaces to tabs 2017-08-30 16:23:03 +12:00
Henning Koehler aadb5d93f7 added comment (and commented-out code) about skill legacy data 2017-08-30 16:03:24 +12:00
Henning Koehler 5e28202f94 dropped requirements for base in skill.json 2017-08-30 14:09:02 +12:00
Henning Koehler 899e8403f7 skills.json uses base and struct for effects 2017-08-30 10:25:36 +12:00
Henning Koehler 3fe9bc34b8 CGHeroInstance::recreateSecondarySkillsBonuses() restores bonuses for all levels 2017-08-28 23:59:01 +12:00
Henning Koehler 9b3c61616f made diplomacy join chance bonus-based 2017-08-28 23:33:19 +12:00
Henning Koehler 69a538a600 added bonus type MANUAL_CONTROL 2017-08-28 20:09:27 +12:00
Henning Koehler 5091b117e2 fixed serialization for older savegames 2017-08-28 13:56:00 +12:00
Henning Koehler 03c18ff691 added remaining skills to skills.json 2017-08-28 10:41:32 +12:00
Henning Koehler aa15feba62 moved SECONDARY_SKILL_VAL2 to end of list 2017-08-28 00:17:59 +12:00
Henning Koehler 7e5c1ec7f8 made artillery bonus-based; supports multiple bonus shots 2017-08-27 21:05:17 +12:00
Henning Koehler 8bdb8f01ca made scholar skill bonus-based 2017-08-27 20:10:25 +12:00
Henning Koehler 0153d0fc78 made fire/air/water/earth magic skills bonus-based 2017-08-27 19:37:54 +12:00
Henning Koehler 25e6b5cc07 added bonus type SECONDARY_SKILL_VAL2; refactored CSkillHandler::defaultBonus; made eagleEye level bonus-based 2017-08-27 17:40:52 +12:00
Henning Koehler 9bbfb57b93 cleaned up secondary skill bonus merging 2017-08-27 15:35:04 +12:00
Henning Koehler 06d2507371 log file loading 2017-08-27 12:59:09 +12:00
Henning Koehler fc77c40a82 made ballistics bonus-based 2017-08-26 21:16:05 +12:00
Henning Koehler 19e619f61e wisdom is now bonus-based 2017-08-26 20:49:29 +12:00
Henning Koehler 1fa6cbe514 scouting uses SIGHT_RADIUS bonus 2017-08-26 18:01:39 +12:00
Henning Koehler e8c32e05d8 turned pathfinding effect into a bonus 2017-08-26 14:59:24 +12:00
Henning Koehler c9ef773da0 fixed logging after rebase 2017-08-26 14:06:47 +12:00
Henning Koehler 91fac7755a made tactics skill configurable 2017-08-26 10:08:06 +12:00
Henning Koehler 3cc84e5975 moved contains functions for multimap to Globals.h 2017-08-26 10:08:06 +12:00
Henning Koehler c0740e3623 fixed crash when loading neutral faction; skills.json no longer requires index values 2017-08-26 10:08:06 +12:00
Henning Koehler 0357a4fe3b enabled config of skill descriptions 2017-08-26 10:08:06 +12:00
Henning Koehler 8c7895239e always load objects with index at specified position 2017-08-26 10:08:06 +12:00
Henning Koehler 64e2db6a0f added sufficient debug to diagnose - problem is with lack of original data 2017-08-26 10:08:06 +12:00
Henning Koehler d8648288f0 added debug info to skill loading 2017-08-26 10:08:06 +12:00
Henning Koehler 993b7bf614 skills are initialized properly (and file loading isn't actually working yet) 2017-08-26 10:08:06 +12:00
Henning Koehler 05cf95400c loading secondary skill bonuses from config/skills.json works (kind of) 2017-08-26 09:33:08 +12:00
Henning Koehler 9811fbe02c updateSkill attempts to update existing bonus instead of adding new 2017-08-26 09:33:08 +12:00
Henning Koehler a6c3352d7c moved secondary skill default bonus initialization into CSkillHandler 2017-08-26 09:33:08 +12:00
Henning Koehler 159e27a0ab changed CBonusSystemNode* to BonusList in CSkill 2017-08-26 09:33:08 +12:00
Henning Koehler fbab52eb18 added basic handler for loading secondary skill bonuses 2017-08-26 09:33:08 +12:00
Arseniy Shestakov 8180e4d5c5 VCMIDirs: improvements for development on Mac and Linux 
Also added /usr/share/games in VCMIDirsXDG::dataPaths for mantis#2189.
 2017-08-25 08:43:27 +03:00
Arseniy Shestakov 1110dd27d1 Launcher: use QDesktopWidget to get display list instead of SDL2 
First of all SDL2 trying to use dbus and this conflict with Qt. Check mantis#2704.
And there no reason to use SDL2 in launcher when Qt can do the same thing as well.
 2017-08-24 04:55:44 +03:00
Arseniy Shestakov c6ff28936d Client: change intro video position 2017-08-24 03:29:37 +03:00
Arseniy Shestakov 525ee8771a Launcher: avoid menu items not overlap so it's look slightly better 
It's still very ugly, but less ugly than it's was.
 2017-08-24 03:04:40 +03:00
Arseniy Shestakov dfe781945b CMake: try to enable automated DS_Store generation for Mac 
We should see in AppleScript from CMake would work on Travis CI.
Also use VCMI as volume name of DMG for now and update pre-generated DS_Store for it.
 2017-08-21 17:04:53 +03:00
Arseniy Shestakov 97db21043d Documentation: remove README.linux. Information moved to wiki 
https://wiki.vcmi.eu/index.php?title=How_to_build_VCMI_(Linux)

Time is limited and duplication not make it any easier to maintain documentation.
Since we have wiki already we must move all important information here and keep it up to date.
 2017-08-21 02:45:50 +03:00
ArseniyShestakov 2f65e27464 Merge pull request #368 from dydzio0614/vstweak 
Visual Studio files tweaks
 2017-08-19 18:07:25 +03:00
Dydzio ea17b0f458 Major overhaul of VS related files 2017-08-19 15:58:55 +02:00
Dydzio 651f0da9a1 Fix to include vstd/CLoggerBase.h 2017-08-19 13:32:24 +02:00
Dydzio e3ba491fa1 Use multi-core compile by default, fix VCMI_client path 2017-08-19 13:27:24 +02:00
Dydzio f5a033c19b Add new recommended path to gitignore 2017-08-19 13:10:52 +02:00
Dydzio 5ec21f8dc7 Improve default header/library paths 2017-08-19 12:58:59 +02:00
AlexVinS 2400bec52c Merge remote-tracking branch 'remotes/FeniksFire/develop' into develop 2017-08-19 00:37:32 +03:00
Dydzio 906bd7fc71 Fix CMake MSVS build problem (#366) 
* Fix CMake MSVS 2015 boost linking problem
Same errors as here when building vcmi client and server: https://stackoverflow.com/questions/27196312/boost-1-57-0-program-options-msvs-2013-linker-error
Fix based on: https://groups.google.com/forum/#!topic/boost-list/Lhqvoet8N18

* Compile fix for VS 2017.3 due to incompatibility with variadic templates in Boost

https://developercommunity.visualstudio.com/content/problem/69009/compilation-error-on-msvc2015-on-boostbase-from-me.html
 2017-08-18 23:11:11 +03:00