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

1830 commits

Author SHA1 Message Date
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
Nikolay Kasyanov
582d7ab213 building & packaging improvements for OS X 2012-04-16 15:28:09 +02:00
scrawl
194ecf274c attribute tooltips 2012-04-16 00:16:35 +02:00
scrawl
705d4c6d54 mostly complete 2012-04-15 21:14:14 +02:00
gugus
58d05fa503 more clean-up. Container window shows up! But there is no working close button. 2012-04-15 20:56:45 +02:00
gugus
a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-04-15 17:54:13 +02:00
gugus
b309d245c5 cleaning up hircine work 2012-04-15 17:52:39 +02:00
scrawl
ab4e03f05f Merge branch 'master' into tooltips 2012-04-15 17:11:14 +02:00
scrawl
d37bc9cba8 basic mouse-over info for in-game objects 2012-04-15 17:10:08 +02:00
Marc Zinnschlag
f36c8733fa Merge remote branch 'scrawl/graphics' 2012-04-15 17:02:51 +02:00
scrawl
cac662ca98 basic tooltips 2012-04-14 17:47:44 +02:00
scrawl
fa5a1432c9 map lighting tweak, default settings tweak 2012-04-14 15:58:58 +02:00
k1ll
226f312163 Set the version in the openmw.desktop file via CMake 2012-04-13 17:36:31 +02:00
Marc Zinnschlag
a4fb71a0fc Merge remote branch 'scrawl/graphics' 2012-04-12 18:46:02 +02:00
scrawl
95f87a8abf more or less complete list for morrowind.bsa (thanks to artorius) 2012-04-12 16:33:36 +02:00
scrawl
2b8c81e779 removed test.skin file 2012-04-12 14:31:12 +02:00
scrawl
800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 2012-04-12 14:26:21 +02:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
scrawl
1df7be7fee - fixes to texture filtering setting 
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
 2012-04-09 00:10:42 +02:00
scrawl
aa8208efb9 changed compositor to be compatible with Ogre 1.8RC 2012-04-08 22:18:56 +02:00
scrawl
0b2dab0b5d disable water fog due to some issues 2012-04-08 18:17:52 +02:00
scrawl
a5c6207fe7 add setting to disable the underwater effect 2012-04-08 17:44:00 +02:00
scrawl
b1c84f28a9 Merge branch 'master' into water 
Conflicts:
	files/settings-default.cfg
 2012-04-08 16:11:16 +02:00
scrawl
fbfc6e0966 enabled new water by default 2012-04-08 16:06:47 +02:00
scrawl
17eb68e4bc disable "reflect statics" by default because it performs not so well right now 2012-04-08 15:52:43 +02:00
scrawl
8caa5ff9c4 fixed refraction and underwater distortion artifacts 2012-04-08 15:03:09 +02:00
Marc Zinnschlag
8e6c445111 Merge remote branch 'chris/sound' 2012-04-08 11:13:42 +02:00
Chris Robinson
59ccab0b2c Add sound volume settings 2012-04-07 16:00:30 -07:00
Chris Robinson
752e89a268 Add a setting to select the sound device name 2012-04-07 15:28:38 -07:00
scrawl
030060e656 settings description 2012-04-07 23:29:36 +02:00
scrawl
9169c0d7c9 slightly improved the quality of the default water setting 2012-04-07 23:18:08 +02:00
scrawl
96911ada95 restored render queue of transparent objects, they are now part of the mrt textures 
this fixes some issues with transparent objects not visible in the refraction
 2012-04-07 22:37:15 +02:00
scrawl
044d649edd Merge branch 'master' into water 2012-04-07 17:16:35 +02:00
Roman Melnik
bdbb8a8d84 Merge remote-tracking branch 'upstream/master' into windowsPinning 
Conflicts:
	apps/openmw/mwgui/window_manager.cpp (keep both changes)
 2012-04-07 17:30:20 +03:00
Roman Melnik
1bf79fd022 Windows pinning: support for MapWindow 
Set correct skin for the Map Window.
 2012-04-07 16:47:41 +03:00
scrawl
bcee5d5943 fix areas with only water (no objects below) 2012-04-06 19:40:37 +02:00
scrawl
c0f991ac0a underwater depth effect 2012-04-06 18:51:30 +02:00
scrawl
456eb95209 reversed sun and moon paths (sunrise at east) 2012-04-06 18:22:37 +02:00
scrawl
114e8ae2a0 much less underwater distortion 2012-04-06 16:45:45 +02:00
scrawl
2976625b00 better underwater 2012-04-06 15:51:57 +02:00
scrawl
393530e671 more or less fixed the sky for normal viewing angles, still disappears at a certain height though 2012-04-06 15:05:17 +02:00
scrawl
a41eee9a72 specular lighting 2012-04-06 14:07:52 +02:00
Roman Melnik
ef0a185e11 Pinnable windows: hide hud elements 
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.

Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
 2012-04-06 01:17:23 +03:00
scrawl
8bfc81f398 Merge branch 'master' into water 2012-04-05 20:09:38 +02:00
scrawl
622fb568cf removed MRT setting and figure it out automatically 2012-04-05 19:27:54 +02:00
scrawl
b8a470efcd put transparent objects in a seperate render queue, in order to not mess up the mrt textures 2012-04-05 19:07:21 +02:00
scrawl
1b89a9e203 various fixes 2012-04-05 15:30:55 +02:00
scrawl
f49131e1b8 renamed setting, automatically disable MRT when unsupported 2012-04-05 13:09:59 +02:00
scrawl
add4ebe445 fresnel effect 2012-04-05 12:59:56 +02:00
scrawl
8ddc8131a5 fresnel test 2012-04-05 11:18:58 +02:00
scrawl
36fd9b9f26 shore transition test 2012-04-05 10:39:22 +02:00
scrawl
ab8b74dcac forgot adding a file 2012-04-05 08:58:21 +02:00
scrawl
3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 2012-04-05 01:21:36 +02:00
scrawl
006970fd79 add MRT code to shaders 2012-04-04 19:53:41 +02:00
scrawl
328bdaafb6 fixed a problem with the underwater compositor 2012-04-03 22:53:08 +02:00
scrawl
2fa9bac517 added fog 2012-04-03 22:04:37 +02:00
scrawl
cc4076d42a basic noise 2012-04-03 21:16:43 +02:00
scrawl
fe63f2b2aa first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering) 2012-04-03 19:10:02 +02:00
scrawl
6481cf87fc cleanup resources 2012-04-03 17:07:16 +02:00
scrawl
b3a186e729 simple water without shaders that uses original MW textures 2012-04-03 16:37:54 +02:00
scrawl
8aea311797 added visibility flags for everything 2012-04-03 15:13:47 +02:00
scrawl
fd45208196 re-added code for reflection & refraction rendering 2012-04-03 14:23:23 +02:00
scrawl
ff15f28787 options for texture filtering and mipmaps 2012-04-02 18:01:49 +02:00
scrawl
39ee9e9ab8 setting for field of view 2012-04-02 17:51:51 +02:00
scrawl
00cc45c537 FPS is now a setting instead of commandline option 2012-04-02 16:10:54 +02:00
scrawl
fd662f937a add settings for viewing distance and fog 2012-04-02 15:51:48 +02:00
scrawl
e5cc9adbb0 added settings for rendering distance of small objects 2012-04-02 15:30:29 +02:00
scrawl
1445ae992d adding a setting to disable static geometry 2012-04-02 14:24:16 +02:00
Roman Melnik
d09f0610ea Add basic windows pinning 
Create WindowPinnableBase class for windows which should be
allowed to be pinned.

Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).

Handle clicking on PinToggle button (pinning/unpinning a window).
 2012-04-01 20:36:57 +03:00
scrawl
7b3adb27a3 backend changes, terrain num lights setting 2012-04-01 18:48:37 +02:00
scrawl
f4bbcb48a6 settings-default.cfg 2012-04-01 17:14:49 +02:00
Nikolay Kasyanov
2a7885b514 Synchronized OS X icon with our current app icon 2012-03-31 19:36:07 +04:00
Marc Zinnschlag
46279a001b Merge remote branch 'scrawl/dialogue' 2012-03-30 15:39:56 +02:00
scrawl
4bbedeb3e7 made all dialogs semi transparent (like in morrowind) 2012-03-30 14:01:43 +02:00
scrawl
d3f31c3498 dialogue window enhancements 2012-03-30 13:53:35 +02:00
scrawl
e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-28 21:37:20 +02:00
Pieter van der Kloet
426c278505 Changed the OpenMW default font from Comic sans to EB Garamond 2012-03-24 22:02:55 +01:00
Pieter van der Kloet
155cd76f37 Changed Launcher font to EB Garamond and added license info 2012-03-24 20:43:35 +01:00
scrawl
7a3034701f functional HUD map 2012-03-23 16:51:56 +01:00
scrawl
ce63d29d4a rotate hud player arrow 2012-03-23 15:26:24 +01:00
scrawl
770b0f2106 gui changes 2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0 player arrow 2012-03-23 09:00:00 +01:00
scrawl
6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 2012-03-22 21:41:32 +01:00
scrawl
cf3515a898 it is now possible to drag the minimap with the mouse 2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f MW_MapView skin 2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74 Merge branch 'next' into minimap 
Conflicts:
	files/mygui/openmw_map_window_layout.xml
 2012-03-22 19:36:37 +01:00
scrawl
70ed5770da black journal text 2012-03-22 17:32:18 +01:00
scrawl
250fcab7c2 moved the mygui resources to a more suitable location 2012-03-22 17:11:24 +01:00
Jason Hooks
f2093a51db more cleanup 2012-03-18 22:38:07 -04:00
Jason Hooks
fe9e6a732c Some cleanup 2012-03-18 22:32:46 -04:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
Marc Zinnschlag
4c2fffdd61 temporarily disabled multi data path support in OpenMW 2012-02-28 09:27:35 +01:00
scrawl
8b5da06fce Merge branch 'next' into weather 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-02-20 18:33:13 +01:00
Marc Zinnschlag
e02cba58b1 Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-02-20 14:34:27 +01:00
Marc Zinnschlag
8186445de9 fix for a very silly bug 2012-02-16 21:06:25 +01:00
Marc Zinnschlag
8244ed5860 workaround for space in paths problem 2012-02-16 09:26:27 +01:00
Marc Zinnschlag
e1defd3595 adjusted the globally installed openmw.cfg file 2012-02-14 09:25:12 +01:00
Pieter van der Kloet
7bf8497215 Fixed CMake problem with Ogre plugins path 2012-02-07 21:41:08 +01:00
Nikolay Kasyanov
705b2955a0 Feature #162 - Need to create app bundle using CMake, not by hand. 
In progress, working towards plugins support.
 2012-01-30 00:28:02 +04:00
Jason Hooks
bf09762b6a Ground showing up 2012-01-20 19:50:42 -05:00
Jason Hooks
ff2bbc9fc5 Transparent water 2012-01-18 22:42:07 -05:00
Jason Hooks
8798f7dd40 Bringing in some of Azathoth's work 2012-01-14 18:34:14 -05:00
Pieter van der Kloet
6716bf649e Some stylesheet improvements and a drop-shadow for the scroll background 2011-06-26 23:16:39 +02:00
Nikolay Kasyanov
24947d800a Fixed launcher config and style location. Launcher will be started when opening bundle 2011-06-26 21:04:17 +04:00
Pieter van der Kloet
db20186e50 Added newline to the end of some files, GitHub was complaining about it 2011-06-24 21:46:20 +02:00
Pieter van der Kloet
118765a274 Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files 2011-06-24 21:42:18 +02:00
Pieter van der Kloet
409bd0fe7e Moved the stylesheet to main.cpp and made some stylesheet-related changes 2011-05-10 22:47:08 +02:00
Pieter van der Kloet
2b0dabe669 Changed profile switching again; Some stylesheet modifications 2011-05-03 02:46:46 +02:00
Pieter van der Kloet
557e659e15 CMake modifications, stylesheet gets copied to destination dir now 2011-05-02 20:07:37 +02:00
Marc Zinnschlag
d47abff25d create local openmw.cfg file for uninstalled version 2011-04-28 21:55:08 +02:00
Nikolay Kasyanov
eaea48011d 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-04-28 21:55:05 +02:00
Nikolay Kasyanov
943eea8104 .app bundle finally works 2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
527ac956a7 More correct MacOS X bundle generation 2011-03-07 06:03:39 +03:00
Nikolay Kasyanov
4028600768 Builds on OS X now 2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
753a4f681e Search for plugins in orgre lib directory 2011-01-13 21:18:20 +01:00
Jan-Peter Nilsson
4221824681 Build debian package using cpack if dpkg is available 
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
d1b482d64a Update plugins.cfg based on where cmake found ogre libraries 2011-01-12 18:18:06 +01:00
Jan Borsodi
0f860e2fbd openmw.cfg is now created with a configurable path (via cmake), the default is still "data" 2010-09-10 13:38:17 +02:00
Ardekantur
25ba9933f6 Mac Build - heinous additions for bundle management 2010-06-25 21:28:11 -04:00
Marc Zinnschlag
6b6e42b641 removed unused BSP scene manager from plugins.cfg 2010-06-11 19:59:33 +02:00
Marc Zinnschlag
9a041d7c01 added data option and openmw.cfg file 2010-06-11 19:53:00 +02:00
Nicolay Korslund
e8c6caa0b5 Fixed DOS line endings on certain files 2010-06-06 18:04:39 +02:00
Marc Zinnschlag
e973270f9b fixed minor bug in previous commit; more clean up 2010-06-06 13:04:23 +02:00