Commit Graph

524 Commits (coverity_scan)

Author SHA1 Message Date
scrawl e5a21aca53 Refactor projectiles to no longer use MW-objects 11 years ago
Thomas cbfa282f8d Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work)
Notes - When the door hits them while it's about to finish closing they will try to walk through the door.
      - Considerably more works is needed in making the NPC work out troublesome areas where they get stuck
11 years ago
scrawl d4492b56db Added header file missing from CMakeLists 11 years ago
Thoronador be89654eef remove audiere_decoder + mpgsnd_decoder from CMake file for openmw 11 years ago
scrawl 7bddfc0025 Fix some spelling mistakes. 11 years ago
cc9cii d3be725ee7 Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points. 11 years ago
Marc Zinnschlag 86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
11 years ago
cc9cii 040d4f8fc4 Move PathgridGraph into separate files. 11 years ago
Jeffrey Haines 7c0b51fb7e Ai pursue now controls guards pursuit of crimes
Should extend AiActivate in the future
11 years ago
scrawl f5810b8e1c Consider aspect ratio for loading screen background
More consistent with the main menu.
11 years ago
scrawl 5906d795c0 Refactored video player (now a MyGUI widget) 11 years ago
scrawl 2e4ef93b28 Add proper main menu (background image, logo animation, title music) 11 years ago
scrawl 81dfc26d26 mwscript/locals was added twice 11 years ago
scrawl 0cd40294a2 Fixed ranged combat for creatures 11 years ago
cc9cii ce8d327e8e Debug MSVC build of openmw needs number of sections beyond 2^16 11 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 11 years ago
pvdk f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 11 years ago
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
11 years ago
scrawl 39d86a9468 Improvements to smooth NPC steering 11 years ago
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
11 years ago
pvdk c95b8bcb39 Moved the generated version header stuff into components 11 years ago
scrawl 16f5f5862d Feature #956: Implement blocking melee attacks 11 years ago
scrawl 805843d7ff Closes #1086: Implement blood effects 11 years ago
scrawl 90b92a8f41 Move levelled list code out of ContainerStore 11 years ago
scrawl 728365b48d Remove an unused hook 11 years ago
scrawl 780bf5a2cd Implement pickpocket detection. Play a voiced dialogue entry when detected. 11 years ago
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
11 years ago
scrawl be2ebc5cac Closes #1081: Implement disease contraction 11 years ago
Scott Howard 2f082ef796 remove unneeded libraries 11 years ago
scrawl 1c60a781a5 Add header to CMakeLists 11 years ago
scrawl eb5e4ecec2 Remove more unused code 11 years ago
Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
11 years ago
Marc Zinnschlag 8190fdb16c Merge remote-tracking branch 'scrawl/master' 11 years ago
Marc Zinnschlag 5e64888227 added basic save slot management and connected main menu save to save function (bypassing the save GUI for now) 11 years ago
Marc Zinnschlag 11e254aac8 Merge remote-tracking branch 'gus/AICombat'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
11 years ago
scrawl cab535dd69 Implement magic item recharging via soulgem use 11 years ago
Alexander "Ace" Olofsson 4baaf9463e Remove crashcatcher.cpp from windows builds, it can't be built or used there. 11 years ago
Marc Zinnschlag 985ce7c552 Merge remote-tracking branch 'scrawl/crashcatcher' 11 years ago
scrawl b9899696e3 Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace. 11 years ago
Marc Zinnschlag 79b7fa258b added new mwstate subsystem 11 years ago
scrawl b1a29eb27e Implement Resist & Weakness effects 11 years ago
scrawl 9b0e82a37f Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends) 11 years ago
Marc Zinnschlag a198751f21 Merge remote-tracking branch 'scrawl/magic' 11 years ago
scrawl 3ea7d58ca8 Advance skill on successfull spell cast 11 years ago
Marc Zinnschlag d85360e7fd Merge remote-tracking branch 'scrawl/ui' 11 years ago
scrawl bf5529819d Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog. 11 years ago
gus d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/docs/vmformat.txt
11 years ago
gus 5b20cce849 CMake fix 11 years ago
Lukasz Gromanowski 9c2145eda1 Issue #913: Merge --master and --plugin switches
Merged master/plugin switches into content in openmw
and mwiniimporter.

Extension in content files is now required.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Marc Zinnschlag 9637e1641b fix for building with system tinyxml 11 years ago
scrawl 13afcc9324 Don't link to OgreTerrain 12 years ago
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
12 years ago
scrawl 5c8950f91c Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Sebastian Wick b43f41c2bd use a mygui controller for scrollbar repeat 12 years ago
scrawl 123a60581f Only link to SDL2main on windows 12 years ago
Alexander "Ace" Olofsson 0a2ed8b0d7 Make OpenMW able to initialize SDL in windows builds 12 years ago
Nikolay Kasyanov 5984a15846 We don't need Carbon on OS X anymore 12 years ago
scrawl ab3634d692 Removed some remains of OIS 12 years ago
scrawl 495aeb5d3b Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/mwgui/cursorreplace.cpp
	apps/openmw/mwgui/cursorreplace.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwgui/windowmanagerimp.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	libs/openengine/ogre/renderer.cpp
12 years ago
scrawl daab4f55a3 Use Morrowind's fonts 12 years ago
scrawl 7a2d1cd8ce Security skill 12 years ago
scrawl 0c4a963132 Container UI rewrite 12 years ago
scrawl c6edb0288a Remove unused file 12 years ago
scrawl 78e6dab9d2 Dialogue history rewrite WIP 12 years ago
scrawl 2a42556aa5 Merge branch 'master' into HEAD 12 years ago
Chris Robinson d17e1e83d5 Rename MWRender's Player to Camera 12 years ago
scrawl 9343b4459e Opening doors 12 years ago
Nathan Jeffords f02a53b121 Created a helper class to format books for display from the journal
view-model data.
12 years ago
Nathan Jeffords 50d688c2fc Created a view-model to present journal data to the UI in the form it
intends to display it.
12 years ago
Nathan Jeffords 55ca037411 Created a MyGUI widget to present a page of formatted text. 12 years ago
Bret Curtis c1ec16986b add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt 12 years ago
gus b5b0e7a656 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI 12 years ago
Britt Mathis d768f6b57e Deleted *_* files in MwGui, builds. 12 years ago
Marc Zinnschlag e8c32d0c3d MWWorld::Player cleanup 12 years ago
gus 1eb3d3e10e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI
Conflicts:
	apps/openmw/CMakeLists.txt
12 years ago
Chris Robinson 04aeb3dd07 Rename Mechanics' Activators to Objects 12 years ago
gus 63424ade56 refactoring 12 years ago
scrawl b0199c703c Companion UI 12 years ago
scrawl 51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 12 years ago
Marc Zinnschlag 573368849b Merge remote-tracking branch 'glorf/enchanting'
Conflicts:
	apps/openmw/CMakeLists.txt
12 years ago
Glorf 6643fe789c Enchanting system 12 years ago
scrawl a2ca679beb Added PC repair feature 12 years ago
scrawl 20774f8f81 Added merchant repair feature 12 years ago
Glorf 521bebd2f4 Fallback system rewritten, added light fallbacks 12 years ago
scrawl 5341bf9504 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl cf87708c1f Magic effect icons for spells 12 years ago
scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
12 years ago
scrawl d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 12 years ago
scrawl cacdb33b42 Merge branch 'master' into graphics
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
12 years ago
scrawl db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson bbde0146a7 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Emanuel Guevel 3ba3c71556 Make the "lock window" button to change state visually 12 years ago
scrawl 32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson 6a9755778e Merge remote-tracking branch 'zini/next' into animation2 12 years ago
Marc Zinnschlag 1a079ec8d3 Merge branch 'master' into next 12 years ago
Chris Robinson 34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 12 years ago
scrawl d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Nikolay Kasyanov 0d4b0bfd93 Trying to resolve sound issues on OS X with ffmpeg backend 12 years ago
Chris Robinson 2c39760bd5 Move the movement solver code to mwworld's physics system 12 years ago
Marc Zinnschlag 86fb3574a0 Merge remote-tracking branch 'wheybags/master' into next 12 years ago
Chris Robinson bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
	apps/openmw/mwrender/sky.cpp
12 years ago
scrawl 0f37c24d5f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson 1747c1e01a Integrate a new movement solver to handle object movement and collisions
Temporary, and pretty breoken. Needs some serious integration fixes.
12 years ago
scrawl 15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 12 years ago
Tom Mason ac112ef972 refactored special variable code 12 years ago
Marc Zinnschlag c97553703a fixes for static build without cg 12 years ago
scrawl a461b282c1 water ripples (experimental) 12 years ago
Chris Robinson 8d98f3649c Use a separate class to handle activator mechanics 12 years ago
Chris Robinson 94b93227d3 Treat activators as actors for rendering and mechanics
Kinda hacky, but it's the only way to get animated activators (flags, silt
striders, etc) to work properly.
12 years ago
Jordan Milne ed644259ce Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling 12 years ago
Chris Robinson 771a5f7316 Add the beginnings of a character controller 12 years ago
Jordan Milne 6449f68d61 Merge branch 'master' into sdl_input 12 years ago
Jordan Milne 884d3ea4d8 Rip out OIS, fill the holes with SDL goodness. WIP. 12 years ago
scrawl f1b138d0a8 Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
12 years ago
scrawl 35f4d09288 swscale handled better (cmake) 12 years ago
scrawl 1718d735b5 Fix menu/journal/book/scroll buttons when using localised MW-installations
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
scrawl c4facc233e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
12 years ago
Marc Zinnschlag 5d45bcd03a Merge remote-tracking branch 'trombonecot/master'
Conflicts:
	apps/openmw/mwclass/light.cpp
12 years ago
eduard 82ea547ce4 Failed action 12 years ago
Marc Zinnschlag 3dc013ceae Merge remote-tracking branch 'gohan/Gohan' 12 years ago
marcin 4b939c7521 Feature #391 Dummy AI package classes 12 years ago
marcin 698afbec3e Feature #391 Dummy AI package classes 12 years ago
Marc Zinnschlag 4614d2bc8e Issue #219: added basic select struct analysis and type checking 12 years ago
Marc Zinnschlag 1502b3f6f8 Issue #219: Begin of refactoring; added filter class (doesn't do anything yet) 12 years ago
greye 7cf0b8a680 just replace esmstore, inconsistent 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
Marc Zinnschlag 510674aa5e Merge branch 'master' into alchemy
Conflicts:
	components/esm/loadmgef.hpp
12 years ago
scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt
12 years ago
scrawl 1a2034b4dd training window 12 years ago
gugus 4f5c4bf89a Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwgui/dialogue.hpp
	apps/openmw/mwgui/mode.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp
12 years ago
Marc Zinnschlag cd343c4fbd Issue #61: Basic alchemy class (doesn't do anything yet) 12 years ago
scrawl ac0c1ea986 Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
Conflicts:
	apps/openmw/mwgui/dialogue.cpp
12 years ago
gugus 3060fbee60 TravelGUI, not completly finished. 12 years ago
scrawl 73c69e8eda video playback 12 years ago
scrawl 9d7c35ae48 and go 12 years ago
scrawl 8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl 86cfc91ef3 global map rendering 12 years ago
scrawl 0ba996f290 dialog layout 12 years ago
scrawl 95f3a20e2c Merge branch 'master' into levelup 12 years ago
scrawl 2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
12 years ago
Marc Zinnschlag b7c9285b24 added support for out of world rendering 12 years ago
scrawl b76a28f69c beginnings of the gui 12 years ago
scrawl d90af9c524 Merge branch 'master' into characterpreview 12 years ago
Marc Zinnschlag 835c530e06 Merge branch 'ingredients' 12 years ago
Marc Zinnschlag fe68a252d5 Issue #356: Implemented ingredient eating 12 years ago
scrawl 4f3eb3c34a character preview WIP 12 years ago
scrawl 2b339f6c0f loading screen 12 years ago
Adam Hogan 08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 12 years ago
Adam Hogan 562df5388f Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Adam Hogan ebf80943a9 Added spell buying window 12 years ago
Lukasz Gromanowski 99c46093dd Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests 12 years ago
Marc Zinnschlag 345eec1135 Issue #389: added AI package base class and AI packages management class 13 years ago
scrawl 5ebcaeb098 Merge branch 'next' into quick_keys 13 years ago
scrawl fab4cfecb1 some unfinished work on quick keys window 13 years ago
Nikolay Kasyanov 5395721c26 more appropriate fix for #189 13 years ago
scrawl 19ae30ee68 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwbase/inputmanager.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.hpp
	apps/openmw/mwinput/mouselookevent.cpp
13 years ago
Lukasz Gromanowski 34513cf16b Added support for code coverage checking and unittests.
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
scrawl 86d6f190bf Input system rewrite 13 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 0231533d05 Issue #107: InputManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 13 years ago
scrawl f72956b918 - added a simple main menu (with Return, Options and Exit buttons)
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
Marc Zinnschlag aca08eb4c2 Merge branch 'decouple' into player_control
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.hpp
13 years ago
Marc Zinnschlag 6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 13 years ago
greye ec9cf4d3c6 rotateObject() added, input system rewritten 13 years ago
Marc Zinnschlag 28ecfb4290 Issue #107: ScriptManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 90de02b901 Issue #350: console only script instructions 13 years ago
scrawl 739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 13 years ago
scrawl 4434fb640e Merge branch 'master' into shadersystem 13 years ago
Marc Zinnschlag 2c70a93553 Merge branch 'master' into potions
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
13 years ago
scrawl 509e9d7034 Merge branch 'master' into shadersystem 13 years ago
Marc Zinnschlag da916cecfb fixed a bug in a cmake script that resulted in some files being compiled twice 13 years ago
scrawl 7d5b94709d Merge branch 'master' into shadersystem
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
13 years ago
Marc Zinnschlag 29b4a5e5f7 Issue #314: added apply actions 13 years ago
Marc Zinnschlag f11bf49a90 cmake fix; silenced some warnings 13 years ago
scrawl 3537af051d removed the old shader helper 13 years ago
Marc Zinnschlag 771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 13 years ago
scrawl a1e48b0feb builds now 13 years ago
Marc Zinnschlag 4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 13 years ago
Marc Zinnschlag 035c1c4b6e added World interface class; cleanup of World interface 13 years ago
Marc Zinnschlag 76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 13 years ago
scrawl c7268233df spell window layout & opening/closing/pinning logic 13 years ago
scrawl f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 13 years ago
scrawl 51b8a76a68 merged by branches together, starting with alchemy window
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
13 years ago
scrawl 689cf7ce05 ConfirmationDialog 13 years ago
scrawl 313294c522 settings window (hotkey F2) which does nothing. Yay! 13 years ago
Marc Zinnschlag 7938566004 Merge remote branch 'scrawl/graphics'
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag 3e85151c9d Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
	apps/openmw/CMakeLists.txt
13 years ago
Marc Zinnschlag 9f1919a230 Issue #256: added active spell management (completely untested) 13 years ago
Marc Zinnschlag a4343bfa18 Issue #256: added TimeStamp class 13 years ago
scrawl 0c1d06d9f7 added some trade window stuff, which does nothing yet. 13 years ago
scrawl 0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 13 years ago
scrawl 24a0fecd37 implemented item count selection dialog 13 years ago
scrawl 967fb13fca remove the old inventory code, split HUD, map and mainmenu into seperate implementation files 13 years ago
scrawl 296dbce298 Merge branch 'master' into graphics 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 cd351ba3af simple scroll text parsing (tags are ignored until now) 13 years ago