krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
6813 commits 35 branches 0 tags 65 MiB
Commit graph

474 commits

Author SHA1 Message Date
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
scrawl
69e6bc6588 add water settings to settings window 2012-05-29 06:45:44 +02:00
scrawl
5d03e86613 added field of view and texture filtering to settings window 2012-05-29 04:54:54 +02:00
scrawl
6945afe95b alchemy window layout 2012-05-29 02:57:19 +02:00
scrawl
6014a90002 added tooltip delay option 2012-05-28 09:46:05 +02:00
scrawl
8f667580bb ogre 1.8 final release compability fixes 2012-05-27 23:12:45 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
63213b36bf Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind 2012-05-26 23:06:15 +02:00
scrawl
313a8e55b7 - Issue #296: Clicking on HUD elements shows/hides the respective window 
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
 2012-05-26 21:09:21 +02:00
scrawl
750259973e potion creating works, most of the values are bogus 2012-05-25 18:00:13 +02:00
scrawl
1df1b521a4 show the list of potion effects 2012-05-25 16:20:57 +02:00
scrawl
09c870ad68 first alchemy window layout (not pretty) 2012-05-25 12:58:28 +02:00
scrawl
51b8a76a68 merged by branches together, starting with alchemy window 
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
 2012-05-24 15:57:23 +02:00
scrawl
c2b818373e adjust tooltip skin, now is never transparent 2012-05-24 15:11:45 +02:00
scrawl
6ea7bdb224 vsync & fps buttons, sound volume apply fix 2012-05-24 11:50:48 +02:00
scrawl
9b94edd561 audio tab with volume sliders 2012-05-24 04:34:53 +02:00
scrawl
cb35f4d208 some unrelated gui cleanup 2012-05-24 03:50:02 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00
scrawl
656a8f1be9 working menu transparency slider 2012-05-23 01:32:36 +02:00
scrawl
972c035e97 TabControl skin, settings window categories 2012-05-22 23:35:05 +02:00
scrawl
313294c522 settings window (hotkey F2) which does nothing. Yay! 2012-05-22 21:40:42 +02:00
scrawl
343bbaf0fd integrated video settings in the settings file, the launcher is now useless 2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics' 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4 Merge branch 'master' into graphics 2012-05-21 09:50:46 +02:00
scrawl
b2d207130d vastly improved look of the GUI, skin background textures now use tiling instead of stretching 2012-05-21 08:14:22 +02:00
scrawl
1079bb2677 finished tooltips for everything in the stats window, some gui refactoring 2012-05-21 05:14:07 +02:00
scrawl
8ce4727424 skill tooltips 2012-05-21 01:58:11 +02:00
scrawl
6518eb7794 some cleanup 2012-05-20 22:55:14 +02:00
scrawl
1c7110fbf5 birthsign tooltip 2012-05-20 22:45:30 +02:00
scrawl
8d52ee27dc attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files 2012-05-20 22:06:54 +02:00
scrawl
4fb30544d4 more gui files cleanup 2012-05-19 16:00:00 +02:00
scrawl
7a4de0ed1d changed more gui stuff to use the new tag system 2012-05-19 15:32:32 +02:00
scrawl
7ef0ad4e39 show faction & birthsign in the stats window 2012-05-19 14:55:09 +02:00
scrawl
24ce88de2a working mygui tag replacement system for GMST strings 2012-05-19 14:19:21 +02:00
scrawl
41efea4c1d in the trade window, don't show items that the merchant has equipped. 2012-05-17 21:56:16 +02:00
scrawl
6ae642aa06 complete trade window layout 2012-05-17 21:15:48 +02:00
scrawl
4213b4370f trade window shows up and shows the vendor's inventory items. 2012-05-17 19:53:04 +02:00
scrawl
5da4da820e beginnings of trade window layout. 2012-05-17 17:15:44 +02:00
scrawl
0c1d06d9f7 added some trade window stuff, which does nothing yet. 2012-05-17 13:36:25 +02:00
scrawl
8cc49ae2b9 xml files update (layout tweak, added double quotation marks to font) 2012-05-17 12:55:48 +02:00
scrawl
b18ee198b4 use a raycast to determine where to place object, if distance is too far 
drop it on the ground
 2012-05-15 16:47:23 +02:00
scrawl
24a0fecd37 implemented item count selection dialog 2012-05-15 12:51:51 +02:00
scrawl
f300a5621c Merge branch 'master' into inventoryGUI 2012-05-13 17:45:57 +02:00
scrawl
a54e52586b fix for a potential directx problem 2012-05-13 12:17:07 +02:00
scrawl
3a93df8db4 dynamic inventory layout like morrowind 2012-05-13 11:25:35 +02:00
scrawl
78b06d0ebf inventory window pinning 2012-05-12 22:44:12 +02:00
scrawl
822e5fbe1e add indication which filter is selected 2012-05-12 22:00:15 +02:00
scrawl
0114bf948c revised filters 2012-05-12 21:28:04 +02:00
scrawl
1abf70692c added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug 2012-05-12 18:24:47 +02:00
scrawl
ed6ff0a94a cleanup 3 2012-05-12 13:12:37 +02:00
scrawl
3a6fde5039 cleanup 2 2012-05-11 16:58:07 +02:00
scrawl
a1b86acc38 Merge branch 'master' into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
 2012-05-11 16:41:27 +02:00
gugus
8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
 2012-05-11 10:40:40 +02:00
scrawl
a99f74702e workaround for a white square that appears in menubook_next texture 2012-05-11 09:57:43 +02:00
scrawl
1f1edea6af make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar 2012-05-11 08:45:03 +02:00
scrawl
65ccfba191 resize both the left and the right pane of the stats window 2012-05-11 08:15:22 +02:00
scrawl
8a9e05a96b display text on the book window 2012-05-10 11:03:27 +02:00
scrawl
d69501b061 change daedric font to .zip resource 2012-05-09 02:16:10 +02:00
scrawl
cd351ba3af simple scroll text parsing (tags are ignored until now) 2012-05-08 00:39:52 +02:00
scrawl
9dd53b32b8 added daedric font for magic scrolls 2012-05-07 02:00:31 +02:00
scrawl
f20d4eeb41 Bug #281 , openmw.font.xml update 2012-05-05 01:44:51 +02:00
scrawl
499dd26398 dialogue window topic list word-wrapping 2012-05-04 23:53:50 +02:00
scrawl
a3d99767f7 next & prev button mouseover 2012-05-04 19:11:32 +02:00
scrawl
c125fba9d2 button mouse-over image change working 2012-05-04 18:44:46 +02:00
scrawl
a4d6d1baff added a utility for creating texture atlas at runtime 2012-05-04 18:09:45 +02:00
scrawl
5028a83d11 fix stats window layout resizing 2012-05-03 07:03:04 +02:00
scrawl
0e6b82284f book & scroll windows 2012-05-03 03:33:33 +02:00
scrawl
f733382f74 tooltip now contains info about item enchantment 2012-04-30 00:57:41 +02:00
scrawl
397a978145 DispositionEdit tweaks 2012-04-29 18:57:26 +02:00
scrawl
cca39978d4 changed messagebox text colors 2012-04-29 17:46:09 +02:00
scrawl
50d79a8815 Merge branch 'next' into tooltips 2012-04-29 17:30:34 +02:00
gugus
5603cb312c Objects can now be selected and follow mouse movements. 2012-04-27 20:54:39 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +02:00
scrawl
e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2012-04-24 00:54:35 +02:00
gugus
25432d97d2 trying to get selected item. Doesn't work. 2012-04-21 20:35:45 +02:00
Alexander "Ace" Olofsson
f7a03b39c4 Some improvments for windows builds and installer 2012-04-19 14:58:27 +02:00
scrawl
4889902b98 magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects 2012-04-18 21:18:53 +02:00
pchan3
215d4e1739 Made adjustments to keep container window within the viewscreen. 2012-04-18 23:09:13 +10:00
scrawl
51a76eda92 Merge branch 'master' into graphics 2012-04-18 01:09:55 +02:00
scrawl
1de1b3e40e Merge branch 'master' into tooltips 2012-04-17 15:57:08 +02:00
scrawl
13b67faf2f adding more safety checks 2012-04-16 20:39:41 +02:00
scrawl
f1b80c6ff7 fixed text input box 2012-04-16 19:23:24 +02:00
scrawl
cfa37b0e77 fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text 2012-04-16 19:14:05 +02:00
scrawl
b3dc1931a9 general GUI refactoring, part 1 2012-04-16 15:48:01 +02:00