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
1f1f61cf15
Custom campaigns list: redraw parent as we use it's background
...
This one fix issue 2057
2015-03-13 18:06:19 +03:00
f8747a1f16
Multiplayer: don't add newly joined players to CPU-only slots
2015-03-13 15:05:12 +03:00
685deddac1
Start spell-relatet files reorganisation
...
* moved existing files to separate directory
-> todo: split mechanics
2015-02-26 08:39:48 +03:00
c46999bcb8
Conurrency related tweaks. Crashes in renderFrame should be fixed, but synchronization is still not perfect
2015-02-15 04:53:01 +03:00
aa5e9fc959
get rid of global debug macros.
2015-02-14 22:43:16 +03:00
551925b6d7
Added comments;
2015-01-24 23:12:17 +01:00
ad8a6c55d7
Fixes #2016 (heroes not possible to be chosen in pregame after switching town selection);
...
Fixes skipping first hero selection when switching them with left arrow;
Fixes redrawing random hero portrait correctly after switching that player to AI;
2015-01-24 21:24:23 +01:00
0e346a4f0d
Reset mapDescription scrolling position on change of map / save
...
This one fixes bug #1974
2014-11-24 15:56:33 +03:00
6fd0f76547
Fix invisible save select when click on save name area
2014-11-23 08:51:48 +03:00
dce9880d16
Minor refactoring of FunctionList using variadic templates.
...
Please make sure that all supported compilers are OK with this code
2014-11-12 22:46:37 +02:00
447979d051
bind -> std::bind
2014-10-10 14:36:35 +04:00
66b022f93e
initializer lists part1
2014-10-02 19:43:46 +04:00
1e5e02c7df
Compilation fixes caused by merge, replaced some remaining boost::bind with std's
2014-08-09 15:14:31 +03:00
b1285bc506
Merged GUI refactoring into develop, fixed conflicts
2014-08-09 15:01:55 +03:00
5139378319
- migrated boost::function/ref/bind to std:: variants
2014-08-04 20:33:59 +02:00
77a73fbaa9
Merge branch 'feature/freegfx' into refactoring/guiClasses
...
Conflicts:
client/windows/CHeroWindow.cpp
client/windows/CQuestLog.cpp
client/windows/GUIClasses.cpp
2014-08-03 18:50:59 +03:00
7390647cd5
End of buttons refactoring:
...
- cleanup of slider API
- documentation fixes
2014-08-03 17:31:56 +03:00
10fc1892a8
Large refactoring of button classes:
...
- renamed CAdventureMapButton to more expectable CButton
- merged CButtonBase into CButton
- created more generic class for clickable elements
- created more generic class for selectable elements
- renamed CHighlightableButton to CToggleButton
- renamed CHighlightableButtonsGrous to CToggleGroup
- minimized differences between API of all these classes
- removed all but one contructors in buttons, with same parameters across all classes
2014-08-03 14:16:19 +03:00
e8580229dc
RMG will now actually use all the settings from pregame. Till now it did not.
2014-07-15 16:44:07 +02:00
731aedf3a1
Split CIntObjectClasses into multiple smaller files. This should be the last change in files
2014-07-15 10:14:49 +03:00
92d22bae63
Merge branch 'feature/creatureWindow' into refactoring/guiClasses
2014-07-14 17:23:24 +03:00
647b9c683f
Reorganized client source tree:
...
- client/widgets for reusable GUI elements
- client/windows for independent windows
- client/gui for base GUI classes which should remain internal
2014-07-13 20:53:37 +03:00
83099fdb78
Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree
2014-07-13 18:39:45 +03:00
0edd10078f
Fix usage of fillRect.
...
* proper fix for slider drawing
2014-07-05 01:52:11 +04:00
9b8ad51cd3
Run all rendering with pim lock if possible
2014-07-03 22:05:59 +04:00
ecc7b8e05a
Draw cursor on each frame. Fix TTF rendering under cursor.
2014-07-03 18:05:07 +04:00
e521e6687a
centralize cursor drawing
2014-07-03 15:10:01 +04:00
397f4cf8b6
Workaround for TFF font glitches under cursor in pregame
2014-07-03 14:10:15 +04:00
617ea79d3c
Button overlays are now more generic (not necessarily text), removed old version of creature window
2014-07-02 21:38:38 +03:00
3b8d0e44d4
Merge branch 'develop' into SDL2
2014-06-24 14:09:44 +04:00
3ac306f501
Merge pull request #19 from vcmi/feature/mapObjects
...
Feature/map objects
2014-06-22 14:49:42 +02:00
e56f41b8be
Fixed monster strength selection.
2014-06-15 12:00:34 +02:00
