mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-04 00:56:39 +00:00
Code Issues Releases Wiki Activity
23666 commits 115 branches 76 tags 128 MiB
Commit graph

387 commits

Author SHA1 Message Date
cc9cii
9713873538 Minor change to improve generated STL code (only tested with MSVC 2012). More details in forum post https://forum.openmw.org/viewtopic.php?f=6&t=2153#p24065 2014-07-05 15:41:40 +10:00
slothlife
9ea22324f7 Fix some MSVC warnings. 
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
 2014-06-23 01:13:30 -05:00
scrawl
162549b7af Remove a wrong comment 2014-06-13 22:23:24 +02:00
scrawl
fcab53b3f7 Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified 2014-06-13 22:21:44 +02:00
Marc Zinnschlag
2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 2014-06-12 12:54:39 +02:00
cc9cii
36e380c6be Merge remote-tracking branch 'upstream/master' 2014-06-11 21:58:10 +01:00
scrawl
41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202 
Note: breaks compatibility with input.xml, so the filename was changed.
 2014-06-11 19:47:42 +02:00
Fil Krynicki
cd693b6d37 Fixed mouse closing containers, and injection/gui test order 
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.

Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.

And fixed a comment.
 2014-06-07 20:08:29 -04:00
Fil Krynicki
97caa1f8a4 Alternative fix strategy by checking for binding state 2014-06-06 22:25:23 -04:00
cc9cii
fd758bacd3 Remove #ifdef guards. 2014-06-06 19:58:05 +10:00
cc9cii
76bf774485 Small changes for compiling with MSVC 2013. 2014-06-06 03:52:41 +10:00
Fil Krynicki
bbb7ceab43 Merge branch 'master' into bug1196jumpdialog 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2014-05-31 19:58:21 -04:00
Fil Krynicki
cd131e7f86 1196/1217 fix 
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
 2014-05-31 19:51:21 -04:00
Marc Zinnschlag
be88168e91 Merge remote-tracking branch 'scrawl/master' 2014-05-30 10:07:18 +02:00
scrawl
afc1fa49f6 Use mouse release instead of press for binding actions 
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
 2014-05-29 20:35:57 +02:00
cc9cii
bbe77d656a Minor fixes from static analysis. 2014-05-28 21:15:50 +10:00
greye
663d5c314e be more verbose on change reasons 2014-05-22 16:35:57 +04:00
greye
3721174ae4 proof-of-concept boost::wave iteration policy 2014-05-21 23:50:58 +04:00
greye
1b7ed98325 fix typos, reset memory before using 2014-05-20 12:41:45 +04:00
greye
a46662043a tinyxml convert path to UTF-16 on Windows 2014-05-20 09:17:32 +04:00
scrawl
eff648e3ab Show unhandled SDL events in hexadecimal (easier to compare with the enum) 2014-05-03 16:16:27 +02:00
scrawl
e7b9b6d87a Fix a confusing variable name 2014-05-02 23:07:01 +02:00
scrawl
a3dffd5d57 Add some missing SDL to MyGUI key translations. 
Most importantly to allow numpad enter as alternative to return key.
 2014-04-18 14:13:29 +02:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
cc9cii
5539c75ef0 Typo fix to avoid divide by zero. 2014-03-05 22:12:59 +11:00
scrawl
439018e706 Get rid of useless return values 2014-02-19 11:23:03 +01:00
scrawl
c004fb778f Get rid of underscore defines. They are reserved by the standard. 2014-01-05 18:22:29 +01:00
scrawl
6d27ebabb6 Integrate AddGlow with material controllers 2013-12-26 20:53:45 +01:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/main.cpp
 2013-12-16 13:35:31 +01:00
scrawl
4bc4af6bf0 Enable microcode caching for Ogre 1.9+ 2013-12-14 22:01:24 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
scrawl
bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 2013-11-29 20:06:54 +01:00
scrawl
7f735c2c4c Release and show the cursor when focus lost 2013-11-20 16:07:14 +01:00
scrawl
3452bd2e0b Add glow effect for enchanted items 2013-11-20 00:13:12 +01:00
Marc Zinnschlag
b7bb7d6902 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/opencs/editor.cpp
 2013-11-10 11:49:48 +01:00
scrawl
c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 2013-11-05 03:02:28 +01:00
scrawl
e6960d915a Add simple Ogre widget 2013-11-02 02:51:38 +01:00
scrawl
2fb059e2fa Don't destroy the SDL window twice 2013-10-13 18:20:55 +02:00
Marc Zinnschlag
6f64b1b9db cmake option to use system tinyxml instead of embedded one 2013-09-13 15:11:17 +02:00
Marc Zinnschlag
b737d958e1 Merge remote-tracking branch 'kcat/master' 
Conflicts:
	extern/sdl4ogre/cursormanager.hpp
 2013-09-02 10:54:18 +02:00
Chris Robinson
1026e89810 Don't assume TexturePtr is a class 2013-08-29 17:41:20 -07:00
scrawl
f12d5b728a Ogre 1.9 compatibility changes 2013-08-29 17:14:25 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
scrawl
6dc216af3d Fix a typo, caused occasional white spots on local map render 2013-08-09 21:29:43 +02:00
Nikolay Kasyanov
e7500b22ba Fixed listener call issue spotted by @scrawl 2013-08-01 07:16:00 -07:00
Marc Zinnschlag
b8cd3f3915 Merge remote-tracking branch 'corristo/master' 2013-08-01 09:06:34 +02:00
Nikolay Kasyanov
3849c8488c Use SDL_False instead of -1 2013-08-01 10:54:53 +04:00
Nikolay Kasyanov
4e9ef31375 Added missing(?) break 2013-08-01 10:53:28 +04:00
Nikolay Kasyanov
98216544de screw tabs 2013-08-01 10:52:50 +04:00
Marc Zinnschlag
130141ecac Merge remote-tracking branch 'corristo/master' 2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
e552eccaa4 Fixed endless message loop after trying to resize window on OS X 2013-07-31 23:26:46 +04:00
Nikolay Kasyanov
66608d5c92 Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre 2013-07-31 22:30:52 +04:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
scrawl
50a0d16f8f Pass only the X11 window to Ogre, otherwise it would treat it as parentWindowHandle instead of externalWindowHandle. parentWindowHandle does not seem to play nice with SDL and occasionally crashes with a GLXBadDrawable error on startup. 2013-07-07 20:22:41 +02:00
scrawl
b16bc69479 Removed the no longer needed --debug switch 2013-06-16 20:39:40 +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
scrawl
88acebf808 Fix an uninitalized member, and also make sure the mouse is captured when OpenMW starts 2013-06-16 17:10:30 +02:00
scrawl
5252ffa104 More cleanup 2013-06-15 17:06:27 +02:00
scrawl
6958940131 Ignore repeated keystrokes, except for text input events 2013-06-15 16:15:45 +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
scrawl
4fb32f7f05 Moved window resize messages to sdlinputwrapper 2013-06-15 13:22:29 +02:00
scrawl
14a2a26a56 Fullscreen resizing fix 2013-06-12 20:08:55 +02:00
scrawl
403704b92a Use openmw.png for SDL_SetWindowIcon 2013-06-12 16:15:04 +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
scrawl
1e7cf4ae1c GLES2 experiment 2013-05-25 04:15:24 +02:00
scrawl
a54f8c7ee2 Removed an optimization that caused problems on 32 bit builds 2013-05-22 21:01:05 +02:00
scrawl
8845c0cee1 Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera. 2013-05-07 17:38:24 +02:00
scrawl
d6e9cb114e Forgot to add directory 2013-05-04 23:12:05 +02:00
scrawl
062ff189a2 Merge branch 'master' into memory 2013-05-04 23:04:33 +02:00
Lukasz Gromanowski
6fbd940a2f Fix warning issued by GCC 4.8 in oics/tinyxml.cpp 
Fix warning issued by GCC 4.8 (and as far I remember 4.7 too)
about not supported "%lf" format string:

openmw/extern/oics/tinyxml.cpp: In member function ‘void TiXmlAttribute::SetDoubleValue(double)’:
openmw/extern/oics/tinyxml.cpp:1269:50: warning: ISO C++98 does not support the ‘%lf’ gnu_printf format [-Wformat=]
   TIXML_SNPRINTF( buf, sizeof(buf), "%lf", _value);
                                                  ^

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-05-04 07:53:03 +02:00
scrawl
75dcf52552 Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made) 2013-05-03 13:55:57 +02:00
scrawl
23b477a938 Fix normal maps with spaces in filename not getting loaded 2013-04-12 04:36:28 +02:00
scrawl
5625d73d84 Bump texture support 2013-04-03 17:16:34 +02:00
scrawl
7f8d659f3c Fix transparency sorting 2013-03-05 17:09:20 +01:00
scrawl
62c711d709 Small change to delete microcode cache more aggressively. 2013-02-11 02:28:02 +01:00
scrawl
814969dcae Cache integrity check uses relative paths, so that changing the build folder works without reset 2013-02-07 02:23:41 +01:00
scrawl
a7d910614f extern/shiny update: made caching more robust 2013-02-04 18:04:09 +01:00
scrawl
bf037b7d29 Removed problematic ModVertexAlpha method, now done in shader 2013-02-04 18:03:03 +01:00
Jordan Milne
10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 2013-01-13 23:38:46 -04:00
Jordan Milne
043e29c620 Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble) 2013-01-13 21:32:45 -04:00
Jordan Milne
b6ec64485c fix includes for Windows 2013-01-12 17:52:26 -04:00
Jordan Milne
eb08f407d3 Oops, remove resource leak in the input wrapper. 2013-01-12 15:38:22 -04:00
Jordan Milne
5a6589af01 extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start 2013-01-12 11:57:29 -04:00
scrawl
d71b583855 fix const cast, fix comment 2013-01-11 22:25:34 +01:00
Jordan Milne
651a654985 clean up our cursors during destruction 2013-01-11 10:09:26 -04:00
Jordan Milne
eeacb04fe2 Fully working hardware cursors (if you compile SDL2 with XCursor support) 2013-01-11 09:32:29 -04:00
Jordan Milne
f9b064d1bc add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully 2013-01-11 08:27:59 -04:00
Jordan Milne
1117105039 fix compile error with boost includes 2013-01-11 00:37:04 -04:00
Jordan Milne
a030c03513 support the printscreen button properly 2013-01-10 23:53:19 -04:00
Jordan Milne
403b6756f5 remove dependency on boost::locale, use system mouse position in in-game menus 2013-01-10 23:29:51 -04:00
Jordan Milne
601d79ef3f fix the mouse wheel in mygui 2013-01-10 17:59:49 -04:00
Jordan Milne
ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 2013-01-10 17:21: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
f85679db93 Merge branch 'master' into sdl_input 2013-01-09 00:04:55 -04:00
Jordan Milne
00a2a5c358 remove some more of my mess 2013-01-08 21:04:36 -04:00
Jordan Milne
3b1d285cf3 fix compile errors, work with unmodified SDL 2013-01-08 21:01:58 -04:00
scrawl
e18cf452d4 Updated shiny again. Some recent changes were accidently overwritten by eduard on 12/30/2012 2013-01-08 13:24:40 +01:00
Jordan Milne
884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 2013-01-08 06:19:05 -04:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 2012-12-30 13:09:37 +01:00
scrawl
693eeabeca shiny: fix GLSL texture units when shaders were disabled 2012-11-19 13:55:26 +01:00
scrawl
7b35b82833 adding shiny 2012-11-06 19:09:44 +01:00
scrawl
fb3ac6ad4a no submodule 2012-11-06 19:08:15 +01:00
scrawl
94f2937c8f missed a warning 2012-10-09 19:28:10 +02:00
scrawl
d97184cd4d fixing some warnings 2012-10-09 17:48:44 +02:00
scrawl
1f087645a7 update shiny to auto-delete the corresponding cache if a shader was edited 2012-10-01 17:02:14 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
b516813b28 fix a problem with older boost versions 2012-09-09 15:08:11 +02:00
Marc Zinnschlag
21a8dc5ae7 silenced a completely pointless warning 2012-09-06 11:43:04 +02:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
Michael Mc Donnell
d7572d815e Do not define OIS_DYNAMIC_LIB in ICSPrerequisites.h 
Fixes http://bugs.openmw.org/issues/381
 2012-08-28 15:32:12 -04:00
scrawl
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +02:00
scrawl
6077965d27 fix the directx startup issue on windows 2012-07-26 23:09:46 +02:00
scrawl
d5384403f3 forgot something else 2012-07-23 15:46:18 +02:00
scrawl
5572421576 submodule update for "fix a typo" 2012-07-23 15:40:10 +02:00
scrawl
ac5bd38df9 some cmake fixes 2012-07-23 14:59:57 +02:00
scrawl
268987835d fix the crash 2012-07-23 12:19:53 +02:00
scrawl
f0b3142966 switch to glsl 1.2 2012-07-23 02:54:50 +02:00
scrawl
b2dcf5adcd support system install for boost wave 2012-07-22 14:41:23 +02:00
scrawl
6bfcf2bc1b - exchanged the preprocessor again, no warnings now 
- disable line directives for now, causing some trouble
 2012-07-22 02:45:39 +02:00
scrawl
21728020f6 fixed the water on local map 2012-07-20 14:45:42 +02:00
scrawl
9d7470e14c temp commit 2012-07-19 20:18:34 +02:00
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
scrawl
778e59ee37 terrain as it was before, with about 4x less code 2012-07-15 08:21:43 +02:00
scrawl
93c641efa7 terrain albedo 2012-07-14 18:25:43 +02:00
scrawl
16c2ea3a75 terrain colourmap 2012-07-14 11:13:38 +02:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
scrawl
b8384162b6 merge 2012-07-13 06:16:55 +02:00
scrawl
ad7383be43 sky 2012-07-11 09:08:55 +02:00
scrawl
b2313be6d7 submodule update 2012-07-11 04:31:33 +02:00
scrawl
865bfc6f47 sync mrt_output setting 2012-07-11 02:31:03 +02:00
scrawl
1a9f59d5d4 shadows 2012-07-10 00:07:33 +02:00
scrawl
07fd9986ef accidently removed the map. 2012-07-09 20:14:07 +02:00
scrawl
b803d0e949 converted shadow caster shader 2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a temp commit 2012-07-09 19:20:41 +02:00
scrawl
e517e75d09 update 2012-07-07 01:25:14 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
71c865e2e9 let there be light 2012-07-06 07:10:10 +02:00
scrawl
33c48b9481 update 2012-07-06 04:28:08 +02:00
scrawl
9bd888d9a1 transparency 2012-07-05 00:39:25 +02:00
scrawl
19ecc7f890 fix performance 2012-07-04 17:28:22 +02:00
scrawl
f8e3213996 fog, mrt depth 2012-07-04 16:57:14 +02:00
scrawl
a1e48b0feb builds now 2012-07-03 22:48:16 +02:00
scrawl
24399a45c1 add submodule with current code 2012-07-03 22:27:22 +02:00
scrawl
250fcab7c2 moved the mygui resources to a more suitable location 2012-03-22 17:11:24 +01:00
scrawl
6827aac42c fix all mygui.log warnings, fix journal 2012-03-22 17:02:02 +01:00
scrawl
75d5714fe0 TextEdit, TextBoxEdit, DispEdit fix more consistent 2012-03-22 16:45:27 +01:00
scrawl
d67ee8b511 console fix more consitent 2012-03-22 16:18:49 +01:00
scrawl
6b4a35667c fix window titles 2012-03-22 16:13:36 +01:00
scrawl
755e05e742 fixed ListBox selected item colour 2012-03-22 16:04:11 +01:00
scrawl
d1508f5a59 List -> ListBox 2012-03-22 15:28:06 +01:00
scrawl
560e702973 fixed scroll bars 2012-03-22 15:23:23 +01:00
scrawl
26aae9d2ce fix class name typo 2012-03-22 15:10:29 +01:00
scrawl
161d519206 fixed the dialogue history topic selection 2012-03-22 15:01:37 +01:00
scrawl
3b76f6dcf4 fixed console log 2012-03-22 13:44:39 +01:00
scrawl
43349eb539 fixed console command line 2012-03-22 13:34:02 +01:00
scrawl
ceea51fe9f fixed TextEdit, TextBoxEdit, DispositionEdit 2012-03-22 13:29:54 +01:00
scrawl
9933de7c6a Edit -> EditBox 2012-03-22 12:21:03 +01:00
scrawl
0af8591c03 Window_MinMax 2012-03-21 21:49:37 +01:00
scrawl
433a318abb colour -> textcolour 2012-03-21 19:31:56 +01:00
scrawl
37290d9638 fix text colours 2012-03-21 19:23:32 +01:00
scrawl
98f3192448 forgot to git add some stuff 2012-03-21 18:38:08 +01:00
scrawl
9b31b6272f fixed the mouse cursors and fixed MWAttribute & MWSkill 2012-03-21 16:07:56 +01:00
scrawl
2f662a226c replaced all the StaticText in layouts 2012-03-21 14:56:12 +01:00
scrawl
64212c0ee6 replaced all the StaticImage and StaticText in code 2012-03-21 14:54:02 +01:00
scrawl
99461765da restored another bunch of stuff 2012-03-21 14:00:24 +01:00
scrawl
0d56a55756 restored journal window background 2012-03-21 13:57:26 +01:00
scrawl
66baf9ec81 Merge branch 'master' into mygui 2012-03-20 20:02:30 +01:00
scrawl
3a00fbb950 removed mygui from source tree and use system install instead 2012-03-18 15:11:37 +01:00
Marc Zinnschlag
4bdfbb6d4f Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-03-05 11:34:06 +01:00
scrawl
694a537b57 - removed caelum sources, resources, build scripts 2012-02-21 00:14:20 +01:00
Marc Zinnschlag
d9945a976d Merge remote branch 'gus/DialogueSystem' into dialogue 2012-02-12 13:47:04 +01:00
gugus
abe38e5f87 Started to weire the dialogue manager and the dialogue GUI 2012-02-05 10:54:56 +01:00
Cris Mihalache
6d4fa9274e Moved OpenEngine systems into their appropriate classes 2012-01-29 17:31:18 +02:00
Marc Zinnschlag
e3631003e9 Merge remote branch 'yacoby/detailed_fps' 2012-01-17 14:04:00 +01:00
Jacob Essex
e73640e720 Improved code, added labels to the counter 2012-01-17 11:58:06 +00:00
gugus
edbf4f7bdc forgot to update core.xml 2012-01-16 19:35:35 +01:00
gugus
ba2fc27c2d oups forgot Cmake stuff 2012-01-16 18:10:16 +01:00
gugus
eb4dea3d87 Previous/Next button implemented 2012-01-16 17:46:25 +01:00
Jacob Essex
18e4b73a86 Added a more detailed fps counter displaying the triangle and batch count 2012-01-16 15:33:21 +00:00
gugus
9031f62962 The journal is now in the center of the screen. 2012-01-11 12:58:39 +01:00
gugus
0178e22605 correct CMake error 2011-12-26 18:36:15 +01:00
gugus
bc51ba5a38 Add the journal window (J key). It's still not in the right position. 2011-11-28 16:51:11 +01:00
Marc Zinnschlag
b157273cd9 Merge branch 'next' 
Conflicts:
	apps/openmw/main.cpp
 2011-07-31 19:28:12 +02:00
Lukasz Gromanowski
ac9b1715d5 Added new command line option: "encoding" 
Added new command line option: "encoding" which allow to
change font encoding used in game messages.

Currently there are three evailable encodings:

    win1250 - Central and Eastern European (languages
              that use Latin script, such as Polish,
              Czech, Slovak, Hungarian, Slovene, Bosnian,
              Croatian, Serbian (Latin script),
              Romanian and Albanian)

    win1251 - languages that use the Cyrillic alphabet
              such as Russian, Bulgarian, Serbian Cyrillic
              and others

    win1252 - Western European (Latin) - default

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-07-17 22:16:50 +02:00
Nikolay Kasyanov
b7c006b898 Mac: further fixes for new resource folder location 2011-06-26 21:15:29 +04:00
Sebastian Wick
23194a932f creating the buttons on the fly 2011-06-19 19:41:42 +02:00
Sebastian Wick
5db8e8c449 InterMessageBox game mode 2011-06-19 19:10:44 +02:00
Sebastian Wick
e77240dceb basics for InteractiveMessageBox 2011-06-18 15:50:41 +02:00
Sebastian Wick
d74f834735 make to boxes apear on the correct place even if the oldest is erased 2011-06-16 18:12:50 +02:00
Sebastian Wick
6dc35247da Word wrap for MessageBox 2011-06-15 19:42:20 +02:00
Sebastian Wick
fc25ccef4e MW_Dialog set ro right propertys 2011-06-14 22:11:36 +02:00
Sebastian Wick
aab07f379e added openmw_messagebox_layout.xml to CMakeLists.txt 2011-06-14 18:55:07 +02:00
Sebastian Wick
2d93705baa created xml file for the layout; MessageBox class 2011-06-14 18:25:07 +02:00
Nikolay Kasyanov
4e7a056e9e Now working mac app bundle generated during build 
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
 2011-03-27 23:28:46 +04:00
Nikolay Kasyanov
9ddd8e6bf7 README_Mac updated, removed dependency from uuid library on OS X 2011-03-10 11:25:16 +03:00
Ace
3b47eb4a69 Two quick fixes for building a windows x64 release 2011-02-27 14:53:45 +01:00