Jordan Milne
53cff0ba68
use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu
2013-01-09 09:05:47 -04:00
Jordan Milne
02ccb75894
Wrap the mouse to the window (except in debug mode)
...
Grab the mouse when not in the main menu (except in debug mode)
Always hide the cursor when it's over the window
Allow warping the mouse around
Handle ^C properly
2013-01-09 06:10:05 -04:00
Jordan Milne
1bf36c686c
add ability to check if a window is on the stack (to see if we're in the main menu)
2013-01-09 06:09:47 -04:00
Jordan Milne
f85679db93
Merge branch 'master' into sdl_input
2013-01-09 00:04:55 -04:00
Jordan Milne
6b49b8ab47
MyGUI doesn't care for SDL's mouse button ordering, send it what it expects
2013-01-08 22:14:30 -04:00
Jordan Milne
3b1d285cf3
fix compile errors, work with unmodified SDL
2013-01-08 21:01:58 -04:00
Nathan Jeffords
39d27b87c9
fixed build error with Audiere coded enabled
2013-01-08 09:14:56 -08:00
Jordan Milne
6449f68d61
Merge branch 'master' into sdl_input
2013-01-08 06:24:31 -04:00
Jordan Milne
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
2013-01-08 06:19:05 -04:00
Marc Zinnschlag
c6ff58d5b5
Merge remote-tracking branch 'scrawl/videoplayback'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-08 11:17:19 +01:00
Tom Mason
9ee823d8f8
fixed typo in vmformat.txt
2013-01-07 21:09:03 +00:00
Tom Mason
4c5ed43cc9
added removesoulgem, and fixed addsoulgem
2013-01-07 21:08:04 +00:00
Tom Mason
c2901fe6cc
added addsoulgem scripting function
2013-01-07 18:16:50 +00:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
c2b75e28e9
Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback
2013-01-07 13:20:50 +01:00
scrawl
282601d6e9
support the allowSkipping extra parameter for playBink command.
2013-01-07 13:19:52 +01:00
scrawl
35f4d09288
swscale handled better (cmake)
2013-01-07 13:06:16 +01:00
Marc Zinnschlag
2557ef4d7d
post merge fixes and some misc clean up
2013-01-07 12:17:46 +01:00
Marc Zinnschlag
41767f8dfa
Merge remote-tracking branch 'blunted2night/better_flicker'
2013-01-07 12:06:21 +01:00
Nathan Jeffords
0f3712f284
change flickering light's brightness pattern
2013-01-06 14:29:22 -08:00
Marc Zinnschlag
25815ab8f7
Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'
2013-01-06 13:31:01 +01:00
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
Marc Zinnschlag
fbb59302d9
Merge remote-tracking branch 'blunted2night/loading_screen_fix'
2013-01-04 10:50:59 +01:00
Emanuel Guevel
67273fc177
mwiniimporter: use Utf8Encoder
2013-01-04 01:52:02 +01:00
Nathan Jeffords
9afe4467d8
cache results of query for spash screen names
...
ResourceGroupManager::listResourceNames returns a list of all resource
accessable which is expensive, this change caches the result of the
processed query so additional splash screen changes are quicker.
2013-01-03 15:45:09 -08:00
Marc Zinnschlag
0af7a2888a
Merge remote-tracking branch 'scrawl/ai_script'
2013-01-03 09:56:36 +01:00
Marc Zinnschlag
25d9918765
post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)
2013-01-03 09:55:48 +01:00
Marc Zinnschlag
c0260697c2
Merge remote-tracking branch 'scrawl/master'
2013-01-03 09:52:46 +01:00
Marc Zinnschlag
ce5d27b07b
Merge remote-tracking branch 'scrawl/button_fixes'
2013-01-03 09:50:24 +01:00
scrawl
42e0501c67
fix typo
2013-01-03 02:40:21 +01:00
scrawl
a5ef669eb6
Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD
...
Conflicts:
apps/openmw/mwscript/aiextensions.cpp
apps/openmw/mwscript/docs/vmformat.txt
2013-01-03 02:34:31 +01:00
scrawl
ba7086cadf
Use race/class names (instead of ID) in replaced escape sequences
2013-01-03 02:05:05 +01:00
scrawl
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
2013-01-03 01:09:03 +01:00
scrawl
ddbe13e569
Workaround for http://bugs.openmw.org/issues/475
2013-01-03 01:07:17 +01:00
Marc Zinnschlag
ff74f687fb
Merge remote-tracking branch 'lazydev/master'
2013-01-02 16:04:44 +01:00
lazydev
04cca2a1ce
fix for http://bugs.openmw.org/issues/517
2013-01-02 18:58:52 +04:00
Marc Zinnschlag
83fe128e87
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2013-01-02 10:05:27 +01:00
scrawl
86f30992d7
fix message boxes not appearing properly when e.g. trading
2013-01-01 22:00:14 +01:00
Emanuel Guevel
2a7336c310
mwiniimporter: handle ini file encodings
...
Use components/to_utf8 to handle encodings.
Add an --encoding option for choosing between win1250, win1251 and
win1252 encodings for the imported ini file.
2013-01-01 21:59:30 +01:00
Marc Zinnschlag
4a8bf40a83
Merge remote-tracking branch 'lazydev/master'
2013-01-01 20:45:09 +01:00
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
Emanuel Guevel
e9a464c9f7
mwiniimporter: remove fallback values for Cursors
2012-12-31 16:45:24 +01:00
Emanuel Guevel
e2b348de96
mwiniimporter: fix line ending problem
2012-12-31 16:44:22 +01:00
Marc Zinnschlag
65c7c7f60e
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2012-12-31 14:47:05 +01:00
greye
7e0713f6c4
fix string case update
2012-12-31 11:22:40 +04:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
Marc Zinnschlag
8b2785400b
Merge remote-tracking branch 'trombonecot/comparestring'
2012-12-30 20:11:18 +01:00
eduard
69d9d22579
comparestring
2012-12-30 19:56:38 +01:00
Marc Zinnschlag
e577731a06
Merge remote-tracking branch 'scrawl/master'
2012-12-30 18:31:35 +01:00
scrawl
f56182cac2
fix journal window not rendering any text
2012-12-30 17:06:17 +01:00
