1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-09 01:06:07 +02:00
Commit Graph

356 Commits

Author SHA1 Message Date
64d9dadd64 Logging cleanup. 2017-08-11 15:47:50 +03:00
61e241308d Logging cleanup 2017-08-10 19:52:05 +03:00
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
6d9f99d4de Code style: and one more pass on lambda expressions parameter list 2017-07-19 02:11:17 +03:00
2da3d8a563 Code style: remove senseless comments 2017-07-18 00:04:00 +03:00
b2f74a93cf Code style: add empty parameter list to all lambda expressions (#345) 2017-07-17 15:35:57 +03:00
b52cfe5283 Code style: use parentheses for creating heap-based objects (#344) 2017-07-16 12:58:05 +03:00
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
f1e5797834 Code style: move or add licensing information on top of every file 2017-07-14 01:26:03 +03:00
dbcd79c48a Code cleanup: remove double and unneded semicolons 2017-07-12 22:01:10 +03:00
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
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
e25ed4f358 [Tweak] Use unique_ptr for map header in pregame 2017-06-04 21:11:58 +03:00
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
4b0f702e7e Add LeaveGame netpack and avoid replying on it and CloseServer 2017-06-02 02:51:44 +03:00
009bfb8211 cleanup 2017-05-28 17:27:16 +03:00
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
2dd6a47764 try to plug a few coverity false positives 2016-11-28 02:50:41 +03:00
c4ab962cc0 Fixed a few CWE-457 2016-11-27 17:48:18 +03:00
db40e125eb Fixed CID 1243181, CID 1197449, CID 1366374, CID 1366377, CID 1366359 2016-11-24 21:56:30 +03:00
9de5b9f02b New/load game last selection storing. Fixes #716 2016-11-02 20:10:34 +01:00
256f43f467 Fixes zero-initialized fileVersion member in deserializer 2016-10-29 19:52:19 +03:00
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
a223793405 Get rid of CDefHandler in CPreGame.
* also fixes difficulty icon in campaign screen
2016-10-18 01:43:42 +03:00
4876cc178d Merge pull request #240 from vcmi/spellWindowRewrite
Spell window rewrite
2016-10-17 07:58:56 +03:00
89f506658e Fix issue #2068 - maps list update 2016-10-16 22:15:37 +02:00
3a52a3c663 Allow CAnimImage to share animation object. 2016-10-16 12:58:18 +03:00
58d11d6074 donotstartserver: ask for IP and port even for "host" player
When "--donotstartserver" option specified client will show dialog to use any IP/port for host player.
2016-09-18 23:24:08 +03:00
1cbe9e1b8b Client: add donotstartserver option. Alternative way to start a game
Option is useful for server profiling also let me test MP over network and much more.
Also there is issues with boost::interprocess on some systems under Windows and this is the way to bypass them.
2016-09-16 20:01:44 +03:00
437eadf1ed do not leak scenarioOpts in CMapInfo 2016-08-31 06:18:01 +03:00
7e0c4e1451 tweak 2016-08-30 08:27:01 +03:00
452e28d183 Remove some useless includes found by cppclean
This of course was tested and shouldn't break anything
2016-08-26 04:42:16 +03:00
10dbbead2d Fix indentation of logging code and around it
That wouldn't be as big issue if problem affected few files, but it everywhere in codebase.
Fixed it everywhere since in most files that is the only code with wrong indentation.
2016-03-12 04:46:21 +03:00
0c21efb202 Start integration of map format into engine 2016-02-09 20:20:03 +03:00
70e3c81b9f Replaced CFileInfo with more correct and efficient alternative 2016-01-26 14:51:38 +01:00
43b364bcd4 compilation fixes... 2016-01-16 19:00:53 +01:00
cf61837ced replaced std::string with boost::filesystem::path in several places 2016-01-16 16:36:16 +01:00
9fd1cff090 Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared
Long time ago it's was used without prefix to make future switch from boost to std version easier.
I discusses this with Ivan and decide to drop these using from Global.h now.

This change wouldn't break anything because there was already code with prefix for each of three cases.
2015-12-29 05:43:33 +03:00
745ab7c7df One more fix for options 2015-11-25 07:40:35 +03:00
2276af70dc PreGame: avoid crashing on random map options
Options is still broken, but at least we shouldn't crash there.
2015-11-25 07:25:44 +03:00
e4b1ef1405 Add "override" to virtual overriden methods 2015-10-13 21:05:36 +03:00
371e4b8714 Fix mantiss 2235, 2237 2015-08-22 16:47:40 +03:00
32c15a8266 Extract fps counter drawing 2015-06-22 23:57:34 +03:00
cc669b0ae7 Move gui locking to GUIHandler 2015-06-22 21:53:47 +03:00
6890ae9f02 - Fixed improper use of playersCount. Now RMG can generate maps up to 8 players, with CPU players only as well.
- Fixes for template scheme
2015-05-27 11:30:46 +02:00
323c4e1637 RMG Options: make "Computer only teams" buttons work as expected
Button "0" should be always enabled and if "Computer only players" set to "0" we should also computer only team count to "0" if it's not random.
2015-03-16 16:02:52 +03:00
078bf6c69c CSelectionScreen: always use isHost and isGuest when suitable 2015-03-15 19:33:58 +03:00
c4000f2ac7 Multiplayer: always display flags in lobby, but block them for guest 2015-03-15 19:24:03 +03:00
eeff8f3ea4 Multiplayer: add sync for RMG options in lobby
Sadly I'm not yet find proper way to block all buttons in CToggleGroup without make them invisible so it's still possible to press buttons for guest. Though CRandomMapTab::updateMapInfo is now disabled for guest so even if guest going to press multiple buttons it's not going to cause crash for him.
2015-03-13 23:33:46 +03:00
67aa869a33 Multiplayer: make chat history visible in lobby and improve CTextBox
Now we'll also play sound when new message added.
CTextBox::setText now will automatically change text height for slider.
2015-03-13 18:45:07 +03:00