DjWarmonger
6ac00873b9
Compilation fixes - allow SDL1.
...
Please do not define class-specific constants that are static at same time.
2015-02-18 15:31:55 +01:00
DjWarmonger
2a082e6c21
Merge pull request #84 from Fayth/test/advMapFading
...
If no one objects, I will try to merge this.
2015-02-18 09:52:09 +01:00
AlexVinS
c46999bcb8
Conurrency related tweaks. Crashes in renderFrame should be fixed, but synchronization is still not perfect
2015-02-15 04:53:01 +03:00
AlexVinS
b71d985d49
cleanup
2015-02-15 01:46:47 +03:00
Fay
5a7a208617
Minor fixes (possible surface leak);
2015-02-02 17:42:42 +01:00
Fay
5e78a3147a
Abstracted fading into separate class;
...
Smoother fade animations;
Added fading when recentering hero after switching levels;
2015-01-30 23:37:28 +01:00
Fay
4b248c2762
World view impl -- initial;
2015-01-13 20:57:41 +01:00
Ilya Zhuravlev
b22973e717
Fixed crash, "pure virtual method called", when calling doUpdate lambda from CGPreGame.
2014-11-10 20:21:39 +03:00
Ivan Savenko
4092929b70
Fixed endianness
2014-08-11 16:21:23 +03:00
Ivan Savenko
1e5e02c7df
Compilation fixes caused by merge, replaced some remaining boost::bind with std's
2014-08-09 15:14:31 +03:00
Ivan Savenko
b1285bc506
Merged GUI refactoring into develop, fixed conflicts
2014-08-09 15:01:55 +03:00
Ivan Savenko
4d6ab2c32d
Fixed rendering of bitmap fonts shadow
2014-08-07 19:53:07 +03:00
beegee1
5139378319
- migrated boost::function/ref/bind to std:: variants
2014-08-04 20:33:59 +02:00
Ivan Savenko
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
Ivan Savenko
731aedf3a1
Split CIntObjectClasses into multiple smaller files. This should be the last change in files
2014-07-15 10:14:49 +03:00
Ivan Savenko
92d22bae63
Merge branch 'feature/creatureWindow' into refactoring/guiClasses
2014-07-14 17:23:24 +03:00
Ivan Savenko
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
Ivan Savenko
cec9161f8f
Added missing files
2014-07-13 18:40:13 +03:00
Ivan Savenko
83099fdb78
Moved all non-window GUI elements out from GUI classes file. TODO: reorganize source tree
2014-07-13 18:39:45 +03:00
Ivan Savenko
55ff933b7f
Reducing size of GUI classes. Split trade windows into a separate file
2014-07-13 16:31:00 +03:00
Ivan Savenko
09bedf9aa9
Reducing size of GUIClasses. Moved Garrison Int into a separate file.
2014-07-13 16:11:25 +03:00
Ivan Savenko
7e76a5dd0e
Moved some code from GUIClasses into two smaller files:
...
- CArtifactHolder.*
- CComponent.*
Goal: reorganize artifacts UI to decrease dependency on CGHeroInstance class
2014-07-13 14:56:30 +03:00
AlexVinS
0edd10078f
Fix usage of fillRect.
...
* proper fix for slider drawing
2014-07-05 01:52:11 +04:00
Ivan Savenko
20f7071d11
Implemented stack experience/commander experience display for window
2014-07-04 12:48:09 +03:00
AlexVinS
74d3effa98
More safe way of update locking
2014-07-03 22:30:56 +04:00
Ivan Savenko
e4e9d71143
Fixed texts:
...
- added new texts to translate.json
- implemented texts for abilities
Remaining TODO's:
- handling of stack artifact
- handling of commander artifacts
- stack experience
2014-07-03 21:09:17 +03:00
AlexVinS
9b8ad51cd3
Run all rendering with pim lock if possible
2014-07-03 22:05:59 +04:00
AlexVinS
8a488aeb86
Cleanup
2014-07-03 19:57:21 +04:00
AlexVinS
57f82f2bed
Add a comment.
2014-07-03 18:46:23 +04:00
AlexVinS
f3067878dd
Force full redraw for sliders. This fixes backgroung glitches with SDL2.
...
(!) there should be better fix
2014-07-03 18:44:25 +04:00
AlexVinS
ecc7b8e05a
Draw cursor on each frame. Fix TTF rendering under cursor.
2014-07-03 18:05:07 +04:00
AlexVinS
e521e6687a
centralize cursor drawing
2014-07-03 15:10:01 +04:00
AlexVinS
c948891fc6
Fix threaded handlers initialization, cleanup
2014-07-03 12:26:15 +04:00
AlexVinS
3e4e810888
More ColorKey cleanup
2014-07-02 22:41:11 +04:00
Ivan Savenko
617ea79d3c
Button overlays are now more generic (not necessarily text), removed old version of creature window
2014-07-02 21:38:38 +03:00
AlexVinS
638dac90af
centralize key color management
2014-07-02 22:20:54 +04:00
AlexVinS
e57dbbde15
Extract startTextInput & stopTextInput
...
(*) these functions do nothing with SDL1 - this is by design - less ifdef`s
2014-07-02 19:41:30 +04:00
AlexVinS
9797372dbe
Implement Unicode support for ingame console
2014-07-02 19:16:05 +04:00
AlexVinS
ac7703ffb0
Fix hero movement rendering
2014-06-21 12:13:19 +04:00
AlexVinS
5fa5ba622f
Start preparation for moveHero threaded implementation
2014-06-18 14:31:11 +04:00
AlexVinS
c2dd696e96
simplify CGuiHandler::handleEvents()
...
Threre is no need to allow (and I doubt is was in fact possible with old code) new events to arrive during processing events. Let them to be processed in next frame.
2014-06-18 08:30:23 +04:00
AlexVinS
5fdc63ab5b
tiny fixes
2014-06-16 14:32:37 +04:00
AlexVinS
c7390316b7
small cleanup
2014-06-13 07:55:50 +04:00
AlexVinS
41a0319985
remove separate GUI thread
...
+ this fixes OGL
- has some issues(f.e. hero movement)
2014-06-13 07:55:49 +04:00
AlexVinS
15fe37133c
Fix compilation with SDL1
...
+ seems to be fully backward compatible (need more testing)
2014-06-13 07:55:48 +04:00
Ivan Savenko
8eb661461c
- vcmi compiles with SDL2 on Linux, video player is disabled for now
2014-06-13 07:55:45 +04:00
AlexVinS
3db7fb4f63
Still try to fix opengl backend
...
- no success
+ make backend selection configurable
2014-06-13 07:55:45 +04:00
AlexVinS
d289c6a34a
Prefere opengl rendering
...
- broken ...
2014-06-13 07:55:44 +04:00
AlexVinS
6474e37b76
try to fix hotkeys
2014-06-13 07:55:43 +04:00
AlexVinS
ac2896da42
Implemented SDL2 unicode input. Hotkeys are sill broken.
2014-06-13 07:55:42 +04:00