mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 03:53:54 +00:00
Code Issues Releases Wiki Activity
7140 commits 108 branches 66 tags 133 MiB
Commit graph

522 commits

Author SHA1 Message Date
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