ArseniyShestakov
d0e603a418
Merge pull request #329 from viciious/cmake_msvc
...
Change output path for cmake builds
2017-07-08 12:31:46 +03:00
Victor Luchits
36b8541ab5
MacOS build fix
2017-07-07 15:20:52 +03:00
Victor Luchits
5468365ed6
Set zip compression level to 'Maximum'
2017-07-07 13:08:53 +03:00
Victor Luchits
06c1df9901
Change minizip library output path to match vcmi
2017-07-07 13:08:53 +03:00
Victor Luchits
295b031dba
Fix appveyor scripts to work with new output paths
2017-07-07 13:08:53 +03:00
Victor Luchits
30cc2f6a01
Change the output path for cmake so all files go into the same root directory
2017-07-07 13:08:53 +03:00
AlexVinS
4d204095cf
fix
2017-07-07 02:55:23 +03:00
Alex Dunn
38693d83a1
macOS: use HTTPS for appcast ( #325 )
2017-07-06 22:48:14 +03:00
Alex Dunn
3915d6c312
macOS: use HTTPS for downloads ( #326 )
2017-07-06 22:47:56 +03:00
Alex Dunn
489fdaefb7
client: only copy libminizip when not provided by the system ( #328 )
2017-07-06 09:26:41 +03:00
Alex Dunn
34058f1396
macOS: turn Sparkle off by default ( #327 )
2017-07-06 09:09:30 +03:00
Arseniy Shestakov
fab6f409f6
Fix
2017-07-04 22:07:24 +03:00
Arseniy Shestakov
6084950f31
CMake: restore Android build
2017-07-04 22:06:00 +03:00
AlexVinS
5f1fadf71c
Fixed https://bugs.vcmi.eu/view.php?id=2706
2017-07-04 11:21:22 +03:00
Arseniy Shestakov
e024c4f7b1
AppVeyor: add notifications to Slack #notifications channel
2017-07-04 04:30:37 +03:00
Arseniy Shestakov
cb669dcca4
AppVeyor: add status badge README.md
2017-07-04 04:08:13 +03:00
Arseniy Shestakov
823e28fe69
AppVeyor CI: small path fix
2017-07-04 03:46:15 +03:00
Arseniy Shestakov
eed36c3b7c
Merge pull request #320 from viciious/msvc
...
AppVeyor integration
2017-07-04 03:41:18 +03:00
Victor Luchits
5cf512e0fe
Add appveyor.yml
2017-07-04 03:34:19 +03:00
Victor Luchits
30643feb66
Do not treat warnings as errors for fuzzylite
2017-07-04 03:31:13 +03:00
Victor Luchits
271fcb746d
We need zlib headers for minizip, which comes in through the filesystem
2017-07-04 03:31:13 +03:00
Victor Luchits
310f6e27cb
Workaround ffmpeg linking problems
2017-07-04 03:31:13 +03:00
Victor Luchits
b681db3947
Add appveyor_toolchain.txt
2017-07-04 03:30:59 +03:00
ArseniyShestakov
b670bcb46f
Merge pull request #313 from vcmi/spellCastQuery
...
Spell cast query
2017-07-04 02:43:22 +03:00
AlexVinS
dbaf3cb023
Cleanup & formatting
2017-07-04 01:32:40 +03:00
FeniksFire
8577445b10
Simple fix: http://bugs.vcmi.eu/view.php?id=2366
2017-07-03 22:41:16 +03:00
AlexVinS
dfbc9cea8a
Hack-fixed icon position
2017-07-03 22:01:03 +03:00
Arseniy Shestakov
01a1353fe1
Cleanup: remove old editor code and adjust related project files
...
It's useless and will fail build if accidentally enabled in CMake.
For anyone interested it's always available in git history.
2017-07-03 21:59:57 +03:00
AlexVinS
6dd89efc9a
tweaks
2017-07-03 21:43:05 +03:00
AlexVinS
a65befaa08
Moved town portal logic to mechanics class
2017-07-03 21:43:04 +03:00
AlexVinS
3d1a84875e
Queries refactoring
...
* Moved SUMMON_BOAT special case to mechanics
* Partially moved Town portal logic to mechanics class
* Added generic query reply to CCallback
* Redesigned Queries so that base API do not depends on CGameHandler
* Got rid of CGameHandler::castSpellRequest
* Removed CGameHandler::castSpell
* Added new Query type for town portal dialog (not used yet)
2017-07-03 21:43:04 +03:00
AlexVinS
f463dc2fa3
fixed war machine spawning
2017-07-03 21:42:17 +03:00
ArseniyShestakov
5dfb7a5771
Merge pull request #317 from vcmi/attackerOwned
...
Refactored CStack::attackerOwned to CStack::side
2017-07-03 16:19:54 +03:00
AlexVinS
3ce238e4d3
Tweak
2017-07-03 13:40:22 +03:00
Alexander Shishkin
d8545d9c3b
Merge pull request #321 from viciious/nodecompare_fix
...
Fix NodeComparer::operator() to provide strict weak ordering
2017-07-03 13:11:46 +03:00
AlexVinS
e4c14c4cc2
avoid assertions in stack position checks
2017-07-03 12:59:33 +03:00
Arseniy Shestakov
c059f95e2e
CClient::loadGame: pass correct save version for BinaryDeserializer
...
Fix loading crashes that appear after duel mode removal.
2017-07-03 05:11:58 +03:00
Victor Luchits
e9e311f142
Fix NodeComparer::operator() to follow strict weak ordering rules
...
This fixes annoying assertion failures in MSVC builds
2017-07-02 22:59:41 +03:00
Arseniy Shestakov
a1c2307f61
README: add link to Slack invite page
2017-07-02 18:09:33 +03:00
ArseniyShestakov
b9112b82a0
Merge pull request #319 from dydzio0614/vsfix
...
Improve VS build filters file + precompiled header path fix
2017-07-02 13:45:27 +03:00
Dydzio
ef2ff0c752
Precompiled header path also needs fix
2017-07-01 20:05:10 +02:00
Dydzio
f61398b0ee
improve VS build filters file
2017-07-01 19:29:27 +02:00
AlexVinS
4f8c7bd4bb
CStack refactoring
...
* removed all occurrences of attackerOwned
* Use BattleSide enum
* more tweaks
2017-07-01 19:17:08 +03:00
ArseniyShestakov
2f305cc68d
Remove code related to duel mode ( #312 )
...
Remove code related to duel mode
2017-07-01 16:30:13 +03:00
Piotr Wójcik
7bc9853175
Squashed commit of PR #314 :
...
commit 437c6c6fd4931abe69d3b7fe501b231a74182159
Author: Piotr Wójcik <chocimier@tlen.pl>
Date: Sat Jun 24 18:36:16 2017 +0200
Rename CPlayersVisited to CTeamVisited
commit baf1423cd9b090eaaa0a6962f2bd0f440e2e0747
Author: Piotr Wójcik <chocimier@tlen.pl>
Date: Wed Jun 21 16:41:37 2017 +0200
Share visited status of CPlayersVisited objects across team
2017-06-30 23:51:43 +03:00
Arseniy Shestakov
29e50cc21c
Fix include for SiegeInfo / SideInBattle. Lost them on rebase
2017-06-29 02:27:41 +03:00
Arseniy Shestakov
fb19a3a068
CMake: update all CMakeLists to include actual sources and headers
...
This make it easier to use project with newer CMake and Qt Creator.
I decided against using GLOB since we don't rename files that much.
2017-06-29 02:03:37 +03:00
Arseniy Shestakov
2ce02202c1
Fix more includes and move SideInBattle / SiegeInfo into battle
2017-06-29 02:02:05 +03:00
AlexVinS
ab4c848169
fixed relative include paths
2017-06-29 00:09:35 +03:00
ArseniyShestakov
bd27636cd9
Merge pull request #316 from FeniksFire/improvingTheBattle
...
Refactoring.
2017-06-28 19:55:03 +03:00