Commit Graph

10365 Commits (8419002393d89bd20222773a1872efb858f7ea32)
 

Author SHA1 Message Date
Marc Zinnschlag f130f8535c Merge remote-tracking branch 'slothlife/cmake-fixes' 11 years ago
scrawl 8b33c087e0 Properly handle exceptions when saving the game
Add message boxes when an exception occurs while loading or saving the game
11 years ago
Marc Zinnschlag 96e91e70a8 Merge remote-tracking branch 'emperorarthur/nif_fix' 11 years ago
Emanuel Guevel 929aae6869 Silence a clang warning
warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]
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
Arthur Moore 576c06d791 Fix Bug #1371
Not properly reading in the NIF file's QuaternionKeyList.
11 years ago
scrawl 5df9ff8e2c Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg
Fixes installing to /usr/local (Bug #1378)
11 years ago
scrawl f6f6b5604a Fix loading a savegame when some of its content files were disabled
Fixes #1380
11 years ago
Marc Zinnschlag 538aa6607e Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl c018319940 Addition to 7c9c0830a96: don't create useless BaseWhite clones 11 years ago
Fil Krynicki bbb7ceab43 Merge branch 'master' into bug1196jumpdialog
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
Fil Krynicki cd131e7f86 1196/1217 fix
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
11 years ago
scrawl dcc0e2d105 When dialogue goodbye is forced, allow using either the red link or the goodbye button
Fixes #1373
11 years ago
scrawl 7c9c0830a9 Fix errors due to BaseWhite material being removed 11 years ago
scrawl 0f1b39bca4 Fix trade exploit
Using the Max Sale button it was possible to "invert" the buying/selling state.
11 years ago
scrawl 865486604f Make trade disposition changes temporary again, as in vanilla 11 years ago
scrawl a1bdf20958 Make trade balance label editable 11 years ago
scrawl de7fcf0beb Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item)
Fixes #1368
11 years ago
scrawl 16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object
Fixes #1360
11 years ago
Rohit Nirmal 4f4a37896e Check if player's CellStore is non-NULL before configuring fog.
This prevents an assertion fail in getCell() when changing the
view distance while in the main menu.
11 years ago
Fil Krynicki 6cc6172779 Update in response to comments.
It turns out I was erroneous about problem (1) in my original commit
message. I thought that in an edge case the OpenMWGUI could both handle
the same event on the frame the GUI was closed. My test for
this was broken. So after brainstorming many possible unsatisfactory
solutions to this event handling, it's luckily not necessary!
11 years ago
scrawl d26f756c53 Fix several edit boxes not receiving mouse input 11 years ago
scrawl 8761aa5795 Loop main menu video when it's finished playing 11 years ago
scrawl ac77b07e29 Small fix for menu background 11 years ago
Marc Zinnschlag ecf3d52b46 Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader' 11 years ago
Marc Zinnschlag f5e587f566 Merge remote-tracking branch 'puppykevin/master' 11 years ago
cc9cii 11ce093a9e Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9). Should resolve Bug #1284. 11 years ago
Marc Zinnschlag be7f344eca Merge branch 'refs'
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
11 years ago
Marc Zinnschlag 4778c27548 silenced two warnings 11 years ago
Marc Zinnschlag be88168e91 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl b81c7d05c6 Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless)
Can still be used by editing the config file, however.
11 years ago
scrawl afc1fa49f6 Use mouse release instead of press for binding actions
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
11 years ago
Marc Zinnschlag 2f56b11530 Merge remote-tracking branch 'digmaster/master' 11 years ago
scrawl 50a72ed710 Fix ghosts in Cavern Of The Incarnate having -1 health 11 years ago
scrawl 6a882e1e8d Don't show hidden factions in StatsWindow (e.g. Nerevarine) 11 years ago
Marc Zinnschlag ae50632774 implemented cell and reference saving int OpenCS 11 years ago
scrawl 3b3b53d665 Support animated main menus (menu_background.bik)
Closes #1362
11 years ago
scrawl a6788cfb0e Support lights that do not have a model (Fixes #1361) 11 years ago
scrawl 95b3026c7e Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game 11 years ago
Digmaster 03d7137655 Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button 11 years ago
Digmaster a5cfa8a049 Removes add behavior when pressing escape while waiting. 11 years ago
scrawl c6a4506ac2 Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2) 11 years ago
Kevin Poitra 8516b837ff Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk."
This reverts commit b897080156.
11 years ago
Kevin Poitra 18314b1707 We use spaces, not tabs. 11 years ago
scrawl 41a04b9c65 Slightly adjust menu button position 11 years ago
scrawl e9ab7c85c6 Fix exception when there are spaces in INI-imported color settings 11 years ago
Kevin Poitra 3f00f00426 Remove some debug code. 11 years ago
scrawl 18e24a2007 Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found)
Fixes #1357
11 years ago
Kevin Poitra 8e55eb8009 Fix some formatting. 11 years ago
Kevin Poitra 545c3c312c Remove a superfluous clear. 11 years ago