scrawl
bd8d793fec
Removing gamma correction due to caused inconsistencies.
2013-01-09 21:41:40 +01:00
scrawl
111e38ef25
Revert "fog now distance based instead of depth"
...
This reverts commit 7ee038fdd7
.
2013-01-09 20:18:26 +01:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +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
a6c3e06e54
fixed fog in some cells
2012-12-15 20:36:17 +01:00
scrawl
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
scrawl
44010974fc
workaround for HLSL error X4579
2012-12-10 12:34:28 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
scrawl
11a8d5d70a
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
2012-11-10 21:19:41 +01:00
scrawl
7c22690116
Merge branch 'next' into globalmap
2012-11-10 21:19:10 +01:00
scrawl
5fdc7ad809
forgot to add file
2012-11-10 13:07:26 +01:00
scrawl
ace9ee9c83
persuasion dialog
2012-11-09 20:18:38 +01:00
scrawl
38828acac9
transparent overlay
2012-11-04 12:13:04 +01:00
Marc Zinnschlag
648b53ef93
removed unused launcher.cfg file
2012-10-31 10:09:27 +01:00
scrawl
234716daa6
finished spell creation
2012-10-23 11:42:38 +02:00
scrawl
9f821e5df2
fix shaders
2012-10-22 16:56:43 +02:00
scrawl
0a19b56031
fix gold label
2012-10-17 18:49:49 +02:00
scrawl
e80394c0b5
fix training limit
2012-10-17 18:48:29 +02:00
scrawl
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
Lukasz Gromanowski
5e9153e2b8
Issue #423 : Wrong usage of "Version"
...
Remove "Version" line from openmw.desktop file (according to
http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
it's not required).
Fixes #423
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-10-16 23:16:14 +03:00
scrawl
f154031e54
last bits of the gui
2012-10-11 18:26:29 +02:00
gugus
1f4de03613
oooups
2012-10-06 22:33:10 +02:00
gugus
85d9357e3a
Travel GUI
2012-10-06 17:52:46 +02:00
scrawl
025e820703
abstracted code and use it in enchanting window as well
2012-10-03 15:36:10 +02:00
scrawl
1c0dd3ccc5
some editing code
2012-10-03 15:06:54 +02:00
scrawl
7ee038fdd7
fog now distance based instead of depth
2012-10-03 12:03:07 +02:00
scrawl
636f297f10
enchant
2012-09-28 16:52:42 +02:00
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
2012-09-27 08:47:47 +02:00
scrawl
73c69e8eda
video playback
2012-09-25 02:35:50 +02:00
scrawl
d393f551ed
edit effect dialog
2012-09-24 08:09:16 +02:00
scrawl
9d7c35ae48
and go
2012-09-23 00:36:20 +02:00
scrawl
f45a6b71a9
Merge branch 'master' into next
2012-09-22 20:48:55 +02:00
Marc Zinnschlag
63772e2301
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-22 18:27:51 +02:00
scrawl
dbf59d14dc
water gamma correction
2012-09-22 16:52:53 +02:00
Nikolay Kasyanov
8a81a4a334
Fixed typo on openmw.cfg that caused launcher crash on OS X
2012-09-22 13:03:58 +04:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
e5e3d829d0
player arrow & markers
2012-09-20 17:30:09 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-20 09:01:58 +02:00
scrawl
b9a3f8e8d7
gamma slider
2012-09-19 23:47:42 +02:00
scrawl
d9f6072f02
gamma correct rendering & adjustment setting
2012-09-19 23:25:07 +02:00
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
2012-09-19 19:34:02 +02:00
scrawl
bf5e30b24f
everything done except health/mana restore
2012-09-19 02:53:06 +02:00
scrawl
ab698bb401
date time label
2012-09-18 20:53:32 +02:00
scrawl
0ba996f290
dialog layout
2012-09-18 18:29:03 +02:00
scrawl
42d25c0af0
fix resources, I renamed those in the last commit, but only in one place
2012-09-16 20:56:49 +02:00
scrawl
76b494100e
finished?
2012-09-15 17:12:42 +02:00
scrawl
95f3a20e2c
Merge branch 'master' into levelup
2012-09-15 14:25:37 +02:00
scrawl
b76a28f69c
beginnings of the gui
2012-09-14 19:44:00 +02:00
scrawl
a308d2e38a
fixed exception, fixed armor label obscuring the items
2012-09-14 15:33:24 +02:00
scrawl
6ac2a12296
item selection working on the preview
2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0
race selection preview
2012-09-13 19:03:31 +02:00
scrawl
5155339cb6
character preview working
2012-09-13 14:56:50 +02:00
scrawl
4f3eb3c34a
character preview WIP
2012-09-13 00:54:32 +02:00
scrawl
a8d9aa98b1
some fixes
2012-09-11 19:18:26 +02:00
scrawl
369db182de
actual progress bar, performance optimization
2012-09-11 16:53:49 +02:00
scrawl
2b339f6c0f
loading screen
2012-09-11 16:37:54 +02:00
scrawl
ad66ebf84f
fix button align on 2 windows
2012-09-10 14:31:19 +02:00
scrawl
996e6280d8
more spell buying window cleanup
2012-09-10 14:10:01 +02:00
scrawl
ba0acd4056
changed some text colors
2012-09-10 13:52:37 +02:00
scrawl
fde69d0c87
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
2012-09-10 13:40:34 +02:00
scrawl
bc6a1979b0
replaced everything with the new method
2012-09-10 13:39:22 +02:00
Marc Zinnschlag
273ac0a97f
Merge branch 'spellbuying'
2012-09-10 13:16:02 +02:00
scrawl
b66c8099eb
new system for dynamic sizing of buttons & text boxes
2012-09-10 11:20:27 +02:00
scrawl
bb267dddf6
some stats window cleanup
2012-09-09 23:50:57 +02:00
Marc Zinnschlag
3fad1c0786
fixed a crash
2012-09-09 20:43:21 +02:00
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
2012-09-09 14:10:07 -04:00
Adam Hogan
ebf80943a9
Added spell buying window
2012-09-08 18:17:03 -04:00
Marc Zinnschlag
ef6f033dd1
Merge branch 'multidata'
2012-09-04 11:02:28 +02:00
Marc Zinnschlag
e2bf4694cb
Merge remote-tracking branch 'scrawl/master'
2012-08-31 09:22:32 +02:00
scrawl
ba43f2997f
fix missing character in font for french morrowind version, thanks to jvoisin
2012-08-30 22:08:30 +02:00
scrawl
dbe3cca828
added a separate core.xml file that works with the mygui layout editor
2012-08-29 13:11:06 +02:00
Marc Zinnschlag
4f411ff1eb
Merge remote-tracking branch 'scrawl/master'
2012-08-29 11:17:33 +02:00
scrawl
6ad08dfd33
added settings for crosshair & subtitles
2012-08-29 11:15:17 +02:00
scrawl
5370fecb6f
fix a small input focus issue with the map
2012-08-29 10:51:36 +02:00
scrawl
7eaf5e7f0f
changed the markers to look more like morrowind's (hover effect)
2012-08-28 18:40:11 +02:00
scrawl
5834b4baa5
door markers on the local map
2012-08-28 17:30:34 +02:00
scrawl
6161f81c24
last bits of the quick key menu.
2012-08-27 20:44:14 +02:00
scrawl
c5e55d3cac
fix screenshot function
2012-08-27 15:51:01 +02:00
scrawl
c0f27bd5ef
magic selection window
2012-08-26 11:37:33 +02:00
scrawl
fab4cfecb1
some unfinished work on quick keys window
2012-08-26 10:52:06 +02:00
scrawl
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-16 13:20:53 +02:00
Marc Zinnschlag
b0506e2220
re-enabling support for multiple data directories
2012-08-16 12:59:28 +02:00
Marc Zinnschlag
f9693ab33a
Merge remote-tracking branch 'scrawl/shadersystem'
2012-08-16 12:03:03 +02:00
scrawl
4ae0a5c02e
fix silhouettes around objects above the water
2012-08-15 19:29:00 +02:00
Pieter van der Kloet
9501e133f5
Updated the EB Garamond font to a higher-resolution version
2012-08-14 03:23:57 +02:00
scrawl
67577c6192
UI cursor & camera sensitivity sliders
2012-08-13 18:48:50 +02:00
scrawl
c7b8787c32
"reset to defaults" button, invert y axis button
2012-08-13 02:55:22 +02:00
scrawl
bc6e4feedc
hotkey window first version
2012-08-13 01:26:15 +02:00
scrawl
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
2012-08-12 22:59:58 +02:00
scrawl
86d6f190bf
Input system rewrite
2012-08-12 20:45:02 +02:00
scrawl
8ac2d11f56
changed shading to be more like MW (completely replace material ambient with vertex colors if present), fixes some too dark daedric ruins
2012-08-11 14:42:14 +02:00
scrawl
f58a4ada7a
Merge branch 'master' into shadersystem
2012-08-11 14:28:31 +02:00
scrawl
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
2012-08-10 15:15:48 +02:00
scrawl
993c7150dc
tweaked depth bias
2012-08-07 22:43:11 +02:00
scrawl
15a16aeba1
Fixed DirectX HLSL shaders and re-enabled them in the gui
2012-08-01 04:11:16 +02:00
scrawl
37c7becb07
some potential compability fixes
2012-07-25 23:53:06 +02:00
scrawl
3feb4ce61b
terrain lod morph fix
2012-07-25 19:33:21 +02:00
scrawl
8c8228a15c
fix terrain num lights setting
2012-07-24 00:08:53 +02:00
scrawl
3ebc6fd590
fixed a settings window bug
2012-07-23 20:50:56 +02:00
scrawl
a70f93b024
fix "Crash when running openmw with --start="XYZ", remove HLSL for windows
2012-07-23 20:12:42 +02:00
scrawl
9f9183ff73
depth bias
2012-07-23 18:25:20 +02:00
scrawl
bc7876e980
use alpha map for moons
2012-07-23 13:04:48 +02:00
scrawl
f0b3142966
switch to glsl 1.2
2012-07-23 02:54:50 +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
17a5c22c8f
don't use globbing
2012-07-20 23:31:49 +02:00
scrawl
acc5c3bbbf
some fixes
2012-07-20 17:08:15 +02:00
scrawl
41791ccaa2
add file
2012-07-20 16:44:40 +02:00
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
2012-07-20 16:44:03 +02:00
scrawl
21728020f6
fixed the water on local map
2012-07-20 14:45:42 +02:00
scrawl
f5ffea4d4b
new button, water timescale
2012-07-19 23:30:41 +02:00
scrawl
e077814a8c
water
2012-07-19 22:23:07 +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
29f91753f7
correction
2012-07-14 18:44:03 +02:00
scrawl
93c641efa7
terrain albedo
2012-07-14 18:25:43 +02:00
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
scrawl
16c2ea3a75
terrain colourmap
2012-07-14 11:13:38 +02:00
scrawl
1429c8d5cb
copy&paste mistake
2012-07-13 12:43:48 +02:00
scrawl
fb109ec7e2
use debug versions of ogre plugins in debug mode
2012-07-13 11:30:47 +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
cd6e9986b6
forgot to add files
2012-07-11 09:09:38 +02:00
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b
settings tab "shadows"
2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc
shader mode button in settingswindow
2012-07-11 03:19:51 +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
8e683c2e05
vertex colors
2012-07-05 01:38:33 +02:00
scrawl
9bd888d9a1
transparency
2012-07-05 00:39:25 +02:00
scrawl
f8e3213996
fog, mrt depth
2012-07-04 16:57:14 +02:00
scrawl
de9b7a51de
change glsl #version, remove CG from required libraries
2012-07-04 00:33:09 +02:00
scrawl
4ea6530772
hello world.
2012-07-04 00:26:57 +02:00
scrawl
d27863bf8e
rename layout files to .layout to get them recognized by layout editor
2012-07-03 11:34:20 +02:00
scrawl
246c6493df
Merge branch 'master' into graphics
2012-06-08 17:29:36 +02:00
scrawl
b886aea298
change console skin to MW_Window and set the selected object refID as window title
2012-06-02 12:31:23 +02:00
scrawl
fbaedd2c3a
new underwater colors
2012-05-30 16:20:35 +02:00
scrawl
298ae4f7f8
HUD icons for selected weapon / selected spell / selected enchanted item
2012-05-29 18:33:01 +02:00
scrawl
30461438f6
still left: spell success formula
2012-05-29 12:35:03 +02:00
scrawl
c7268233df
spell window layout & opening/closing/pinning logic
2012-05-29 09:02:22 +02:00
scrawl
1b561ce91f
Merge branch 'master' into next
2012-05-29 06:56:23 +02:00