Alex Dunn
1d735503d1
CMake: fix macOS app bundle ( #337 )
...
Currently the vcmiclient binary is left behind in the build directory.
2017-07-13 11:29:23 +03:00
Arseniy Shestakov
dbcd79c48a
Code cleanup: remove double and unneded semicolons
2017-07-12 22:01:10 +03:00
AlexVinS
09df2dcfbb
fixed possible race condition
2017-07-12 19:40:14 +03:00
AlexVinS
2c525fc76e
Attempt to fix headless tests crash.
2017-07-12 17:02:25 +03:00
Dydzio
252f68cb1a
Fix black market behavior to match H3
2017-07-12 01:21:00 +02:00
ArseniyShestakov
2cf7c7b234
Merge pull request #335 from dydzio0614/bug2476_fix2
...
Fix #2 for bug #2476
2017-07-11 15:40:35 +03:00
Dydzio
182210421d
Fix #2 for bug #2476
2017-07-11 14:04:43 +02:00
ArseniyShestakov
fcd63cd982
Merge pull request #333 from dydzio0614/RealFullscreen
...
Add optional real fullscreen mode support
2017-07-10 21:04:24 +03:00
Dydzio
c377f594a5
Add optional real fullscreen mode support
2017-07-08 18:43:04 +02:00
ArseniyShestakov
3634af10ba
Merge pull request #330 from dydzio0614/AmountBoxTweaks
...
Tweak battle creatures amount box hiding
2017-07-08 15:54:18 +03:00
Dydzio
2d6f964d65
Amount box support for stacked war machines
2017-07-07 19:04:29 +02:00
Dydzio
ae2323672a
Tweak battle creatures amount box hiding
2017-07-07 18:11:05 +02:00
Victor Luchits
36b8541ab5
MacOS build fix
2017-07-07 15:20:52 +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
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
Victor Luchits
310f6e27cb
Workaround ffmpeg linking problems
2017-07-04 03:31:13 +03:00
AlexVinS
dbaf3cb023
Cleanup & formatting
2017-07-04 01:32:40 +03:00
AlexVinS
dfbc9cea8a
Hack-fixed icon position
2017-07-03 22:01:03 +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
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
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
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
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
ArseniyShestakov
bd27636cd9
Merge pull request #316 from FeniksFire/improvingTheBattle
...
Refactoring.
2017-06-28 19:55:03 +03:00
FeniksFire
8ccdda6d2d
Improve formatting, update other config information about includes.
2017-06-27 17:00:44 +02:00
FeniksFire
4113bdab01
Moving some files from lib to the battle subdirectory.
2017-06-26 15:26:08 +02:00
Arseniy Shestakov
eeff7ee315
Few minor code improvements
...
* All command line options now case insensetive.
* SDL_VIDEO_X11_DGAMOUS unused in SDL2 so it's removed.
* Added current year into the --help output for client and server.
* Moved DO_NOT_START_SERVER into session settings.
2017-06-26 04:56:28 +03:00
Arseniy Shestakov
6c8192956e
PreGame: implement campaign saves list and improve filtering
...
There no campaign info screen, but dedicated list for campaign saves.
2017-06-24 03:14:32 +03:00
Fay
01e5f992d3
Android: possible solution for sdl2 colors problem
2017-06-17 00:34:18 +03:00
AlexVinS
86f9df5f68
Made gamestate lock static
2017-06-14 07:59:41 +03:00
AlexVinS
cf60aa61b0
cleanup
2017-06-14 07:39:23 +03:00
AlexVinS
0af9aa382c
Possible fix for https://bugs.vcmi.eu/view.php?id=2692
2017-06-14 04:53:26 +03:00
AlexVinS
0f5202689e
Cumulative spell effects
...
* Added experimental support for cumulative effects for ENCHANTED bonus
* Updated and fixed SPECIAL_PECULIAR_ENCHANT processing
* Initial implementation of cumulative spell effects.
* Scheme for new spell feature - cumulative bonus.
2017-06-13 21:50:50 +03:00
DJWarmonger
9623f7caf3
- Restored MSVS project files
...
- Fixed VCAI bu pointed out by Tow
2017-06-11 08:01:41 +02:00
Fay
65e88639a3
Minor: code format;
2017-06-08 21:07:09 +02:00
Fay
01bae590f1
Added swipe support for non-android platforms;
2017-06-07 22:42:41 +02:00
Fay
02fa478bfb
Refactor: unified logic for notyfing CIntObjs about left/right mouse click events;
...
Added support for middle-click;
2017-06-07 20:16:18 +02:00
AlexVinS
0190c9804e
formatting
2017-06-06 19:45:34 +03:00
AlexVinS
a31c28ec33
Unified war machine mechanics.
...
* it is possible to define new war machines
* added warMachine field to artifact configuration
2017-06-06 19:18:26 +03:00
Arseniy Shestakov
1a60c1a94b
Shared memory refactoring and command line control options
...
Now client accept following options:
--disable-shm - disable shared memory usage
--enable-shm-uuid - use UUID for shared memory identifier
UUID is useful when a lot of clients starting simultaneously.
Needed for testing and was easier to implement than alternatives.
2017-06-06 07:30:16 +03:00
Arseniy Shestakov
a2284c3209
Automated testing: graceful shutdown for when game is ended
...
Before when CloseServer / LeaveGame applied there was no thread sync on server.
Now server use std::atomic bool for synchronization and graceful shutdown.
2017-06-06 07:30:16 +03:00
Arseniy Shestakov
3f7cb9f893
Client: add some shortcuts for spectator mode
...
Following mode only work when client is started in spectator mode:
F5 - Pause / resume game by locking of pim
F6 - Toggle spectate-ignore-hero
F7 - Toggle spectate-skip-battle
F8 - Toggle spectate-skip-battle-result
F9 - Skip current battle
2017-06-06 07:30:16 +03:00