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
7,185 Commits 19 Branches 61 Tags 108 MiB
aa9c6d3716
Commit Graph

7185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ArseniyShestakov
e11e69750a
Merge pull request #411 from drizt/fallthrough 
Hide "this statement may fall through" warnings
 2018-02-10 22:34:39 +03:00
Arseniy Shestakov
324717acbe Spelling fixes: privilaged -> privileged, retreive -> retrieve 2018-02-10 21:52:23 +03:00
Ivan Romanov
eea50a044c Hide "this statement may fall through" warnings 2018-02-10 22:27:00 +05:00
AlexVinS
35b01eb379 Fixed https://bugs.vcmi.eu/view.php?id=2466 2018-02-10 08:37:15 +03:00
AlexVinS
c94daf6faa Fixed https://bugs.vcmi.eu/view.php?id=2864 2018-02-10 07:31:02 +03:00
AlexVinS
10dd7e8a43 Cleanup 2018-02-10 04:03:17 +03:00
AlexVinS
b194f8f13b Fixed https://bugs.vcmi.eu/view.php?id=2865 2018-02-10 00:02:56 +03:00
AlexVinS
0a2b04709f Fixed https://bugs.vcmi.eu/view.php?id=2873 2018-02-09 22:12:21 +03:00
Alexander Shishkin
936a310b0a
Merge pull request #413 from dydzio0614/sr9_vsfix 
update VS files to match spellrefactoring9 changes
 2018-02-09 21:13:40 +03:00
Dydzio
d4958ff5f8 update VS files to match spellrefactoring9 changes 2018-02-09 18:53:07 +01:00
AlexVinS
8220053864 Cleanup 2018-02-09 20:52:56 +03:00
Arseniy Shestakov
15c8b192b4 CStack::prepareAttacked: fix for REBIRTH bonus after merge 2018-02-08 14:37:52 +03:00
ArseniyShestakov
d64a3899a3
Merge pull request #359 from vcmi/SpellsRefactoring9 
All important issues are fixed and branch is finally ready to merge!
 2018-02-08 11:41:01 +03: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
Arseniy Shestakov
ff2d01a03d BinaryDeserializer: replace length check macro with inline function 2018-02-05 09:47:38 +03:00
Arseniy Shestakov
fc3b8b2c87 Refactoring: replace macro with variadic templates on client-side 
Big thanks to @mwu-tow for helping me with this.
 2018-02-05 08:14:01 +03:00
Arseniy Shestakov
7c77249d37 Refactoring: get rid of macro in server-side request validation code 2018-01-28 08:03:48 +03:00
Paul
d1bef9da13 Add vcmibuilder version check for innoextract (#408) 
* add vcmibuilder check for the old innoextract is unable to unpack the current GOG package
* fix for vcmibuilder to fail if innoextract version is less than required
 2018-01-28 08:00:03 +03:00
Arseniy Shestakov
69dbf339fc CGuiHandler: fix invalid read on event handling 2018-01-18 06:34:57 +03:00
Alexander Shishkin
85ed630ba6
Merge pull request #407 from FeniksFire/develop 
Fix positioning
 2018-01-16 06:01:27 +03:00
FeniksFire
b85bb6ec0a Fix positioning 
Fix problem for costBacground in QuickRecruitmentWindow.
Position "y" there was scaled which lead to errors with different
resolutions.
 2018-01-15 18:00:41 +01:00
Alexander Shishkin
e90fcea3d3
Merge pull request #396 from FeniksFire/update 
Update graphics for QuickRecruitmentWindow
 2018-01-14 10:42:23 +03:00
Alexander Shishkin
aadc09b9f0
Merge pull request #405 from dydzio0614/vsupdate 
Update project files to Visual Studio 2017
 2018-01-14 03:03:45 +03:00
Dydzio
38d836d1a5 Update project files to Visual Studio 2017 2018-01-13 16:33:49 +01:00
Arseniy Shestakov
da117e9255 Code style: remove void from constructors without arguments 2018-01-13 11:51:47 +03:00
FeniksFire
1331c81a8b Update graphics for QuickRecruitmentWindow 
Adding graphics maded by edeksumo
 2018-01-13 09:49:29 +01:00
AlexVinS
759416ed88 Fixed https://bugs.vcmi.eu/view.php?id=2851 2018-01-13 05:05:28 +03:00
DjWarmonger
2498f917d4
Merge pull request #404 from dydzio0614/bug2846 
Thanks!
 2018-01-12 18:15:27 +01:00
Dydzio
baaa1a0f13 Add magic resistance for crystal dragons 2018-01-12 13:36:17 +01:00
AlexVinS
6033d32b5b Fixed https://bugs.vcmi.eu/view.php?id=2845 2018-01-09 10:14:56 +03:00
DjWarmonger
c098b835ff
Merge pull request #195 from vcmi/feature/ambientSounds 
And merge!

...Travis timeout issues are not my task.
 2018-01-02 20:59:54 +01:00
Arseniy Shestakov
d3b3389a37 Implement configurable object sounds: ambient, visit and removal 
* If there more than one sound for visit or removal random is played
* At moment only the first ambient sound will be used
 2018-01-02 18:16:35 +01:00
DJWarmonger
20ac1d6880 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2018-01-02 17:57:11 +01:00
Dydzio
707257c2c8 Update file names in vs project (#400) 2018-01-02 19:40:23 +03:00
DJWarmonger
1a1de5366a Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2018-01-02 17:36:51 +01:00
DJWarmonger
b778623734 Merge branch 'feature/ambientSounds' into develop 2018-01-02 09:51:11 +01:00
Arseniy Shestakov
fc0ab5b970 TerrainTileObject: store ambientSound for every object 
Though ambient sounds won't work for heroes objects since they added separately.
 2018-01-02 09:50:05 +01:00
Arseniy Shestakov
d96a3aa5b7 CAudioBase: move mutex to base class since CSoundHandler need it 2018-01-02 09:49:04 +01:00
Arseniy Shestakov
c5ca75bc53 CRewardableObject: remove now unused soundID 2018-01-02 09:49:04 +01:00
Arseniy Shestakov
f15cadc87b Implement configurable object sounds: ambient, visit and removal 
* If there more than one sound for visit or removal random is played
* At moment only the first ambient sound will be used
 2018-01-02 09:49:03 +01:00
Arseniy Shestakov
e9bfbb70c1 Ambient sounds: implement chebyshev distance for getTilesInRange 2018-01-02 09:48:17 +01:00
Arseniy Shestakov
e7fa9f8cd6 config: add ambient, visit and removal sounds to schemas / objects 2018-01-02 09:48:17 +01:00
Michał Janiszewski
6c2d082676 Use Ninja as build system (#399) 
* Remove redunant command

* Use ninja as build system

* Install ninja on OS X

* Install ninja for MXE
 2017-12-30 15:00:57 +03:00
DJWarmonger
f523ae5545 Fixed Magic resistance display. 2017-12-30 12:25:29 +01:00
DjWarmonger
c2a0b13332
Merge pull request #371 from dydzio0614/NewAbilities 
Tested and approved. Congrats!
 2017-12-29 14:19:05 +01:00
godric3
ad20528a7b fix osx build 2017-12-27 16:11:42 +03:00
godric3
e7ad517bb5 fix mxe build 2017-12-26 17:21:23 +03:00
Alexander Shishkin
a209d10f23
Merge pull request #395 from FeniksFire/update 
Adding simple background for quick recruitment window
 2017-12-23 16:30:51 +03:00
FeniksFire
bf4024c3ac Adding bacground for QuickRecruitmentWindow 
Adding bacground for CreaturePurchaseCard in QuickRecruitmentWindow
 2017-12-23 13:15:05 +01:00
AlexVinS
368ba0e2bf fixes 2017-12-21 21:27:39 +03:00