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,298 Commits 19 Branches 61 Tags 108 MiB
2a299e52a8
Commit Graph

7298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlexVinS
d6f889f08a Setup town`s war machine in finalization step 
* fixes https://bugs.vcmi.eu/view.php?id=2969
 2018-07-16 15:16:55 +03:00
Alexander Shishkin
51229e88b2
Merge pull request #458 from dydzio0614/VsUpdate 
Update VS project files to match vcmi code changes
 2018-07-06 22:03:28 +03:00
Dydzio
260981d586 Update project files to match vcmi code changes 2018-07-06 18:52:51 +02:00
Andrii Danylchenko
12a3c7ed33 AI - code styles and remove redundant performance optimization for explore 2018-06-24 13:30:17 +03:00
Andrii Danylchenko
2466489e13 AI - improve exploration, cancel deadends 2018-06-21 22:29:26 +03:00
Alexander Shishkin
8798e6e52b
Merge pull request #453 from nullkiller/develop 
Android build fix
 2018-05-26 18:06:44 +03:00
Andrii Danylchenko
eeb700cc7d try fix CI 2018-05-26 16:19:23 +03:00
Andrii Danylchenko
dcbcff41dc apply review comments for CAndroidVMHelper 2018-05-26 14:50:49 +03:00
Andrii Danylchenko
ee033e9c9c fix android build 2018-05-25 22:57:29 +03:00
Andrii Danylchenko
20161a2449 Ignore visual studio 2015 cache folder 2018-05-24 21:11:55 +03:00
ArseniyShestakov
bbe421f9e1
Merge pull request #452 from karliss/sanitizers2 
Fix memory and other problems found by address and UB sanitizers.
 2018-05-01 14:35:52 +07:00
Karlis Senko
224ea28433 Fix various memory errors related to server and connections. 
* keep connection when restarting scenario
* wrong double free in Connection
* multiple use after free when stopping server
* double free of StartInfo
 2018-05-01 00:04:20 +03:00
Karlis Senko
69330de89c Avoid integer overflow and conversion related UB. 2018-05-01 00:02:07 +03:00
Karlis Senko
40e6292ed2 Fix memory leaks in launcher. 2018-05-01 00:01:20 +03:00
Karlis Senko
7fb7ceaad7 Prevent out of bounds array access. 2018-04-30 23:59:36 +03:00
ArseniyShestakov
6f6f399911
Merge pull request #451 from josch/develop 
Remove compilation warnings
 2018-04-27 17:29:15 +07:00
Karlis Senko
965b33d16a Server: add GAMEPLAY_STARTING state (#450) 
Fixes issue 2962.
 2018-04-23 00:26:40 +07:00
Johannes 'josch' Schauer
5d487c09fe
client/CPlayerInterface.cpp: initialize observerInDuelMode 2018-04-19 16:13:19 +02:00
Johannes 'josch' Schauer
337f22195c
client/CPlayerInterface.cpp: remove unused variable 2018-04-19 15:26:39 +02:00
Johannes 'josch' Schauer
ed5df13e50
client/battle/CBattleInterface.cpp: uncomment unused variable until soundh->playSound() is implemented 2018-04-19 15:20:26 +02:00
Johannes 'josch' Schauer
a0be483525
server/CVCMIServer.cpp: remove variable that was only set but never used 2018-04-19 15:18:08 +02:00
Johannes 'josch' Schauer
a54e8c88a9
AI/VCAI/VCAI.cpp: Remove unused variable introduced in 2014 2018-04-19 15:15:22 +02:00
Johannes 'josch' Schauer
8ead3e3b91
lib/CGeneralTextHandler.cpp: fix misleading indentation 2018-04-19 15:12:18 +02:00
Johannes 'josch' Schauer
95bec98936
lib/rmg/CRmgTemplateZone.cpp: Remove a variable that was introduced in 2016 but never used 2018-04-19 15:07:21 +02:00
Johannes 'josch' Schauer
56fefca806
lib/rmg/CRmgTemplateZone.cpp: Add parenthesis to make operator precedence unambiguous 2018-04-19 15:06:26 +02:00
godric3
d9d01f0b68 Exposed more of existing limiters for modders (#449) 
* Exposed alignment, faction and terrain limiters
* Limiters toString() use now boost:format
 2018-04-17 19:59:30 +07:00
karliss
ad2c429d8f CMake: unittest improvements (#447) 
* Convert TestConfig to proper test environment.
* Copy test data to build directory.
* Get test recognized by ctest, but disable gtest discovery. Allowing ctest to run each test individually isn't currently practical because it is 50 times slower.
 2018-04-15 18:02:31 +07:00
Arseniy Shestakov
9da3f48274 Code style: formatting and refactoring of launcher code 2018-04-13 15:23:35 +07:00
AlexVinS
d9d5b7b6e5 [c::b] update projects 2018-04-08 18:37:54 +03:00
Arseniy Shestakov
25dea1a599 Code style: formatting and refactoring of VCAI code 2018-04-08 17:43:20 +07:00
Henning Koehler
2ede3783dd Settings: savefrequency is now configurable in launcher 
* Client command-line can modify arbitrary settings now
* Only launcher auto-saves to settings.json
 2018-04-08 17:12:29 +07:00
karliss
ce0b4b222d Fix double free and use of dead reference when saving (#445) 2018-04-07 22:21:28 +07:00
Arseniy Shestakov
4af288aee4 Refactoring of main menu related code 
We need to make sure it's not stay active during gameplay.
Proper fix would require actually removing menu interface from GH, but then GH needs refactoring too.
 2018-04-07 18:44:21 +07:00
Alexander Shishkin
5c09f751b3 Gui cleanup3 - UI refactoring to use smart pointers (#440) 
* Changed most gui classes to use shared pointers
* Store and use IImage as shared_ptr
* CSpellWindow redesign
* AdventureMapClasses cleanup
* CLabel: store background as smart pointer
* Store CObjectList items as smart pointers
* Removed destroy function of list item
* Store toggle buttons as smart pointers
* Use CComponent as smart pointer
* Attempt to fix artifact merchant drawing
 2018-04-07 18:34:11 +07:00
AlexVinS
db60983b5a Fixed broken town`s marketplace 2018-04-06 05:49:18 +03:00
AlexVinS
a8e1c51c36 [c::b] projects update 2018-04-05 21:12:21 +03:00
ArseniyShestakov
1a6f456ac0
Merge pull request #402 from vcmi/feature/multiplayer 
Refactoring of all pre-gameplay UI and networking code.
This will break some things, but I'll be able to fix them without constant rebasing.
 2018-04-05 23:29:27 +07:00
Arseniy Shestakov
f5d8e5b0cc Move Boost Asio compatibility code to Global.h. Fix by @dydzio06143 2018-04-05 19:35:08 +07:00
Arseniy Shestakov
74e5c5bf05 CGameHandler: rename CPackForClient argument and add network logging 2018-04-04 14:24:32 +07:00
Arseniy Shestakov
674242da54 CCallback: remove unregisterAllInterfaces 
Not needed since CPlayerInterface no longer handle interface removal.
It's far better when CClient::endGame doing it since they owned by CClient.
 2018-04-04 14:24:32 +07:00
Arseniy Shestakov
ac66fc7f42 Full rework of pre-game interface and networking 
New features for players:
* Loading for multiplayer. Any save could be used for multiplayer.
* Restart for multiplayer. All clients will restart together.
* Loading from single save.
* Hotseat mixed with network game. Multiple players per client.
* Now connection to server could be cancelled.
* Return to menu on disconnections instead of crashes.
* Restoring of last selected map, save or campaign on next run.

TLDR on important changes in engine code:
* UI: work with server separated from UI
* UI: all explitic blitting replaced with IntObject's
* UI: all new code use smart pointers instead of DISPOSE
* Gameplay always start through lobby controlled by server.
* Threads receiving netpacks now shared for lobby and gameplay.
* Campaigns: heroes for crossover now serialized as JsonNode.
 2018-04-04 14:24:26 +07:00
AlexVinS
1fb25c46d3 cleanup 2018-04-03 21:46:12 +03:00
Arseniy Shestakov
14f03e22da CLabelGroup: add currentSize method 
Might be someone will suggest me better name.
And actually I need method to clean group too.
 2018-04-03 22:11:14 +07:00
Arseniy Shestakov
ab2b9086d3 CLabel: add methods getWidth, setColor, setAutoRedraw 
For somethign like map list we need to change CLabel data without redrawing it.
 2018-04-03 22:11:14 +07:00
Arseniy Shestakov
f04cbaf539 Settings: add lastMap, lastCampaign, lastSave to schema 
Nice to see last used save game after client restart
 2018-04-03 22:11:14 +07:00
Henning Koehler
82f334b503 Enable Limiter nesting with AllOf, AnyOf, NoneOf (#439) 
* Renamed LimiterList to AllOfLimiter and added AnyOfLimiter, NoneOfLimiter
* Updated bonus schema to new limiter format
 2018-04-01 18:17:34 +07:00
Henning Koehler
6ddcb079a4 Enabled new secondary skills to be created (#438) 
* Universities, Scholars and Witch Huts may offer new skills
* Moved encode/decodeSkill to CSkillHandler
* Refactored CSkill interface and CSkill::LevelInfo image storage
* Legacy game constants renamed to ORIGINAL_XXX_QUANTITY
 2018-03-31 12:56:40 +07:00
AlexVinS
b09a54fa9c [tweaks] IImage * -> auto 2018-03-30 14:29:55 +03:00
AlexVinS
43acfa160b [tweaks] IImage * -> auto 2018-03-30 14:02:04 +03:00
AlexVinS
031d3204f7 Fixed "Error: accessing unavailable frame" in some cases 2018-03-30 13:40:40 +03:00