Commit Graph

524 Commits (coverity_scan)

Author SHA1 Message Date
scrawl af67de73a5 Delete shiny 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
sylar a418b70937 command line support for Android 10 years ago
scrawl 0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 10 years ago
MiroslavR 1d9e973573 Add training progress bar, implement jail screen, tweak wait dialog (Fixes #1714) 10 years ago
scrawl 4b704f665f Reduce includes, move DragAndDrop to separate file 10 years ago
scrawl f267497c03 Allow separate summoned creature instances for each spell ID (Fixes #2194) 10 years ago
scrawl edc128572d Add MWMechanics::Actor class for temporary actor state, move AiState there 10 years ago
scrawl 79237d16a7 Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
10 years ago
scrawl ba65c6cc7f Add --script-all-dialogue switch to compile all dialogue scripts (Fixes #1659) 10 years ago
Marc Zinnschlag 19b380d0b4 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
10 years ago
MiroslavR ed6bdc0bde Use all topics to search for keywords in dialogues (Fixes #2013)
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
10 years ago
scrawl ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 10 years ago
scrawl 6b65502557 Add properties for new widget classes to MyGUI plugin 10 years ago
Marc Zinnschlag 3f671c86a8 Merge remote-tracking branch 'cc9cii/ffmpeg-swresample' 10 years ago
Marc Zinnschlag d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
10 years ago
Marc Zinnschlag 89000f6196 removed unused OmwLoader 10 years ago
Marc Zinnschlag 9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 10 years ago
scrawl c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 10 years ago
scrawl ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 10 years ago
cc9cii ce3077c970 Test version with debug statements. Also moved some common code out to a separate file. 10 years ago
cc9cii 6d12374ace Move windows platform specific files into a common directory. 10 years ago
cc9cii e0e561a105 Add icon to windows exe 10 years ago
Marc Zinnschlag ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 0fe9612afb Implement basic spellcasting AI (Fixes #961)
Select a weapon to attack with in AiCombat and equip it (Fixes #1609, Fixes #1772)
10 years ago
scrawl c5fa7bf7c2 Minor cleanup 11 years ago
scrawl 8c26f802e6 Move terrain grid implementation to a component so the editor can use it (Feature #1597) 11 years ago
Marc Zinnschlag f4ddf2a7b9 Merge remote-tracking branch 'sandstranger/android' 11 years ago
root c15902487d fix indent in cmake 11 years ago
root 32ebc90ba4 fix v9 11 years ago
root 713787d92f fix v7 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 16aafc26bc fixed cmake for build on all plaforms include android 11 years ago
scrawl a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 11 years ago
scrawl 45af34d189 Merge branch 'master' of https://github.com/OpenMW/openmw 11 years ago
scrawl 598c0c4ae7 Implement mouth animation for NPCs based on say sound (Fixes #642) 11 years ago
bogglez b56cb7e5ee Remove defunct option for building without FFmpeg
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
  (FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
11 years ago
scrawl 28a0899d2b Implement difficulty scaling (Fixes #1505) 11 years ago
scrawl 1c41ce9b9d Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX) 11 years ago
scrawl e25fa6c157 Refactor non-distant land terrain path to a grid based implementation (Fixes #1562) 11 years ago
scrawl 3bf599248e CMake cleanup: Remove distribution-specific install stuff (unused) 11 years ago
Marc Zinnschlag 0668019c86 Merge remote-tracking branch 'scrawl/master' 11 years ago
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
11 years ago
slothlife 20dabaead9 Fix CMake scripts to link static dependencies
Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't
fail silently to find the libraries correctly.

Modified top-level CMakelists.txt:
- Correctly set include dirs, preprocessor definitions, and add
  libraries for static Ogre plugins.
- Correctly set preprocessor definitions for static MyGUI.

Modified launcher, openmw, and opencs to link the static Ogre plugins.

Fixed FindSDL2.cmake to set a variable that contains only the SDL2
library, so that the launcher doesn't incorrectly link against
SDL2main.

Fixed FindMyGUI.cmake to correctly look for static variants.

Fixed FindOgre.cmake to set variables for DirectX plugins correctly.
11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
greye 8f9091550e require boost::locale only on Windows 11 years ago
greye b728a919a2 write dependency on boost::locale to CMake files 11 years ago
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