Commit Graph

1363 Commits (0.7.0)

Author SHA1 Message Date
scrawl 78b06d0ebf inventory window pinning 13 years ago
scrawl 822e5fbe1e add indication which filter is selected 13 years ago
scrawl 0114bf948c revised filters 13 years ago
scrawl 1abf70692c added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug 13 years ago
scrawl ed6ff0a94a cleanup 3 13 years ago
scrawl 3a6fde5039 cleanup 2 13 years ago
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
13 years ago
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
13 years ago
scrawl a99f74702e workaround for a white square that appears in menubook_next texture 13 years ago
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 13 years ago
scrawl 65ccfba191 resize both the left and the right pane of the stats window 13 years ago
scrawl 8a9e05a96b display text on the book window 13 years ago
scrawl d69501b061 change daedric font to .zip resource 13 years ago
scrawl cd351ba3af simple scroll text parsing (tags are ignored until now) 13 years ago
scrawl 9dd53b32b8 added daedric font for magic scrolls 13 years ago
scrawl f20d4eeb41 Bug #281 , openmw.font.xml update 13 years ago
scrawl 499dd26398 dialogue window topic list word-wrapping 13 years ago
scrawl a3d99767f7 next & prev button mouseover 13 years ago
scrawl c125fba9d2 button mouse-over image change working 13 years ago
scrawl a4d6d1baff added a utility for creating texture atlas at runtime 13 years ago
scrawl 5028a83d11 fix stats window layout resizing 13 years ago
scrawl 0e6b82284f book & scroll windows 13 years ago
scrawl f733382f74 tooltip now contains info about item enchantment 13 years ago
scrawl 397a978145 DispositionEdit tweaks 13 years ago
scrawl cca39978d4 changed messagebox text colors 13 years ago
scrawl 50d79a8815 Merge branch 'next' into tooltips 13 years ago
gugus 5603cb312c Objects can now be selected and follow mouse movements. 13 years ago
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
13 years ago
scrawl e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 13 years ago
gugus 25432d97d2 trying to get selected item. Doesn't work. 13 years ago
Alexander "Ace" Olofsson f7a03b39c4 Some improvments for windows builds and installer 13 years ago
scrawl 4889902b98 magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects 13 years ago
pchan3 215d4e1739 Made adjustments to keep container window within the viewscreen. 13 years ago
scrawl 51a76eda92 Merge branch 'master' into graphics 13 years ago
scrawl 1de1b3e40e Merge branch 'master' into tooltips 13 years ago
scrawl 13b67faf2f adding more safety checks 13 years ago
scrawl f1b80c6ff7 fixed text input box 13 years ago
scrawl cfa37b0e77 fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text 13 years ago
scrawl b3dc1931a9 general GUI refactoring, part 1 13 years ago
Nikolay Kasyanov 582d7ab213 building & packaging improvements for OS X 13 years ago
scrawl 194ecf274c attribute tooltips 13 years ago
scrawl 705d4c6d54 mostly complete 13 years ago
gugus 58d05fa503 more clean-up. Container window shows up! But there is no working close button. 13 years ago
gugus a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
13 years ago
gugus b309d245c5 cleaning up hircine work 13 years ago
scrawl ab4e03f05f Merge branch 'master' into tooltips 13 years ago
scrawl d37bc9cba8 basic mouse-over info for in-game objects 13 years ago
Marc Zinnschlag f36c8733fa Merge remote branch 'scrawl/graphics' 13 years ago
scrawl cac662ca98 basic tooltips 13 years ago
scrawl fa5a1432c9 map lighting tweak, default settings tweak 13 years ago
k1ll 226f312163 Set the version in the openmw.desktop file via CMake 13 years ago
Marc Zinnschlag a4fb71a0fc Merge remote branch 'scrawl/graphics' 13 years ago
scrawl 95f87a8abf more or less complete list for morrowind.bsa (thanks to artorius) 13 years ago
scrawl 2b8c81e779 removed test.skin file 13 years ago
scrawl 800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 13 years ago
scrawl a727bcd4a4 override nif transparency settings (part 1) 13 years ago
scrawl 2a4fcf42a3 basic shadows 13 years ago
scrawl 1df7be7fee - fixes to texture filtering setting
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
13 years ago
scrawl aa8208efb9 changed compositor to be compatible with Ogre 1.8RC 13 years ago
scrawl 0b2dab0b5d disable water fog due to some issues 13 years ago
scrawl a5c6207fe7 add setting to disable the underwater effect 13 years ago
scrawl b1c84f28a9 Merge branch 'master' into water
Conflicts:
	files/settings-default.cfg
13 years ago
scrawl fbfc6e0966 enabled new water by default 13 years ago
scrawl 17eb68e4bc disable "reflect statics" by default because it performs not so well right now 13 years ago
scrawl 8caa5ff9c4 fixed refraction and underwater distortion artifacts 13 years ago
Marc Zinnschlag 8e6c445111 Merge remote branch 'chris/sound' 13 years ago
Chris Robinson 59ccab0b2c Add sound volume settings 13 years ago
Chris Robinson 752e89a268 Add a setting to select the sound device name 13 years ago
scrawl 030060e656 settings description 13 years ago
scrawl 9169c0d7c9 slightly improved the quality of the default water setting 13 years ago
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
13 years ago
scrawl 044d649edd Merge branch 'master' into water 13 years ago
Roman Melnik bdbb8a8d84 Merge remote-tracking branch 'upstream/master' into windowsPinning
Conflicts:
	apps/openmw/mwgui/window_manager.cpp (keep both changes)
13 years ago
Roman Melnik 1bf79fd022 Windows pinning: support for MapWindow
Set correct skin for the Map Window.
13 years ago
scrawl bcee5d5943 fix areas with only water (no objects below) 13 years ago
scrawl c0f991ac0a underwater depth effect 13 years ago
scrawl 456eb95209 reversed sun and moon paths (sunrise at east) 13 years ago
scrawl 114e8ae2a0 much less underwater distortion 13 years ago
scrawl 2976625b00 better underwater 13 years ago
scrawl 393530e671 more or less fixed the sky for normal viewing angles, still disappears at a certain height though 13 years ago
scrawl a41eee9a72 specular lighting 13 years ago
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).
13 years ago
scrawl 8bfc81f398 Merge branch 'master' into water 13 years ago
scrawl 622fb568cf removed MRT setting and figure it out automatically 13 years ago
scrawl b8a470efcd put transparent objects in a seperate render queue, in order to not mess up the mrt textures 13 years ago
scrawl 1b89a9e203 various fixes 13 years ago
scrawl f49131e1b8 renamed setting, automatically disable MRT when unsupported 13 years ago
scrawl add4ebe445 fresnel effect 13 years ago
scrawl 8ddc8131a5 fresnel test 13 years ago
scrawl 36fd9b9f26 shore transition test 13 years ago
scrawl ab8b74dcac forgot adding a file 13 years ago
scrawl 3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 13 years ago
scrawl 006970fd79 add MRT code to shaders 13 years ago
scrawl 328bdaafb6 fixed a problem with the underwater compositor 13 years ago
scrawl 2fa9bac517 added fog 13 years ago
scrawl cc4076d42a basic noise 13 years ago
scrawl fe63f2b2aa first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering) 13 years ago
scrawl 6481cf87fc cleanup resources 13 years ago
scrawl b3a186e729 simple water without shaders that uses original MW textures 13 years ago
scrawl 8aea311797 added visibility flags for everything 13 years ago
scrawl fd45208196 re-added code for reflection & refraction rendering 13 years ago
scrawl ff15f28787 options for texture filtering and mipmaps 13 years ago
scrawl 39ee9e9ab8 setting for field of view 13 years ago
scrawl 00cc45c537 FPS is now a setting instead of commandline option 13 years ago
scrawl fd662f937a add settings for viewing distance and fog 13 years ago
scrawl e5cc9adbb0 added settings for rendering distance of small objects 13 years ago
scrawl 1445ae992d adding a setting to disable static geometry 13 years ago
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).
13 years ago
scrawl 7b3adb27a3 backend changes, terrain num lights setting 13 years ago
scrawl f4bbcb48a6 settings-default.cfg 13 years ago
Nikolay Kasyanov 2a7885b514 Synchronized OS X icon with our current app icon 13 years ago
Marc Zinnschlag 46279a001b Merge remote branch 'scrawl/dialogue' 13 years ago
scrawl 4bbedeb3e7 made all dialogs semi transparent (like in morrowind) 13 years ago
scrawl d3f31c3498 dialogue window enhancements 13 years ago
scrawl e6303fc3f4 Merge branch 'master' into water
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
13 years ago
Pieter van der Kloet 426c278505 Changed the OpenMW default font from Comic sans to EB Garamond 13 years ago
Pieter van der Kloet 155cd76f37 Changed Launcher font to EB Garamond and added license info 13 years ago
scrawl 7a3034701f functional HUD map 13 years ago
scrawl ce63d29d4a rotate hud player arrow 13 years ago
scrawl 770b0f2106 gui changes 13 years ago
scrawl 9c3e1f48f0 player arrow 13 years ago
scrawl 6067053f08 Merge branch 'next' into water
Conflicts:
	CMakeLists.txt
13 years ago
scrawl cf3515a898 it is now possible to drag the minimap with the mouse 13 years ago
scrawl cc9f20a04f MW_MapView skin 13 years ago
scrawl ab9aa1ba74 Merge branch 'next' into minimap
Conflicts:
	files/mygui/openmw_map_window_layout.xml
13 years ago
scrawl 70ed5770da black journal text 13 years ago
scrawl 250fcab7c2 moved the mygui resources to a more suitable location 13 years ago
Jason Hooks f2093a51db more cleanup 13 years ago
Jason Hooks fe9e6a732c Some cleanup 13 years ago
Jason Hooks 51fb9e67cd Merge 13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Marc Zinnschlag 4c2fffdd61 temporarily disabled multi data path support in OpenMW 13 years ago
scrawl 8b5da06fce Merge branch 'next' into weather
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag 8186445de9 fix for a very silly bug 13 years ago
Marc Zinnschlag 8244ed5860 workaround for space in paths problem 13 years ago
Marc Zinnschlag e1defd3595 adjusted the globally installed openmw.cfg file 13 years ago
Pieter van der Kloet 7bf8497215 Fixed CMake problem with Ogre plugins path 13 years ago
Nikolay Kasyanov 705b2955a0 Feature #162 - Need to create app bundle using CMake, not by hand.
In progress, working towards plugins support.
13 years ago
Jason Hooks bf09762b6a Ground showing up 13 years ago
Jason Hooks ff2bbc9fc5 Transparent water 13 years ago
Jason Hooks 8798f7dd40 Bringing in some of Azathoth's work 13 years ago
Pieter van der Kloet 6716bf649e Some stylesheet improvements and a drop-shadow for the scroll background 14 years ago
Nikolay Kasyanov 24947d800a Fixed launcher config and style location. Launcher will be started when opening bundle 14 years ago
Pieter van der Kloet db20186e50 Added newline to the end of some files, GitHub was complaining about it 14 years ago
Pieter van der Kloet 118765a274 Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files 14 years ago
Pieter van der Kloet 409bd0fe7e Moved the stylesheet to main.cpp and made some stylesheet-related changes 14 years ago
Pieter van der Kloet 2b0dabe669 Changed profile switching again; Some stylesheet modifications 14 years ago
Pieter van der Kloet 557e659e15 CMake modifications, stylesheet gets copied to destination dir now 14 years ago
Marc Zinnschlag d47abff25d create local openmw.cfg file for uninstalled version 14 years ago
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.
14 years ago
Nikolay Kasyanov 943eea8104 .app bundle finally works 14 years ago
Nikolay Kasyanov 527ac956a7 More correct MacOS X bundle generation 14 years ago
Nikolay Kasyanov 4028600768 Builds on OS X now 14 years ago
Jan-Peter Nilsson 753a4f681e Search for plugins in orgre lib directory 14 years ago
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
14 years ago
Jan-Peter Nilsson d1b482d64a Update plugins.cfg based on where cmake found ogre libraries 14 years ago
Jan Borsodi 0f860e2fbd openmw.cfg is now created with a configurable path (via cmake), the default is still "data" 15 years ago
Ardekantur 25ba9933f6 Mac Build - heinous additions for bundle management 15 years ago
Marc Zinnschlag 6b6e42b641 removed unused BSP scene manager from plugins.cfg 15 years ago
Marc Zinnschlag 9a041d7c01 added data option and openmw.cfg file 15 years ago
Nicolay Korslund e8c6caa0b5 Fixed DOS line endings on certain files 15 years ago
Marc Zinnschlag e973270f9b fixed minor bug in previous commit; more clean up 15 years ago