AlexVinS
fc1938c341
fix
2017-10-08 11:03:12 +03:00
godric3
f03a0b1151
fix #2731 , now no morale, and no luck texts show properly
2017-10-05 17:13:49 +02:00
AlexVinS
891eb5771a
Use hero battle victory and failure animations
2017-09-27 17:35:30 +03:00
Arseniy Shestakov
ec2bef40fb
CServerHandler: avoid crash without interprocess memory
...
Even if shared memory wasn't disabled we shouldn't crash without it.
It's important because Snap packages don't have access to /dev/shm.
2017-09-18 10:46:58 +03:00
Fay
1ee4e232fa
Removed unnecessary full screen redraws in swipe mode; ( #381 )
2017-09-18 08:27:03 +03:00
Arseniy Shestakov
ae13123129
CPlayerInterface: don't stop hero movement on embark / disembark
...
When hero have free boarding bonus there no reason to stop movement.
2017-09-16 10:42:27 +03:00
AlexVinS
270e1b75ce
Support for creature 2-hex attack, alternate death and cast animation types
...
* margin option .json animation
* Use ranged attack animation for spell cast if there is no cast animation, display cast animation only on active casting.
2017-09-12 19:51:54 +03:00
Arseniy Shestakov
494872937a
CGuiHandler: use std:atomic to sync breaks in event handling
2017-09-11 12:18:16 +03:00
Arseniy Shestakov
986fc08b1e
CGuiHandler: use SDL_PushEvent in fakeMouseMove to avoid crashes
...
Somehow this worked on other platforms, but on macOS it's cause constant crashes.
2017-09-11 12:18:16 +03:00
AlexVinS
c30d9f2fd6
Fix
2017-09-06 15:50:59 +03:00
AlexVinS
3bbff27127
Wiped CDefEssential
2017-09-06 15:13:28 +03:00
AlexVinS
6cd0dd9843
Use CAnimation for creature projectiles
2017-09-05 20:04:17 +03:00
AlexVinS
05bb8b13e9
Use CAnimation for battle creature animation
2017-09-05 18:59:26 +03:00
AlexVinS
78b86224a0
Use CAnimation fro custom battle effects
2017-09-05 17:21:44 +03:00
AlexVinS
882e279818
Use CAnimation in CBattleInterfaceClasses
2017-09-05 16:44:27 +03:00
AlexVinS
69c6643893
More CCursorHandler style tweaks
...
# Conflicts:
# AI/FuzzyLite
2017-09-05 15:25:49 +03:00
AlexVinS
9423555015
Declare ownership of CCursorHandler::dndObject
...
# Conflicts:
# AI/FuzzyLite
# client/gui/CGuiHandler.cpp
2017-09-05 15:25:31 +03:00
AlexVinS
a8d25ea7b2
CHeroWindow tweaks
...
# Conflicts:
# AI/FuzzyLite
# client/windows/CHeroWindow.cpp
2017-09-05 15:22:48 +03:00
AlexVinS
ce4b206472
More complete support of .def format
2017-09-05 14:32:52 +03:00
AlexVinS
3a9d73da23
[c::b] Update project, fixed build
2017-09-05 14:31:34 +03:00
ArseniyShestakov
ca066841f1
Merge pull request #370 from vcmi/issue/2780
...
Issue/2780
2017-09-05 01:21:58 +03:00
AlexVinS
2f7968b803
Fixed wrong animation paths
2017-09-04 18:41:22 +03:00
AlexVinS
b964a53abe
Fixed battle animation
2017-09-04 17:52:36 +03:00
AlexVinS
df34a2cc96
Dirty hackfix for https://bugs.vcmi.eu/view.php?id=2780
2017-09-03 23:38:15 +03:00
Henning Koehler
abdca71828
skill names and descriptions are fully managed by CSkillHandler
2017-08-30 22:35:23 +12:00
Henning Koehler
0357a4fe3b
enabled config of skill descriptions
2017-08-26 10:08:06 +12:00
Arseniy Shestakov
c6ff28936d
Client: change intro video position
2017-08-24 03:29:37 +03:00
Dydzio
ea17b0f458
Major overhaul of VS related files
2017-08-19 15:58:55 +02:00
Dydzio
e3ba491fa1
Use multi-core compile by default, fix VCMI_client path
2017-08-19 13:27:24 +02:00
Arseniy Shestakov
5fce56d23e
CMake: add ENABLE_DEBUG_CONSOLE option for Windows enabled by default
...
For now we'll keep console, but in future we need a way to toggle it at runtime.
2017-08-16 23:45:38 +03:00
Arseniy Shestakov
2b3a467728
CMake: structure changes and other small improvements
...
- Now cmake_minimum_required used properly and set to 2.8.12
- cmake_modules/CMakeCPackOptions.cmake.in is removed
2017-08-16 16:10:08 +03:00
Arseniy Shestakov
fee999300e
VCMIDirs: add hack to run from single directory on Mac and Linux
...
Also change working directory to where binary is on all platforms except Android
2017-08-16 16:10:08 +03:00
Arseniy Shestakov
40af43c46e
CMake: massive rework for Mac build and other improvements
...
- macOS: RPATH-related code all removed or disabled
- macOS: new osx/CMakeLists.txt to run some install-code running after all subdirectories
- Assets copying into the runtime output directory implemented for Mac and Linux development
2017-08-16 16:10:07 +03:00
Arseniy Shestakov
7dca95c8cc
CMake: multiple improvements for builds and project generation
...
- Change default build output directory name from "build" to "bin"
- Implement new function vcmi_get_cmake_debug_info
- Link client with SDL2main on Windows and disable debug console
- Remove all old MinGW-specific options since they outdated and MXE work fine
- Set AUTOGEN_TARGETS_FOLDER for better Xcode and Visual Studio projects
- Remove useless vcmitestFiles custom target for less garbage in project files
2017-08-16 16:10:07 +03:00
Arseniy Shestakov
56f89270db
macOS: full rework of Mac packaging process
...
- Most of outdated CMakeLists code removed.
- All Mac-specific code is removed include Sparkle support and vcmibuilder app.
- DMG buidling reimplemented using macdeployqt command.
2017-08-16 16:10:07 +03:00
Arseniy Shestakov
193f492b99
CMake: cleanup, project generation and other improvements
...
- Use EXCLUDE_FROM_ALL for FuzzyLite and GoogleTest to avoid inclusion of unneded headers and libraries into installers.
- Set minimum CMake version only in main CMakeLists.txt
- Set project name only in main CMakeLists.txt
- Visual Studio: add assign_source_group function to generate proper filesystem tree
- Visual Studio: set PROJECT_LABEL so generated projects have same names binaries on Windows
- Visual Studio: enabled USE_FOLDERS for projects grouping. This also possibly affect other IDEs.
- Added add_subdirectory_with_folder function to make sure 3rd-party libraries are affected by USE_FOLDERS.
2017-08-16 16:10:07 +03:00
Arseniy Shestakov
c3e6195cc9
CServerHandler: one more small fix when server is crashed
2017-08-13 23:17:56 +03:00
Arseniy Shestakov
9c7c47c754
CServerHandler: for now don't stop client if server crashed
...
Currently server stable enough and only crash on shutdown.
It's certainly more annoying to crash on end of game than get freeze.
Unfortunately it's crash on shutdown almost every time on macOS.
2017-08-13 23:09:23 +03:00
Arseniy Shestakov
fad2a0a3fb
Fix memory leak and remove some garbage files added in last commit
2017-08-13 22:15:25 +03:00
Arseniy Shestakov
cd98dd0b89
CGuiHandler: make terminate_cond non-static
...
Static variable might be not yet initialized by the time it's used inside CGuiHandler constructor.
This fix let us avoid crash that occur when built with Xcode 8.2.1
2017-08-13 21:54:07 +03:00
AlexVinS
8c0fab1dcf
fixes
2017-08-12 14:36:37 +03:00
AlexVinS
15138c23de
Finished conversion to new logging API
...
* removed logger streams
* (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.
2017-08-11 23:06:27 +03:00
AlexVinS
64d9dadd64
Logging cleanup.
2017-08-11 15:47:50 +03:00
AlexVinS
c293589c07
A bit more logging cleanup
2017-08-10 23:47:58 +03:00
AlexVinS
143ff682bc
Logging cleanup
2017-08-10 21:59:55 +03:00
AlexVinS
85e952f25f
Logging cleanup 3
2017-08-10 20:17:10 +03:00
AlexVinS
61e241308d
Logging cleanup
2017-08-10 19:52:05 +03:00
Arseniy Shestakov
21074e13c3
macOS: always change working directory for launcher and server
...
This make relative paths work properly when launched from DMG or from different directory.
2017-08-09 01:33:12 +03:00
ArseniyShestakov
cb40c093f8
Avoid boost::optional assignment for Boost 1.64 compatibility ( #360 )
...
Two options here: to use emplace from 1.56 or boost::make_optional.
Unfortunately Ubuntu 14.04 is using 1.54 and I'd rather not to break it.
2017-08-05 16:09:29 +03:00
ArseniyShestakov
4388e12a3a
Merge pull request #358 from Chocimier/altar
...
Fixed bugs in Altar
2017-08-05 02:25:41 +03:00
AlexVinS
2d31d5710f
[tests] Reduced code duplication
2017-08-03 15:56:45 +03:00
Piotr Wójcik
886c8f63c6
Show stacks selected to sacrifice
2017-08-01 17:17:46 +02:00
ArseniyShestakov
9d9c026c85
Code style: serialize everything on own lines for easier debugging ( #357 )
2017-07-31 16:35:42 +03:00
Piotr Wójcik
137b9cde19
Fix crash in Altar of Sacrifice, fixes #2648
2017-07-29 19:27:39 +02:00
Fay
80f149e296
Better android input handling: sending notifications about CInputText changes to java so that we can display textinput overlay there; ( #354 )
2017-07-23 20:23:48 +03:00
Arseniy Shestakov
6d9f99d4de
Code style: and one more pass on lambda expressions parameter list
2017-07-19 02:11:17 +03:00
Arseniy Shestakov
b540ab73ed
Code style: add empty parameters list to more lambda expressions
2017-07-19 01:39:38 +03:00
Arseniy Shestakov
2da3d8a563
Code style: remove senseless comments
2017-07-18 00:04:00 +03:00
ArseniyShestakov
b2f74a93cf
Code style: add empty parameter list to all lambda expressions ( #345 )
2017-07-17 15:35:57 +03:00
Dydzio
81ccecedca
Fix color change of highlighted hex borders ( #343 )
2017-07-17 01:15:05 +03:00
ArseniyShestakov
b52cfe5283
Code style: use parentheses for creating heap-based objects ( #344 )
2017-07-16 12:58:05 +03:00
AlexVinS
7374689301
Fixed https://bugs.vcmi.eu/view.php?id=2715
2017-07-16 00:02:55 +03:00
ArseniyShestakov
a4c0ad94b1
Code style: remove default value hints in definitions ( #342 )
...
Some are outdated and this is something IDE are useful for.
2017-07-15 14:08:20 +03:00
ArseniyShestakov
ea0ceb1805
Merge pull request #323 from vcmi/CStackTweaks
...
CStack tweaks
2017-07-15 00:42:08 +03:00
AlexVinS
2fb531b6d0
Display actual moral and luck for batlle stack
2017-07-14 21:42:36 +03:00
Arseniy Shestakov
f1e5797834
Code style: move or add licensing information on top of every file
2017-07-14 01:26:03 +03:00
Dydzio
7bf1b91235
Visual Studio files tweaks
2017-07-13 13:18:40 +02:00
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
AlexVinS
1fe01b7254
Moved defensive stance log message building to server side.
2017-07-10 04:05:36 +03:00
AlexVinS
7bf8c9bd69
fixed and cleanup
2017-07-08 21:20:38 +03:00
AlexVinS
4f14f22d3a
Unified CStack ammo, casts and counterattacks
...
* it is possible now to add casts and shoots OTF (f.e. with spell bonus)
Centralized stack 'ammo' loading from bonus system.
* introduced small proxy class for local bonus cache
(no need to use global cache if particular selector used on node only in one place)
* handle killing resurrected creatures
* use IBonusBearer::MaxHealth() where possible
* Fixed https://bugs.vcmi.eu/view.php?id=2486
* Possible fix for 0 HP after resurrection.
* Hack-fixed https://bugs.vcmi.eu/view.php?id=2584
* Unified CStack health API
* Use CHealth for CStack count and health points
* increased SERIALIZATION_VERSION
2017-07-08 20:29:59 +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
Arseniy Shestakov
18161d3688
Client: implement spectator mode via command-line options
...
If running with --spectate/-s CPlayerInterface will appear even without human players.
Following command-line options also available:
--spectate-ignore-hero
--spectate-hero-speed=N
--spectate-battle-speed=N
--spectate-skip-battle
--spectate-skip-battle-result
Boolean options can also be changed in runtime via client console:
set spectate-ignore-hero on / off
Spectator mode also:
- Work with --onlyAI option when starting game or loading saves.
- Allow to use any cheat codes.
- Give recon on towns and heroes.
2017-06-06 07:30:16 +03:00
Arseniy Shestakov
d95c74941b
Client: add onlyAI option support for saved games
...
When --onlyAI option used all human players will be replaced with AIs during loading.
2017-06-06 07:30:16 +03:00
Arseniy Shestakov
f7f7fe1d32
Client: fix headless mode and add automated testing mode
...
Command-line option --noGUI replaced with --headless.
Added option --testmap that will run specified map with AI players
2017-06-06 07:30:16 +03:00
AlexVinS
195e979a18
get rid of CBattleInfoCallback::battleCanCastThisSpell
2017-06-05 23:46:55 +03:00
AlexVinS
6c308956f9
get rid of CBattleInfoCallback::battleCanCastThisSpellHere
2017-06-05 23:25:48 +03:00
AlexVinS
2cfb2e6ae0
get rid of CPlayerBattleCallback::battleCanCastThisSpell
2017-06-05 22:53:42 +03:00
AlexVinS
4d430f6ad8
get rid of CPlayerBattleCallback::battleCanCastSpell
2017-06-05 22:16:12 +03:00
AlexVinS
66cfc2fef9
CSpell::canBeCast tweaks
2017-06-05 21:30:25 +03:00
AlexVinS
e25ed4f358
[Tweak] Use unique_ptr for map header in pregame
2017-06-04 21:11:58 +03:00
Alexander Shishkin
7e1b0d71c5
Added option for saving generated maps on client side ( #307 )
...
* new configuration option 'general.saveRandomMaps'
* maps being saved to 'userCachePath/RandomMaps'
* no deletion of old random maps
* map filename generated based on template name and random seed
2017-06-04 20:33:28 +03:00
Arseniy Shestakov
6642816b1e
Client: server port and testing options cleanup
...
Now we only pass port as ui16 instead of std::string
2017-06-04 08:49:23 +03:00
Arseniy Shestakov
4a302d4fe5
CBattleHero::clickRight: more elegant code for side detection
2017-06-03 04:28:03 +03:00
Arseniy Shestakov
4b0f702e7e
Add LeaveGame netpack and avoid replying on it and CloseServer
2017-06-02 02:51:44 +03:00
Arseniy Shestakov
c7e7a4d7be
Make usage of boost::interprocess optional
...
If shared memory allocation failed on client server will be started without shared memory option.
Only downside of this is that server wouldn't be able to fallback to random port if default is busy.
2017-06-02 02:44:41 +03:00
Arseniy Shestakov
cc163c4e05
Refactoring of networking code on server and client
...
* Avoid server crash on dummy connect / disconnect.
* Avoid server crash when host left from PreGame.
* Server print it's state with name when it's waiting for connection or in pregame.
* Server will use random port if specified port is busy.
2017-06-02 02:44:39 +03:00
Arseniy Shestakov
db5a52a0f8
Multiplayer: gracefully handle player loss unless it's a host
...
We don't want server to shutdown after just one of players lost the game.
2017-05-31 08:04:26 +03:00
AlexVinS
009bfb8211
cleanup
2017-05-28 17:27:16 +03:00
AlexVinS
fa6a7bd1b5
Fixed CID 1375682
2017-05-28 15:06:12 +03:00
AlexVinS
f5cdaece6f
Fixed CID 1375687
2017-05-28 14:40:36 +03:00
AlexVinS
1c95c51ffb
Fixed CID 1375685
2017-05-28 14:40:36 +03:00
AlexVinS
df3574b50f
Fixed https://bugs.vcmi.eu/view.php?id=2685
2017-05-27 17:07:11 +03:00
AlexVinS
a85b4cf2a5
* WIP on event condition format
...
* Hero portrait serialization
* Fix town spells serialization
* Added support for float exponential part in Json
* Added support for int64 in Json
* Added basic Hero definitions serialization
* Added rumors serialization
* Advanced player info serialization.
* Added Disposed heroes serialization, (!) not covered with tests yet
* Added Local event serialization
* Added Pandoras box serialization
* Added Seer hut reward serialization
* Added CQuest serialization
* Added API for map object instance names serialization.
* Added random dwelling options serialization
* Advanced town options serialization
* Advanced hero options serialization
* More map format tests
* A lot of fixes, cleanup and refactoring
2017-05-27 00:23:19 +03:00
Dydzio
5127061e28
Commander skill description support ( #266 )
...
* Added commander skill description support
* Add support for ZNPC00.txt not found
2017-05-26 22:58:33 +03:00
Fay
b5daa24982
Android support ( #299 )
...
* AI libs registering shenanigans on android;
* Fixed resolution aspect + mouse event scaling;
* Proper server init/deinit (through android IPC);
Enabled threaded init in CMT;
* Prevented a deadlock in logger on some devices;
* Fixed frozen intro frame after interrupting the video;
Added android progressbar displaying during initial data loading;
* Hacky fix for choppy animations during heroes movement (should look better now, but it's definitely not a good solution);
* Changes/fixes for new android launcher building process;
* Fixed app hang after getting SDL_QUIT when activity was destroyed;
* Functioanal, configurable advmap swiping support;
* VCMI changes cleanup;
Added few missing VCMI_ANDROID guards on swipe mechanics;
* Removed unneeded sleep in server startup code for android;
* Removed android ioapi hack (fixed in newest ndk);
* Removed unused android's library loading logic;
* Added android's swipe option to settings schema;
* Moved NO_STD_TOSTRING to be defined in global.h instead of build files;
2017-05-25 20:57:20 +03:00
AlexVinS
f370cdf1c7
Possible fix for https://bugs.vcmi.eu/view.php?id=2678
2017-05-25 20:09:38 +03:00
ArseniyShestakov
bdb0db819d
Merge pull request #300 from Chocimier/iss1761
...
Correctly display visiting army in kingdom overview, fixes #1761
2017-05-23 03:53:11 +03:00
Piotr Wójcik
76acc29d6c
Correctly display visiting army in kingdom overview, fixes #1761
...
Do not modify CIntObject::pos, according to its doc
2017-05-22 22:34:05 +02:00
DjWarmonger
1b7420264f
Merge pull request #295 from Chocimier/iss1293
...
T hotkey select first town when last is active, fixes #1293
2017-05-13 18:22:28 +02:00
Piotr Wójcik
e4d3cdca09
Simplify
2017-05-13 16:57:15 +02:00
FeniksFire
d390dff54d
Fix game crash after autofight.
...
Vcmi makes crash when I turn on autofight in the battle and wait until I
close result battle window.
2017-05-13 09:54:03 +02:00
Piotr Wójcik
cc02001836
T hotkey select first town when last is active, fixes #1293
2017-05-11 20:49:17 +02:00
DjWarmonger
48702a26a4
Merge pull request #294 from dydzio0614/bug2476
...
Fix bug #2476 (2nd solution)
2017-05-02 08:16:54 +02:00
dydzio
944edaf0bb
Fix bug #2476
2017-03-27 23:47:26 +02:00
FeniksFire
19a9f05b80
Fix garrison highlight in city ( #292 )
2017-03-23 22:48:35 +03:00
Dydzio
88952aefff
Restart button fix ( #288 )
2017-03-19 16:58:46 +03:00
Arseniy Shestakov
09d593e59b
CBattleInterface: avoid freezes on end of battle. Fix issue 1897
2017-03-19 05:15:31 +03:00
FeniksFire
cde8542475
Oversight.
2017-03-18 14:25:17 +01:00
FeniksFire
dd5660ff08
Simplifity code.
2017-03-18 14:21:41 +01:00
FeniksFire
d045f59a11
Little fix in braces #2 .
2017-03-18 07:58:40 +01:00
FeniksFire
68c618cb99
Little fix in highlight in CGarrisonSlot.
2017-03-17 21:24:55 +01:00
FeniksFire
3de891b4b4
Moving/dividing classes from BattleState to separate files.
2017-03-17 16:48:44 +01:00
Arseniy Shestakov
d4091db172
CInfoBar: only pop up when adventure map interface is on top
2017-03-14 00:03:15 +03:00
FeniksFire
46a06ce184
Change the year from 2016 to 2017 in help description.
2017-03-10 19:28:01 +01:00
dydzio
8a2b47d967
Fix for bug #2435
2017-02-10 12:19:35 +01:00
DjWarmonger
a8c39d9267
Merge pull request #274 from dydzio0614/ShooterInit
...
Approved. One guy named Avatar requested it recently ;)
2017-02-06 21:18:19 +01:00
dydzio
141e5ad032
Implement "emergency" projectile init attempt
2017-02-03 23:25:46 +01:00
dydzio
81a00f59d1
Basic fix for bug #2635
2017-02-02 19:17:15 +01:00
Dydzio
6c8ef79727
Merge branch 'develop' into MakeWOGGreatAgain
2017-02-01 23:14:36 +01:00
dydzio
3e285c2004
Add santa gremlin missing creature ability, fix shooter init bug
2017-01-26 20:53:28 +01:00
Michał Kalinowski
4d39f652bf
Making more detailed options when choosing AI in launcher: http://
...
bugs.vcmi.eu/view.php?id=2369
2017-01-17 12:34:28 +01:00
Dydzio
79c101a56d
Remove leftover commander artifact code
2016-12-31 21:29:47 +01:00
DjWarmonger
80d5f7b4a4
Updated project files to MVS 2015 (in fact, it's trivial).
2016-12-12 19:14:45 +01:00
AlexVinS
8f7b0dac45
Fixed CID 1197332
2016-12-05 06:00:32 +03:00
AlexVinS
45ae1ef165
Fixed CID 1197342
2016-12-05 03:17:03 +03:00
AlexVinS
d003abea6f
Fixed CID 1197624
2016-12-05 02:52:34 +03:00
AlexVinS
204ee37ae4
boost/program_options has only 2 uses, and unlikely will be used more -> removed form Global.h.
2016-11-28 21:38:17 +03:00
AlexVinS
7d29365e4a
Fixed CID 1243197
2016-11-28 02:50:45 +03:00
AlexVinS
2dd6a47764
try to plug a few coverity false positives
2016-11-28 02:50:41 +03:00
AlexVinS
9094c99759
Fixed CID 1366403
2016-11-28 02:50:40 +03:00
AlexVinS
312793efd9
try to plug a few coverity false positives
2016-11-27 23:41:17 +03:00
AlexVinS
c0ed22c99e
Fixed CID 1366398.
2016-11-27 22:14:41 +03:00
AlexVinS
3216422307
Fixed a few CWE-457
2016-11-27 22:07:01 +03:00
AlexVinS
abe4beebc6
Fixed CID 1197516
2016-11-27 19:13:40 +03:00
AlexVinS
6196ae7fca
Fixed a few CWE-457
2016-11-27 19:00:16 +03:00
AlexVinS
27b853618c
Fixed a few CWE-457
2016-11-27 18:17:20 +03:00
AlexVinS
c4ab962cc0
Fixed a few CWE-457
2016-11-27 17:48:18 +03:00
AlexVinS
f11c54b5e9
Wipe unused ClickableArea
2016-11-27 16:07:03 +03:00
AlexVinS
418babce81
Fixed CID 1288846
2016-11-26 22:33:08 +03:00
AlexVinS
30663f15ea
Fixed CID 1288863
2016-11-26 22:12:52 +03:00
AlexVinS
7793a57b0a
Fixed remaining CWE-457 in NetPacks.h
2016-11-26 20:50:07 +03:00
AlexVinS
86e33a4c45
[Refactoring] Unified SetResources NetPack API.
2016-11-26 15:14:43 +03:00
AlexVinS
a497824288
Fixed CID 1366287, CID 1366286
2016-11-25 23:12:10 +03:00
DjWarmonger
5058d5771e
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-11-25 20:54:53 +01:00
AlexVinS
86c7bab9c1
Fixed CID 1366324
2016-11-25 22:28:16 +03:00
AlexVinS
80666fb134
Tweaks
2016-11-25 22:12:22 +03:00
AlexVinS
f0963c91bb
Fixed CID 1197409
2016-11-25 21:59:27 +03:00
DjWarmonger
d252265824
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
2016-11-25 18:59:33 +01:00
DjWarmonger
9049990079
Compile fix for MSVS (compiler bug?).
2016-11-25 18:59:17 +01:00
AlexVinS
8b6543bef2
Fixed CID 1366365, CID 1288839
2016-11-25 19:58:52 +03:00
AlexVinS
6a616a5d33
Fixed CID 1366371
2016-11-25 19:36:40 +03:00
AlexVinS
663099882c
Fixed CID 1366366, CID 1366367, CID 1366368, CID 1366369, CID 1366370, CID 1366372
2016-11-25 19:28:00 +03:00
AlexVinS
ac8b618a42
Fixed CID 1366373
2016-11-25 19:17:37 +03:00
AlexVinS
5dd5a0d4a8
Fixed CID 1197445, CID 1197446
2016-11-25 17:54:01 +03:00
AlexVinS
b908c70468
Fixed CID 1197487
2016-11-25 17:29:49 +03:00
AlexVinS
4e28efb8b4
Fixed CID 1288860
2016-11-25 16:09:14 +03:00
AlexVinS
f50fd6d8db
Fixed CID 1366281, CID 1366282, CID 1366283, CID 1366284
2016-11-25 15:45:09 +03:00
AlexVinS
20de754141
def2bmp CLI command converted to CAnimation
2016-11-25 15:23:28 +03:00
AlexVinS
3c9695abcc
Fixed CID 1366310
2016-11-25 13:58:20 +03:00
AlexVinS
db40e125eb
Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359
2016-11-24 21:56:30 +03:00
AlexVinS
04d22644e5
fixed http://bugs.vcmi.eu/view.php?id=2617
2016-11-23 14:47:57 +03:00
AlexVinS
dc39fb2d14
Removed useless CPack::type field.
...
* it was an ancient network protocol artifact
2016-11-18 17:45:59 +03:00
AlexVinS
33c0bc49f6
Merge branch 'CommanderArtifacts3' into develop
2016-11-13 15:31:16 +03:00
AlexVinS
4338fc4ffb
CMessage converted to CAnimation
2016-11-13 08:11:01 +03:00
Alexander Shishkin
a73ca79ed1
Merge pull request #257 from vcmi/mapHandlerRefactoring2
...
Map handler refactoring, part 2.
2016-11-12 09:20:45 +03:00
AlexVinS
9e6bd48038
fix
2016-11-10 14:38:33 +03:00
dydzio
5c07e1c432
Minor typo fixes
2016-11-10 11:51:47 +01:00
AlexVinS
b248642468
fixes and cleanup
2016-11-09 09:32:44 +03:00
dydzio
b626f9a134
Fix CCommanderArtPlace localization + minor fixes
2016-11-08 17:26:24 +01:00
AlexVinS
a8a661b159
Map handler refactoring, part 2.
2016-11-08 00:19:53 +03:00
AlexVinS
aad675a7c4
Revert "Merge branch 'p254_4' into develop"
...
This reverts commit 37f68713a7
, reversing
changes made to 4477b7c35d
.
2016-11-08 00:17:20 +03:00
AlexVinS
4d510c172d
Terrain drawing converted to CAnimation.
2016-11-07 23:48:30 +03:00
AlexVinS
c9a3d92ff3
cleanup
2016-11-06 17:36:46 +03:00
dydzio
96fa0fb6d4
Implement giving commander artifacts back to hero
2016-11-06 13:02:00 +01:00
AlexVinS
6782136e3e
Map edge drawing converted to CAnimation
2016-11-06 05:27:58 +03:00
AlexVinS
46196daa07
cleanup
2016-11-06 05:27:56 +03:00
AlexVinS
6a272d8f0c
FoW drawing converted to CAnimation
2016-11-06 05:27:45 +03:00
AlexVinS
c11a660d21
Fixed and cleanup
2016-11-06 05:27:44 +03:00
AlexVinS
186cd7a163
Mao object drawing converted to CAnimation
2016-11-06 05:27:26 +03:00
dydzio
baeb3c9e55
Refactor CArtPlace + use it for commanders
2016-11-04 17:54:09 +01:00
AlexVinS
08252a1282
Merge remote-tracking branch 'remotes/dydzio/CommanderArtifacts2' into develop
2016-11-03 22:27:08 +03:00
dydzio
03620b3cbe
Remove artifact assembly check for commanders
2016-11-03 19:49:55 +01:00
AlexVinS
329a537eec
Plug assertion (report warning instead) on some maps start.
2016-11-03 19:15:16 +03:00
AlexVinS
9e366df70f
Merge branch 'PregameCache' into develop
2016-11-03 17:10:54 +03:00
dydzio
47a72d4441
Make artifacts worn by commander visible
2016-11-03 14:25:17 +01:00
dydzio
9de5b9f02b
New/load game last selection storing. Fixes #716
2016-11-02 20:10:34 +01:00
DjWarmonger
9db3bfcbf2
Merge pull request #212 from vcmi/refactoring/serialization2
...
Apparently it works - both new and old saves load at least.
2016-11-01 17:25:39 +01:00
Vadim Markovtsev
8d40a4aa95
Fix GUI disposal in creature info window
2016-10-30 22:21:26 +01:00
Vadim Markovtsev
34005228e0
Fix bugs with giving commander's badge to stacks
...
1. SEGFAULT
2. Memory leaks
3. Invalid drawing
4. Fix returning artifacts
2016-10-30 16:32:28 +01:00
Vadim Markovtsev
220e4d2030
Survive giving Commander's badge to stacks
...
Used to SEGFAULT
2016-10-30 14:27:53 +01:00
Vadim Markovtsev
79c85be93f
Fix large obstacles drawing in front of the stacks
2016-10-30 04:51:35 +01:00
Ivan Savenko
256f43f467
Fixes zero-initialized fileVersion member in deserializer
2016-10-29 19:52:19 +03:00
Vadim Markovtsev
ab7a0d64eb
Fix formatting
2016-10-28 23:37:20 +02:00
Alexander Shishkin
0cf5a10bd1
Merge pull request #243 from vcmi/guiCleanup
...
Gui cleanup
2016-10-28 08:53:03 +03:00
AlexVinS
f304c9b2e0
removed unused field
2016-10-27 18:35:53 +03:00
AlexVinS
ffeaef2bda
fixes
2016-10-27 18:19:45 +03:00
Ivan Savenko
5b76c3f4eb
Rebase of codebase changes for refactored serializer
...
Some of newer fixes not yet merged there and save compatibility a bit off.
2016-10-27 18:12:20 +03:00
AlexVinS
f32097339c
Use CSDL_Ext blit for paletted sprites, use SDL blit otherwise.
...
* No solution found to blit paletted images with alpha channel with SDL
2016-10-27 17:32:31 +03:00
Arseniy Shestakov
15b4774076
Logging: always print version of client and server in the begining
2016-10-27 17:14:20 +03:00
Arseniy Shestakov
cb3d6a24e7
Cmake: cleanup for commit hash in build version
...
Since it's available in lib we don't need to include it everywhere.
2016-10-27 17:01:29 +03:00
AlexVinS
3dddbcf2e8
try to use CAnimation for Hero path
2016-10-27 16:34:15 +03:00
AlexVinS
8505a909e1
free Graphics object on quit.
2016-10-27 16:34:13 +03:00
AlexVinS
536f36ede8
use CAnimation fro world view icons
2016-10-27 16:34:12 +03:00
AlexVinS
365c64a345
use CAnimImage for world view legend
2016-10-27 16:34:10 +03:00
AlexVinS
36ac9ac86c
CAdvMapInt tweak
2016-10-27 16:34:07 +03:00
Vadim Markovtsev
da1c9cf249
Fix rebuilding everything on HEAD change
2016-10-23 16:56:53 +02:00
Vadim Markovtsev
d0beb27197
Add git commit hash into the version string
2016-10-23 15:45:47 +02:00
Vadim Markovtsev
4bcc43d3d0
Fix Mantis #2234
...
CPlayerInterface instances were removed from CClient::playerint with
clear() and finish() was not called on each. Added multiple insurance.
2016-10-22 16:22:00 +02:00
Vadim Markovtsev
d51c9a1ff0
Fix uninitialized scrolling state
2016-10-22 10:18:57 +02:00
AlexVinS
feaccead36
fixed missed initialization
2016-10-18 02:37:02 +03:00
AlexVinS
28dd12089b
CSpellWindow fixes.
2016-10-18 02:15:43 +03:00
AlexVinS
a223793405
Get rid of CDefHandler in CPreGame.
...
* also fixes difficulty icon in campaign screen
2016-10-18 01:43:42 +03:00
ArseniyShestakov
eec14028fe
Merge pull request #242 from dydzio0614/MapScrollCursor
...
Implement adventure map scroll cursor change
2016-10-17 16:09:01 +03:00
dydzio
22564dde4b
Implement adventure map scroll cursor change
2016-10-17 14:55:55 +02:00
AlexVinS
b256c4c36d
Improved creature casting GUI.
...
* "F" is new hotkey for creature spells
* creature spells now have lowest priority unless F pressed
* creatures can cast NO_LOCATION spells (only with hotkey)
2016-10-17 08:09:09 +03:00
Alexander Shishkin
4876cc178d
Merge pull request #240 from vcmi/spellWindowRewrite
...
Spell window rewrite
2016-10-17 07:58:56 +03:00
AlexVinS
5346ecb6df
tweak
2016-10-17 05:42:29 +03:00
AlexVinS
3bd8cde8e0
fix
2016-10-17 05:21:43 +03:00
AlexVinS
345dd913f6
use CLabel in SpellArea
2016-10-17 05:05:48 +03:00
AlexVinS
e3ee51a28f
Use label object for mana
2016-10-17 04:05:33 +03:00
AlexVinS
bc2f0ba6f1
fixed spell school ordering http://bugs.vcmi.eu/view.php?id=91
2016-10-17 03:33:29 +03:00
Vadim Markovtsev
89f506658e
Fix issue #2068 - maps list update
2016-10-16 22:15:37 +02:00
AlexVinS
ba5b65ff93
get rid of CDefHandler in CSpellWindow
2016-10-16 15:27:35 +03:00
AlexVinS
2a6bab119b
Use CAnimImage for SpellArea
2016-10-16 13:22:07 +03:00
AlexVinS
3a52a3c663
Allow CAnimImage to share animation object.
2016-10-16 12:58:18 +03:00
AlexVinS
e6829bf271
Removed unused debug data in CAnimation.
2016-10-16 12:02:50 +03:00
AlexVinS
a0300b0447
CSpellWindow widgets capturing
2016-10-16 12:01:18 +03:00
AlexVinS
e1f9b2c74a
SpellArea tweak
2016-10-16 10:43:49 +03:00
AlexVinS
2eb61533fa
use only CSpell in CSpellWindow
2016-10-16 10:32:12 +03:00
AlexVinS
63cbf960df
cleaned up spell window creation
2016-10-16 09:27:22 +03:00
AlexVinS
415bd8247a
Moved SpellbookInteractiveArea into CSpellWindow class
2016-10-16 09:17:23 +03:00
AlexVinS
c4b72342de
CSpellWindow: improved constructor readability
2016-10-16 09:03:13 +03:00
AlexVinS
5506ae036a
Reworked CHillFortWindow
...
* fixed displaying free upgrades
* do not try to print 3rd or more resource in slot cost (in theory possible with mods)
** we need dynamic gui for that
* CDefEssential--
2016-10-16 08:03:52 +03:00
AlexVinS
7ca9ab665a
cleanup
2016-10-16 04:36:03 +03:00
AlexVinS
055c84bc7a
cleanup
2016-10-16 04:23:38 +03:00
AlexVinS
abb875b400
cleanup
2016-10-16 03:52:11 +03:00
AlexVinS
523e33a5e5
cleanup
2016-10-16 03:41:43 +03:00
AlexVinS
e4816c0639
cleanup
2016-10-16 03:14:59 +03:00
AlexVinS
41a5cc1b69
get rid of CCastleInterface::bicons
2016-10-16 03:00:57 +03:00
AlexVinS
153af6e07b
cleanup
2016-10-16 02:47:03 +03:00
Vadim Markovtsev
34cf92cb9b
Change logging style
2016-10-03 20:32:01 +02:00
Vadim Markovtsev
eac5aab396
Survive client<->server ABI mismatch
2016-10-02 22:45:00 +02:00
Vadim Markovtsev
a15b8f4c99
Fix IntObject re-activated with mismatching used and active at game start
2016-10-02 22:45:00 +02:00
Vadim Markovtsev
d5327f3daf
Fix loading "" bitmap at game start
2016-10-02 22:45:00 +02:00
Vadim Markovtsev
6e9431a0fb
Merge pull request #231 from vmarkovtsev/fix-cmake-warnings
...
Fix cmake warnings
2016-10-02 18:17:50 +02:00
Vadim Markovtsev
6d89a2f15c
Fix whitespace dev warnings
...
They are bogus, but still
2016-10-02 17:12:08 +02:00
Vadim Markovtsev
7ac4e6ed18
Fix freshly recruited hero phantom in castle entrance
2016-10-02 16:29:24 +02:00
AlexVinS
85863dbed6
Fix build
2016-10-02 17:25:55 +03:00
AlexVinS
c5440a1c6c
Fixed http://bugs.vcmi.eu/view.php?id=2541
2016-10-02 01:32:28 +03:00
Piotr Wójcik
ea6545b1d3
Prevent flipping empty spellbook
...
When hero has no travel spells he can no longer flip spell book opened from right panel button
2016-10-01 21:39:40 +02:00
AlexVinS
23b7a803b6
cleanup
2016-10-01 20:07:36 +03:00