Emanuel Guevel
|
8f8362d2c4
|
Expose sneak indicator widget through WindowManager
|
2013-08-03 03:03:29 +02:00 |
|
Emanuel Guevel
|
9757694060
|
Update sneaking indicator position with other widgets
|
2013-08-03 02:43:56 +02:00 |
|
Marc Zinnschlag
|
ca94d1a2fb
|
Merge remote-tracking branch 'swick/inventorypos'
Conflicts:
apps/openmw/mwgui/inventorywindow.cpp
|
2013-07-31 22:16:56 +02:00 |
|
Sebastian Wick
|
7ed763262f
|
GUI mode dependent position
|
2013-07-31 21:40:29 +02:00 |
|
Marc Zinnschlag
|
5cafe65cd7
|
Merge remote-tracking branch 'scrawl/cppcheck'
|
2013-07-31 20:00:35 +02:00 |
|
scrawl
|
d106ed3b08
|
Fixed alchemy
|
2013-07-31 19:03:51 +02:00 |
|
scrawl
|
7dc30a01cd
|
Some changes suggested by cppcheck
|
2013-07-31 18:46:32 +02:00 |
|
PLkolek
|
8bc8c38f2d
|
Spell cost is updatedon every change in enchanting and spellmaking.
|
2013-07-31 13:33:30 +02:00 |
|
PLkolek
|
7fd7621458
|
Fixed area slider in self enchantments.
|
2013-07-31 12:26:34 +02:00 |
|
scrawl
|
da01ec4f52
|
Only show the "Rest until healed" button when stats are not full
|
2013-07-30 22:07:27 +02:00 |
|
Marc Zinnschlag
|
3642562959
|
Merge remote-tracking branch 'scrawl/master'
|
2013-07-30 08:11:40 +02:00 |
|
scrawl
|
3961c276b8
|
Added enemy health meter
|
2013-07-30 06:00:20 +02:00 |
|
Marc Zinnschlag
|
e27ba55541
|
Merge remote-tracking branch 'swick/countdialog'
|
2013-07-29 21:38:04 +02:00 |
|
Sebastian Wick
|
40d3efc671
|
use cancel methid
|
2013-07-29 18:35:23 +02:00 |
|
Sebastian Wick
|
7b40e57ba1
|
Allow the 'Activate' key to close the countdialog window; cleanups
|
2013-07-29 18:27:00 +02:00 |
|
Sebastian Wick
|
1b310c5c5b
|
use SDL resolutions in the ingame settings
|
2013-07-29 13:34:56 +02:00 |
|
scrawl
|
6164e5bae6
|
Restored window resizing
|
2013-07-29 02:32:08 +02:00 |
|
Marc Zinnschlag
|
ec575200e3
|
Merge remote-tracking branch 'gus/MeleeCombat2'
Conflicts:
apps/openmw/mwrender/animation.cpp
|
2013-07-23 09:12:23 +02:00 |
|
Emanuel Guevel
|
48f0e64ec3
|
Fix health calculation at character creation
|
2013-07-21 11:02:03 +02:00 |
|
Emanuel Guevel
|
2a0644a7c3
|
Move some levelup logic from mwgui to mwmechanics
|
2013-07-20 22:14:10 +02:00 |
|
Chris Robinson
|
14e0c182f3
|
Allow specifying the sound type to playSound and playSound3D
|
2013-07-18 21:50:11 -07:00 |
|
scrawl
|
91e95e1404
|
Use the correct slash, chop or thrust animation
|
2013-07-16 23:32:41 +02:00 |
|
scrawl
|
8407e2b3aa
|
Fixes the console sometimes receiving text after it was closed
|
2013-07-14 23:54:28 +02:00 |
|
scrawl
|
bbb5d2b98a
|
Change tooltip positioning to resemble vanilla
|
2013-07-10 03:40:13 +02:00 |
|
scrawl
|
91f6d87126
|
Fix an uninitialized variable
|
2013-07-07 16:57:46 +02:00 |
|
scrawl
|
72600a16cf
|
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
|
2013-07-06 17:02:40 +02:00 |
|
scrawl
|
58fce74620
|
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
|
2013-07-06 16:40:57 +02:00 |
|
Sebastian Wick
|
26bd2a5301
|
use the new scrollbar; range dependent step size; fix
|
2013-07-05 20:28:46 +02:00 |
|
Sebastian Wick
|
b43f41c2bd
|
use a mygui controller for scrollbar repeat
|
2013-07-05 19:17:00 +02:00 |
|
Sebastian Wick
|
e3d8bdbafe
|
autorepeat scrollbar
|
2013-07-02 17:29:47 +02:00 |
|
vorenon
|
4e8e048968
|
Added missing click sounds to dialogue
|
2013-06-19 01:46:38 +02:00 |
|
Marc Zinnschlag
|
b5926257f5
|
Merge remote-tracking branch 'scrawl/sdl_input2'
|
2013-06-16 21:23:35 +02:00 |
|
scrawl
|
b16bc69479
|
Removed the no longer needed --debug switch
|
2013-06-16 20:39:40 +02:00 |
|
Marc Zinnschlag
|
57ce87bf12
|
Merge remote-tracking branch 'scrawl/sdl_input2'
|
2013-06-16 20:37:15 +02:00 |
|
scrawl
|
4fd7891d2c
|
Fix a message box issue
|
2013-06-16 20:26:27 +02:00 |
|
vorenon
|
76a2abcbe3
|
added missing line break in front of multiple choice questions
|
2013-06-16 19:46:55 +02:00 |
|
scrawl
|
b16c92c2f5
|
Better handle SDL_TEXTINPUT events
|
2013-06-16 19:43:59 +02:00 |
|
scrawl
|
03682184c6
|
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
|
2013-06-16 18:06:55 +02:00 |
|
Marc Zinnschlag
|
3e29506d5c
|
Merge remote-tracking branch 'vorenon/dialogue'
|
2013-06-16 17:03:50 +02:00 |
|
vorenon
|
4c0086b54c
|
Workaround for bug #820
|
2013-06-16 01:09:03 +02:00 |
|
scrawl
|
4c8a04d9cb
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
|
2013-06-15 17:41:42 +02:00 |
|
scrawl
|
f1ff9b69b3
|
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
|
2013-06-15 15:33:47 +02:00 |
|
Rohit Nirmal
|
e5ddaaf676
|
Fix wrong indenting from my last commits.
|
2013-06-13 11:17:34 -05:00 |
|
Marc Zinnschlag
|
df016778be
|
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
|
2013-06-13 18:04:38 +02:00 |
|
scrawl
|
0880805559
|
Minor cleanup
|
2013-06-13 12:13:40 +02:00 |
|
Rohit Nirmal
|
9d4ecc3e73
|
replace tabs with spaces.
|
2013-06-13 00:52:26 -05:00 |
|
Rohit Nirmal
|
aac3ada14b
|
Use mousewheel to turn book pages.
|
2013-06-13 00:50:07 -05:00 |
|
scrawl
|
fcf35d3871
|
Removed the UI cursor sensitivity slider
|
2013-06-12 20:27:55 +02:00 |
|
scrawl
|
918a1655bb
|
Restored HW cursor rotation and resolution/fullscreen switching
|
2013-06-12 14:58:07 +02:00 |
|
scrawl
|
495aeb5d3b
|
Merge branch 'master' into HEAD
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
|
2013-06-12 12:34:33 +02:00 |
|