mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 20:49:56 +00:00
Code Issues Releases Wiki Activity
16036 commits 38 branches 54 tags 122 MiB
Commit graph

1022 commits

Author SHA1 Message Date
scrawl
e42cb8020e Change all skins to get font colors from fallback settings (Fixes #704) 2014-09-20 10:40:09 +02:00
MiroslavR
4f89c3e77a Rework book formatter (Fixes #1148) 2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe Merge remote-tracking branch 'scrawl/master' 2014-09-19 15:59:59 +02:00
scrawl
9c0649c11d Add basic framework to retrieve font colors from fallback settings (Feature #704) 2014-09-19 11:53:35 +02:00
scrawl
e94268b4e6 Remove some garbage 2014-09-19 10:54:43 +02:00
scrawl
cbc242d857 Move item count text to ItemWidget 2014-09-19 09:29:00 +02:00
scrawl
c5fa0768f1 Fix broken minimum track size for scrollbars 2014-09-14 10:23:23 +02:00
scrawl
413bad2dc6 Fix a MyGUI warning 2014-09-14 09:40:34 +02:00
Marc Zinnschlag
5dd424b6c6 Merge remote-tracking branch 'cc9cii/Bug-No-1655' 2014-09-11 14:14:02 +02:00
scrawl
36a90198e2 Add option to change screenshot image format 2014-09-11 04:32:31 +02:00
cc9cii
6d12374ace Move windows platform specific files into a common directory. 2014-09-05 22:36:33 +10:00
cc9cii
fa0b3eb298 Add an icon to opencs.exe as well 2014-09-05 20:30:50 +10:00
Marc Zinnschlag
86995adc4a Merge remote-tracking branch 'cc9cii/Bug-No-1655' 2014-09-05 09:00:12 +02:00
cc9cii
e0e561a105 Add icon to windows exe 2014-09-05 07:17:31 +10:00
MiroslavR
386bb98fd2 Do not attach coin widgets to a box 2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09 Fix broken coin placement in levelup dialog + possible memleak 2014-09-02 22:06:02 +02:00
MiroslavR
98e7ab1b79 Add missing tooltips to enchant dialog 2014-09-01 03:40:11 +02:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
MiroslavR
fc21d898f2 Add hand-to-hand tooltip 2014-08-25 03:15:28 +02:00
MiroslavR
e8a245bea3 Enchanting dialog: follow vanilla behavior more closely 2014-08-24 16:41:17 +02:00
MiroslavR
e2f15181f9 Make the "Choose an Attribute" text centered 2014-08-24 16:36:19 +02:00
scrawl
e9e7e96c5f SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation) 2014-08-23 16:18:46 +02:00
scrawl
0a9a0a3b14 Slightly improve count dialog layout 2014-08-16 17:11:57 +02:00
MiroslavR
063b40a0ee Correct tooltip for maxed out skills 2014-08-16 13:30:49 +02:00
scrawl
44b517f66d Implement hiding inventory windows by double click on caption (Fixes #1690) 2014-08-06 20:13:58 +02:00
Marc Zinnschlag
33c36bf0df Merge remote-tracking branch 'scrawl/master' 2014-08-03 22:23:48 +02:00
scrawl
6cb9382bf0 Adjust screen-sized widgets automatically using Stretch align 2014-08-01 17:15:28 +02:00
scrawl
a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 2014-08-01 16:25:41 +02:00
Marc Zinnschlag
7a5f73de9e added navigation mode icons to buttons 2014-07-30 17:02:23 +02:00
Marc Zinnschlag
bb741eb8d7 Merge remote-tracking branch 'crysthala/master' 2014-07-30 16:49:27 +02:00
crysthala
f25e0b13b2 render window controls icons 
eyeball dude: first person
flying eye: free cam
orbit2: orbiting cam
 2014-07-30 07:55:21 -05:00
Marc Zinnschlag
7991dfb907 Merge remote-tracking branch 'scrawl/master' 2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
scrawl
fdc6dd6985 Shader compatibility fixes for GLSL ES 2014-07-27 20:33:44 +02:00
Marc Zinnschlag
5e543ac806 added script doortestwarp to blacklist 2014-07-25 11:53:30 +02:00
Marc Zinnschlag
4421e7a5cc added lighting mode toolbar icons 2014-07-25 11:15:04 +02:00
Marc Zinnschlag
151ef14b67 some cleanup 2014-07-25 11:10:12 +02:00
Marc Zinnschlag
358c76a049 Merge remote-tracking branch 'crysthala/master' 2014-07-24 22:29:29 +02:00
crysthala
919632a505 render lighting icons 2014-07-24 13:12:44 -05:00
scrawl
469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwgui/levelupdialog.cpp
 2014-07-24 02:33:46 +02:00
Marc Zinnschlag
f55084463b added MockChangeScript to script blacklist 2014-07-23 12:35:15 +02:00
scrawl
038a811f16 Rename travel window Ok button to Cancel (Fixes #1676) 2014-07-21 23:44:33 +02:00
MiroslavR
3b67e9b329 Rework level up dialog to behave more like vanilla 2014-07-21 20:56:02 +02:00
Marc Zinnschlag
d87630b41a blacklisting for scripts in OpenMW 2014-07-21 09:34:10 +02:00
scrawl
28a0899d2b Implement difficulty scaling (Fixes #1505) 2014-07-20 16:38:20 +02:00
scrawl
07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 2014-06-27 03:22:00 +02:00
scrawl
44fd526c98 Don't show disposition bar for creatures 2014-06-26 15:36:19 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
scrawl
8eab3abb15 Fix initial view offset for large world maps (Fixes #1523) 2014-06-19 19:03:12 +02:00
Marc Zinnschlag
30f8e279ed Merge remote-tracking branch 'scrawl/master' 2014-06-19 10:35:28 +02:00
scrawl
5645c9185b Fix location of local data path 2014-06-18 17:18:48 +02:00
scrawl
224163e5a2 Fix console text becoming unreadable when selected (Fixes #1530) 2014-06-18 16:57:54 +02:00
scrawl
d4678a8d55 Fix level up dialogue layout (Fixes #1393) 2014-06-18 16:57:53 +02:00
scrawl
cb6f1d3a52 Fix wait dialog arrow button step (Fixes #1524) 2014-06-17 14:58:11 +02:00
Marc Zinnschlag
2683aa9503 Merge remote-tracking branch 'filkry/bug640_luminescent_water' 2014-06-17 13:08:06 +02:00
Fil Krynicki
cfea7736d9 WIP fix 
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
 2014-06-16 17:08:02 -04:00
scrawl
5f5c0c5bff Remove an unused setting 2014-06-16 03:29:02 +02:00
scrawl
468db7a9c4 Remove terrain limit warning text that no longer applies 2014-06-16 03:16:50 +02:00
scrawl
311acfa8ff Add delete button to save load menu (Fixes #1453) 2014-06-10 02:27:38 +02:00
scrawl
cdd53862cb Increase width of dialogue topic list (Fixes #1440) 2014-06-08 23:15:50 +02:00
scrawl
a3752da79f Store Always Run control state in settings 2014-06-08 19:50:39 +02:00
scrawl
6db936bb3a Refactor item icon code into ItemWidget (Fixes #1391) 
- Removed duplicate code
 - Fixed missing magic backgrounds during item drag&drop
 - Change background texture used for HUD icons
 2014-06-05 22:13:18 +02:00
scrawl
d7f3cd75ac Rewrite journal GUI topic list to use MWList 2014-06-03 16:04:18 +02:00
scrawl
bbc5b125ab Rewrite journal GUI quest index 
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
 - Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
 - Fixes a bug where the quest index would not be updated when opened.
 2014-06-03 00:28:33 +02:00
scrawl
5df9ff8e2c Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg 
Fixes installing to /usr/local (Bug #1378)
 2014-06-01 23:32:05 +02:00
scrawl
a1bdf20958 Make trade balance label editable 2014-05-31 13:53:36 +02:00
scrawl
d26f756c53 Fix several edit boxes not receiving mouse input 2014-05-30 14:52:47 +02:00
pvdk
2a6a26c0d0 Minor fixes 2014-05-29 21:02:06 +02:00
pvdk
38d825b004 Merge remote-tracking branch 'upstream/master' into wizard 
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
 2014-05-29 16:42:16 +02:00
scrawl
3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
scrawl
0fe0dc33a6 Fixes #1338: Bring back a label that got lost 2014-05-19 05:35:16 +02:00
scrawl
15368188dc Fix sliders in effect editor not being precisely movable 2014-05-17 02:54:51 +02:00
scrawl
f01c3e0eac Fixes #1037: Change default footstep volume to match vanilla 2014-05-13 19:38:28 +02:00
scrawl
3ad28ec5aa Set a proper Page size for all scrollbars. Fixes scrollbars only moving very slowly when interacting with them (as opposed to using mousewheel on the content) 2014-05-11 00:09:02 +02:00
scrawl
6e9458c076 Small fix for dropping items from inventory 
Some widgets prevented clicking through
 2014-05-08 21:04:11 +02:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
graffy76
475214ab62 Implmented QSettings for loading / saving file definitions. Also 
renamed opencs.cfg to opencs.ini to follow Ini format standards
 2014-05-05 05:56:03 -05:00
scrawl
58d868d56a Change default water setting (current fps is low enough as it is without this setting enabled) 2014-05-02 19:16:10 +02:00
scrawl
6f7fbc867f Fix several leaks 2014-05-01 16:55:15 +02:00
Marc Zinnschlag
3013c34d9b Merge remote-tracking branch 'scrawl/master' 2014-04-28 21:46:05 +02:00
Lars Söderberg
d530bbe5cd Implemented Scrawls alternative workaround. 2014-04-28 18:52:53 +02:00
scrawl
a35f7c73ae Fixes #1286 (Dialogue topic list clips with window frame) 
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
 2014-04-28 18:40:29 +02:00
Lars Söderberg
0513d0837c Alignment tweaks and autosized buttons workaround 2014-04-28 17:54:55 +02:00
Lars Söderberg
04e5b9c72c Right aligned version/revision 
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.

Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.

Comments?
 2014-04-28 16:23:07 +02:00
Lars Söderberg
b0bdd233ee Center, switch and change text for confirmation buttons 
The confirmation buttons for quitting or starting a new game were
driving me crazy by not being ok left and cancel right, as e.g. vanilla
is.

Then I noticed the text isn't the same as in vanilla either. It should
be yes/no, not ok/cancel.

To make it even more authentic I also centered the buttons. Had to
remove autosized buttons for this. I think it looks fine still.

Comments?
 2014-04-28 16:05:27 +02:00
scrawl
138fb4e29a Bug #1265: Fixed confirmation buttons align 2014-04-28 12:51:46 +02:00
scrawl
4555f6ddf6 Add text shadow to progress bar labels 2014-04-28 11:19:12 +02:00
scrawl
dac0b7090a Get rid of bigbars.png and smallbars.png 
Changed loading bar colour to match vanilla
 2014-04-27 09:43:48 +02:00
scrawl
14757a856b Tweak settings window size and encumbrance bar text align 2014-04-27 08:17:14 +02:00
scrawl
dd14dec8dc Tweak loading screen progress bar positioning to match vanilla 2014-04-27 08:16:35 +02:00
Thomas
a598060071 Added autosave on rest, as well as an option in the settings menu 2014-04-23 23:12:30 -04:00
pvdk
aa07a33906 Fixed most of the memory leaks and started working on correctly exiting the thread 2014-04-18 13:17:37 +02:00
pvdk
a2c129f655 Merge remote-tracking branch 'upstream/master' into wizard 2014-04-16 16:57:53 +02:00
pvdk
21c406316f Working on the Settings tab: start the importer/wizard 2014-04-16 16:54:55 +02:00
pvdk
cfe66abbc5 Started working on the settings tab 2014-03-30 23:57:30 +02:00
pvdk
bf6103a3a4 Merge branch 'wizardtab' into wizard 
Conflicts:
	files/ui/mainwindow.ui
 2014-03-30 23:16:48 +02:00
scrawl
f5810b8e1c Consider aspect ratio for loading screen background 
More consistent with the main menu.
 2014-03-30 23:07:49 +02:00
pvdk
ef38fae09d Merge remote-tracking branch 'upstream/master' into wizard 2014-03-29 11:56:35 +01:00
scrawl
f2cd37edd0 Play company logo movie 2014-03-27 19:51:48 +01:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28 Add proper main menu (background image, logo animation, title music) 2014-03-27 15:25:01 +01:00
scrawl
0e78ffe8c0 Add option to disable SDL's "minimize on focus loss" in fullscreen 2014-03-27 00:10:46 +01:00
scrawl
0a17245633 Refactored settings window 2014-03-22 19:02:14 +01:00
Marek Kochanowicz
5c34823bb0 added some placeholder icons 2014-03-20 13:59:00 +01:00
Marek Kochanowicz
f3475f7ef5 Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog 2014-03-18 19:24:10 +01:00
pvdk
9e5e19f9cb Improved existing installation handling 2014-03-17 18:28:05 +01:00
pvdk
ae5f783a16 Added some eye-candy to the wizard: a watermark and a placeholder icon 2014-03-17 17:50:51 +01:00
Marek Kochanowicz
09ba547630 use tool buttons with icons 2014-03-17 15:35:36 +01:00
pvdk
8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 2014-03-16 20:05:12 +01:00
scrawl
cd0c283795 Add text shadow to version text for better readability 2014-03-15 15:14:59 +01:00
Gašper Sedej
06e02ed77f Added version and revision number to mainmenu 2014-03-12 10:53:56 +01:00
pvdk
3792b301e9 Wizard now runs the ini-importer to import settings from Morrowind.ini 2014-02-25 15:33:30 +01:00
pvdk
e8170adde5 Some minor changes, implemented suggestions 2014-02-19 19:26:50 +01:00
pvdk
c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
 2014-02-19 19:26:07 +01:00
Marek Kochanowicz
2afe3f3e57 Introduced multitype icon. 2014-02-13 19:00:35 +01:00
scrawl
975f0e05b4 Fixes #1157 (attribute layout issue) 2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc Fixes #1158 (Armor rating label issues) 2014-02-05 05:18:10 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
 2014-02-01 18:16:32 +01:00
scrawl
292d692b40 Loosen window size restrictions 2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d Use GMSTs for levelup 2014-01-29 15:37:26 +01:00
pvdk
1262eab03a Added some nice error messages to the installation process 2014-01-28 01:03:47 +01:00
pvdk
802448b217 Added a settings page to the launcher 2014-01-27 20:14:02 +01:00
pvdk
cdbf5c68b0 Implemented selection of installation media and added forgotten file 2014-01-24 22:25:22 +01:00
scrawl
03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-24 18:28:35 +01:00
pvdk
fa186f5ec1 Added version information to the launcher 2014-01-22 17:51:10 +01:00
pvdk
0f7f3391f7 WIP: Working on the installation of addons 2014-01-17 13:21:44 +01:00
Marc Zinnschlag
671d0e46e2 Merge remote-tracking branch 'nobrakal/patch-1' 2014-01-16 12:18:54 +01:00
nobrakal
e638b8b8cb Update openmw.desktop 
Fix bad output of desktop-file-validate for openmw.dektop
 2014-01-16 08:44:56 +01:00
nobrakal
278876d6fb Update opencs.desktop 
Fix bad output of desktop-file-validate for opencs.dektop
 2014-01-16 08:41:29 +01:00
scrawl
c64dc2c831 Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha. 2014-01-11 00:51:03 +01:00
scrawl
2744cde40f Use a few additional GMSTs 2014-01-10 22:27:31 +01:00
scrawl
d7f69205f6 Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes 2014-01-09 00:06:24 +01:00
scrawl
d97615d5d8 Support separate specular maps 2014-01-07 18:05:44 +01:00
scrawl
780bf5a2cd Implement pickpocket detection. Play a voiced dialogue entry when detected. 2014-01-07 03:01:33 +01:00
scrawl
62774fcc4a Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
 2014-01-06 00:23:17 +01:00
scrawl
af3569665c Remove unused font 2014-01-04 05:19:08 +01:00
scrawl
1b96c5d266 Console improvements: Show scrollbar, allow copying text from the history 2014-01-04 05:13:53 +01:00
scrawl
94cdc1efd2 Enable mipmap generator for 1.9+ 2013-12-31 00:54:40 +01:00
scrawl
04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 2013-12-29 00:58:48 +01:00
scrawl
27b45dd3cd Remove unused input 2013-12-28 16:34:32 +01:00
scrawl
e68e2f82a2 Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty. 2013-12-26 20:53:51 +01:00
scrawl
0050e6e67b Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture. 2013-12-26 20:53:51 +01:00
scrawl
74e902330f Fix a terrain shader issue 2013-12-26 20:53:51 +01:00
pvdk
40486370d9 Working on the Unshield functionality 2013-12-25 18:52:34 +01:00
pvdk
3a37761d76 Some minor cleanups 2013-12-24 23:47:04 +01:00
pvdk
445f96434e Added Morrowind.ini detection logic 2013-12-24 23:09:31 +01:00
scrawl
6a3eb3b355 Better way of reversing layer UV. 2013-12-19 01:31:12 +01:00
pvdk
30710bad70 Modified components widget so the checked items can be stored for all pages to access 2013-12-15 15:13:49 +01:00
pvdk
c82f0ec35f Implemented the language selection page 2013-12-13 15:30:49 +01:00
pvdk
d7f9604140 WIP: Working on the installation selection and added the ui for the language page 2013-12-13 13:38:49 +01:00
scrawl
37a7ee8fcd Set alpha value of character animations according to Invisibility / Chameleon effects. 2013-12-08 23:05:21 +01:00
pvdk
8162f8370b Added all the pages to the wizard 2013-12-08 21:35:57 +01:00
pvdk
f458f0c6c1 Added the Wizard .ui/resource files and some basic source to get started 2013-12-07 23:17:50 +01:00
scrawl
742e0e014d Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline. 2013-12-07 14:15:51 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
scrawl
062ea627b3 Add parallax mapping for objects 2013-12-05 15:51:07 +01:00
scrawl
69c0bb1723 Add normal, specular & parallax mapping for terrain 2013-12-05 15:51:01 +01:00
scrawl
f695deb29d Remember window positions 2013-12-05 15:46:23 +01:00
scrawl
5f1878eb54 Add specular mapping (uses alpha channel of diffuse texture) 2013-12-03 18:41:45 +01:00
scrawl
147bc447a5 Add specular lighting for directional light to objects shader 2013-12-03 16:07:07 +01:00
Marc Zinnschlag
04b1657d98 Merge branch 'openmw-27' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
 2013-11-30 09:45:41 +01:00
Marc Zinnschlag
eea433f141 restore last played character selection across sessions 2013-11-26 10:37:58 +01:00
scrawl
bda28e2ed0 Increase size of item selection dialog 2013-11-26 06:42:37 +01:00
scrawl
2e87cbc231 Add basic functionality to SaveGameDialog 2013-11-21 20:34:34 +01:00
Bret Curtis
862f2f0883 added keywords for debian and switch to dyn libs in travis 2013-11-20 10:16:51 +01:00
scrawl
3452bd2e0b Add glow effect for enchanted items 2013-11-20 00:13:12 +01:00
scrawl
cab535dd69 Implement magic item recharging via soulgem use 2013-11-19 06:48:47 +01:00
Lars Söderberg
35434dc053 German fixes 
Fixes for German language.
 2013-11-16 23:15:51 +01:00
Nikolay Kasyanov
df5b52b45b OpenCS.app icon & bundle properties 2013-11-10 20:11:53 +04:00
Marc Zinnschlag
fb417f9880 Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27 2013-11-07 09:19:55 +01:00
Marc Zinnschlag
d85360e7fd Merge remote-tracking branch 'scrawl/ui' 2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 2013-11-06 10:21:25 +01:00
scrawl
bf5529819d Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog. 2013-11-05 19:50:24 +01:00
scrawl
3a827d9c12 Deleted Obliviontt.zip 2013-11-05 00:32:06 +01:00
Marc Zinnschlag
dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
Alex "rainChu" Haddad
23eaf90846 Breath meter flashes when drowning 2013-10-27 04:05:01 -04:00
graffy76
9b483c3ae3 Fix for file path issues 2013-10-26 22:55:44 -05:00
graffy76
9ce4a04a2d merge from saving 
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
 2013-10-25 14:44:22 -05:00
graffy76
16d87ea1d1 Merge branch 'master' into esxSelector 2013-10-25 08:11:24 -05:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
Marc Zinnschlag
fdba029566 Merge remote-tracking branch 'sirherrbatka/filters' into saving 2013-10-21 18:59:12 +02:00
Marek Kochanowicz
ce2c558257 Missed a file. 2013-10-21 18:40:20 +02:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b138533bf3 renamed defaultfilter.omwaddon.project to defaultfilters. 2013-10-20 17:21:09 +02:00
Marek Kochanowicz
96b6787255 Getting rid of extension. Correcting tiny mistake in filters file. 2013-10-20 10:56:27 +02:00
Marek Kochanowicz
cafea438bd Added missing light filter. 2013-10-20 09:44:10 +02:00
Marek Kochanowicz
762cbf6278 Changed gauntlets filter. It showes now both gauntlets and bracers. 2013-10-19 18:51:36 +02:00
scrawl
3a3f2a37c8 Add cut, copy & paste of text 2013-10-17 12:47:49 +02:00
graffy76
17950210fa Merge branch 'master' into esxSelector 2013-10-07 06:52:20 -05:00
graffy76
217a4d75b4 Implemented profile function in launcher datafiles page 
Implemented dependency sorting to ensure dependent files appear latest
in the list.
 2013-10-06 21:13:47 -05:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 2013-10-01 21:29:45 -05:00
Marek Kochanowicz
ae5e8b95ff Solving Issue912 2013-09-23 20:12:04 +02:00
graffy76
513f0c4b3e Implemented file/adjuster widgets into new addon creation dialog 2013-09-22 23:52:53 -05:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d Merge branch 'master' into esxSelector 2013-09-19 16:24:28 -05:00
graffy76
244e581952 Finished implementing drag / drop 
refactored datafilesmodel (now contentmodel)
refactored esmfil
 2013-09-19 06:53:09 -05:00
Marc Zinnschlag
2dc3c0ae4f integrated startup icons 2013-09-09 09:41:43 +02:00
sirherrbatka
7ecf020fcb Merge pull request #1 from zinnschlag/master 
Icons for startup window.
 2013-09-08 11:14:41 -07:00
Marek Kochanowicz
294bf6c194 Icons for startup window (check raster/startup). 2013-09-08 12:09:36 +02:00
graffy76
a6e7cf9a8c Implementing drag and drop 2013-09-07 15:57:40 -05:00
Marc Zinnschlag
5a792b10b9 fixed local openmw.cfg file 2013-09-07 09:30:40 +02:00
Lars Söderberg
f4e9199f78 Various chargen tweaks 2013-08-29 16:21:11 +02:00
scrawl
e5ce94c336 Fix the water being affected by fog on the map 2013-08-27 16:45:51 +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
Marek Kochanowicz
3e174df856 Adding nomadic1 icons. Wooho! 2013-08-27 14:49:29 +02:00
Marc Zinnschlag
fb7273e14a Merge remote-tracking branch 'sirherrbatka/icons-svg' 
Conflicts:
	.gitignore
 2013-08-26 14:52:26 +02:00
Marek Kochanowicz
8cd2d89e4e Merge branch 'icons-svg' of https://github.com/sirherrbatka/openmw into icons-svg 2013-08-26 10:14:35 +02:00
Marek Kochanowicz
44b4c642b7 Added alternative book icon in scalable folder. No raster just yet. I'm not sure if it will replace old icon. 2013-08-26 10:12:43 +02:00
Lars Söderberg
45083fc89e Chargen updates 2013-08-25 23:15:29 +02:00
Lars Söderberg
e33239eae5 Various fixes 2013-08-25 23:15:20 +02:00
sirherrbatka
c57fb4fc4f Delete .directory 2013-08-24 19:20:12 +02:00
Marek Kochanowicz
717e04cac5 More icons. At last! 2013-08-23 12:48:34 +02:00
scrawl
5f7e6f7b10 Fix a material issue, layers per pass wasn't entirely correct 2013-08-21 17:26:11 +02:00
graffy76
6898321676 Reenabling features 
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
 2013-08-20 08:16:56 -05:00
scrawl
ecf7786d11 terrain_num_lights was removed 2013-08-20 12:31:47 +02:00
graffy76
b52645bf2a Fixes to accommodate master/plugin loading 2013-08-20 03:23:32 -05:00
scrawl
8c8653160d Crash fix, material fix 2013-08-20 09:52:27 +02:00
scrawl
ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed New terrain renderer - improvements: 
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
 2013-08-19 20:34:20 +02:00
graffy76
e614ec3353 Fixing profile code in progress... 2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05:00
graffy76
45277c0082 Minor changes 
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
 2013-08-18 09:34:33 -05:00
graffy76
66e50343ad Fixed row-selection/check feature 2013-08-18 08:54:51 -05:00
graffy76
a9db983233 Fixing row-click selection 2013-08-18 07:29:48 -05:00
graffy76
2878f51cd3 Reimplemented dependency selection feature 
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
 2013-08-17 19:40:28 -05:00
graffy76
49c4e1bf9e Removed master table widget 2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a Implemented combobox for game file selection 2013-08-16 18:00:23 -05:00
Lars Söderberg
317d565133 Larger area for window corner diagonal arrows 2013-08-10 08:15:58 +02:00
Lars Söderberg
5b060ffe8d Varios standardizations, fixes and optimizations 2013-08-09 23:21:25 +02:00
Lars Söderberg
73fb682718 Made the alchemy window resizable 2013-08-09 23:20:51 +02:00
Lars Söderberg
0fabf1fe2e Updated Alchemy Window 2013-08-08 01:47:19 +02:00
Lars Söderberg
f7ed2ef55f Standardize align values 
Updates all align attributes, so all layout files uses the same (new)
system plus fixes a couple of misspellings.
 2013-08-07 21:43:19 +02:00
PLkolek
8f4506f5b6 Implemented drowning. 
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
 2013-08-07 16:46:46 +02:00
scrawl
726c93c365 Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10 2013-08-07 01:34:17 +02:00
Emanuel Guevel
add3bb9904 Add sneaking indicator UI widget 2013-08-03 02:40:01 +02:00
Lars Söderberg
f6f5867256 Fixes the FPS bar 2013-07-31 19:28:11 +02:00
Marc Zinnschlag
0923306404 fixed data-local path 2013-07-31 13:55:56 +02:00
scrawl
3961c276b8 Added enemy health meter 2013-07-30 06:00:20 +02: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
Marc Zinnschlag
b57042cac3 Merge remote-tracking branch 'scrawl/master' 2013-07-13 20:52:30 +02:00
scrawl
d6faad3dd2 Same fix for the book window 2013-07-13 20:26:35 +02:00
scrawl
4a562b585c Fix journal window with background image != 512x256 2013-07-13 20:24:19 +02:00
Marc Zinnschlag
b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 
Conflicts:
	apps/opencs/view/world/table.cpp
 2013-07-11 09:09:52 +02:00
graffy76
bb049806df Repo permissions commit fix #2 2013-07-10 21:13:59 -05:00
graffy76
f31e5ef851 new files (repo commit fix #2) 2013-07-10 17:30:21 -05: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
e3d8bdbafe autorepeat scrollbar 2013-07-02 17:29:47 +02:00
Marc Zinnschlag
12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 2013-06-26 09:48:51 +02:00
graffy76
8f4fd8202e Deleted ".directory" text files. 
Files were hidden files added by dolphin.
 2013-06-23 21:28:58 -05:00
Sebastian Wick
acaba78a11 wrong number 2013-06-23 23:13:54 +02:00
Sebastian Wick
357974a429 more minor stuff 2013-06-23 21:34:41 +02:00
Sebastian Wick
a1fea97c3b use SDL for resolution -> multimonitor support 2013-06-23 03:49:30 +02:00
graffy76
75d7d3b7fc Added base.png 2013-06-21 12:28:07 -05:00
graffy76
101c147217 Final changes for record status icon feature, incl. window size user 
preference

1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
 2013-06-20 18:06:25 -05:00
graffy76
965d93ea40 Pull to get latest icons 
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
 2013-06-20 16:13:01 -05:00
graffy76
f87eb67968 Fixed conflicts 
Merge branch 'cs-windows' of https://github.com/Glorf/openmw

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/model/settings/usersettings.hpp
	apps/opencs/view/settings/usersettingsdialog.cpp
 2013-06-17 06:45:44 -05: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
Marek Kochanowicz
c174f57a2f Git changes show that it should upload all the files this time. Let's 
hope…
 2013-06-15 14:40:36 +02:00
graffy76
a5d9d3fd7a Updated status icons from sirherrbatka 2013-06-15 07:29:20 -05:00
graffy76
97cfbc31b5 Merge color icons 
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
 2013-06-15 06:46:27 -05:00
scrawl
fcf35d3871 Removed the UI cursor sensitivity slider 2013-06-12 20:27:55 +02:00
scrawl
403704b92a Use openmw.png for SDL_SetWindowIcon 2013-06-12 16:15:04 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
scrawl
daab4f55a3 Use Morrowind's fonts 2013-06-06 22:26:06 +02:00
pvdk
b3595a6a2e Fix for duplicate key/value pairs being written to settings.cfg, Bug #755 2013-06-02 21:43:22 +02:00
Marek Kochanowicz
09ab541102 Colored status icons. Hopefully everybody loves watercolors! 2013-05-31 11:50:03 +02:00
Marek Kochanowicz
e403773e95 Simply removed background from status icons. 2013-05-30 13:33:49 +02:00
graffy76
94db7cdcfe Added png's of icons 2013-05-29 12:45:15 -05:00
graffy76
35fb9b669a Final details implemented 
Png icons, alignments fixed.
 2013-05-29 06:38:35 -05:00
graffy76
5a40594b0d Merge 
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
 2013-05-26 23:21:08 -05:00
Marek Kochanowicz
792f3aaa86 Rastered status icons. ingredients, light, and book icon without emblem. 2013-05-26 17:31:29 +02:00
Marek Kochanowicz
b31f0dfe1f Raster status icons. 2013-05-26 17:28:27 +02:00
scrawl
de5a08a07d Version should be 100 for GLSLES 2013-05-25 05:40:35 +02:00
scrawl
c2c88acc7b GLSLES: only the fragment shader needs precision explicitely set. 2013-05-25 04:26:40 +02:00
scrawl
cc747d8ae4 GLSL ES: precision qualifiers are required 2013-05-25 04:23:07 +02:00
scrawl
1e7cf4ae1c GLES2 experiment 2013-05-25 04:15:24 +02:00
riothamus
885d12e867 updated hud layout 2013-05-22 22:06:22 -04:00
riothamus
39bd8894a9 Bug 787 2013-05-20 16:39:24 -04:00
Marc Zinnschlag
54f56b0515 Merge remote-tracking branch 'graffy76/usersettings' 
Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp
 2013-05-16 18:04:55 +02:00
Marek Kochanowicz
60893f4b00 New icons from nomadic1 finally. Including dialogue-greetings AKA Ave 
Caesar icon.
 2013-05-14 17:57:35 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
scrawl
90b7df439f Fix image buttons 2013-05-08 13:55:15 +02:00
graffy76
f6203cac2a update for master 2013-05-07 20:33:42 -05: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
f1413ca56b Synced font code ranges. 2013-05-06 15:17:17 +02:00
scrawl
ef9f0b2fc0 Fix size of quest index 2013-05-05 11:56:08 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
03f4e91ceb Unrelated shadows fix 2013-05-03 23:08:46 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
Glorf
f1a659e2ac Bugfix #730 2013-05-02 14:49:30 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
Nathan Jeffords
718af692c9 reworked journal to match bethesda's implemenation 2013-04-24 20:20:01 -07:00
Nathan Jeffords
85595245ab Updated journal layout to match Bethesda's version more closely 2013-04-24 20:20:00 -07:00
Emanuel Guevel
c0102954f1 Add non-breaking space to font code range 2013-04-25 01:42:09 +02:00
Marek Kochanowicz
03af0a8ac9 Adding more icons from nomadic1, replacing older with recently redoned. 2013-04-14 10:02:48 +02:00
scrawl
23b477a938 Fix normal maps with spaces in filename not getting loaded 2013-04-12 04:36:28 +02:00
scrawl
2c70074dd7 Fix combinedAlpha 2013-04-11 15:17:47 +02:00