Commit Graph

8315 Commits (1512ac11adcc4d1d9567447d9704088d48bba95d)
 

Author SHA1 Message Date
Marc Zinnschlag ef401a774b Merge remote-tracking branch 'eroen/install-fix' 11 years ago
Marc Zinnschlag 224aa5d38c Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27 11 years ago
Bret Curtis 5a071b0f81 necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
eroen e885c502a1 Stop installing "Daedric Font License.txt"
It was removed in 3a827d9c12
11 years ago
eroen 6b931f566d Stop installing "Daedric Font License.txt"
It was removed in 3a827d9c12
11 years ago
Bret Curtis 36efe9605f necessary dpkg rules to get opencs building and packaged on dpkg systems 11 years ago
Marc Zinnschlag fb417f9880 Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27 11 years ago
Jordan Ayers 3fbf918751 Chargen Review Dialog: Init fix.
Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
11 years ago
Jordan Ayers d48cc27a89 Chargen fix: Back sequence control.
Related to bug #894.
Eliminate double windows when using 'Back' from the review screen.
Force consistent back behavior (handling was changing after
a individual change button had been used).
11 years ago
Jordan Ayers e94da61ff0 Chargen cleanup.
Move common gui state pop out of if checks.
Move health update before gui state push (used as input for some windows).
11 years ago
Marc Zinnschlag d85360e7fd Merge remote-tracking branch 'scrawl/ui' 11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
11 years ago
scrawl 9e2b1942fc Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found. 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
Marc Zinnschlag c545b3682a compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique) 11 years ago
Marc Zinnschlag 2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 11 years ago
Marc Zinnschlag 9d7695ea88 added missing columns to topic info table 11 years ago
Marc Zinnschlag 245d7b0ae4 Merge remote-tracking branch 'scrawl/windowclosefix' 11 years ago
Marc Zinnschlag f4e6f31658 Merge remote-tracking branch 'scrawl/openmw-27' 11 years ago
scrawl c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 11 years ago
scrawl 3a827d9c12 Deleted Obliviontt.zip 11 years ago
Marc Zinnschlag 8bacdc8ab8 updated changelog 11 years ago
Alexander "Ace" Olofsson 468e8e3635 Missing iostream include 11 years ago
Marc Zinnschlag 8e439c290d updated changelog 11 years ago
Marc Zinnschlag dec1483fa4 Merge branch 'saving' into openmw-27 11 years ago
graffy76 6d439d032f Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector 11 years ago
graffy76 ed913936f8 Eliminated game & addon keys from profile configuration 11 years ago
graffy76 dace904490 changed game/addon to content for writing to openmw.cfg from launcher 11 years ago
Marc Zinnschlag 3ac58b387b fixed wording of an error message 11 years ago
graffy76 1d4b5a2425 Fix broken launcher content file display / selection scheme
Disable selection of content files with missing dependencies (grayed
out)
11 years ago
graffy76 12c06a5615 Fixed broken dependency check 11 years ago
Marc Zinnschlag 4724df7e9b added topic/journal column to info tables 11 years ago
graffy76 973803eb2f Fixed pathing issues in launcher 11 years ago
Lukasz Gromanowski afce10cf37 Fixes #597: Assertion `dialogue->mId == id' failed in esmstore.cpp
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
graffy76 8d12e2b99d fixed merge conflicts
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/launcher/settings/gamesettings.hpp
	components/contentselector/model/contentmodel.cpp
11 years ago
graffy76 cddece4f9e Another stab at fixing the pathing problem... 11 years ago
scrawl e6960d915a Add simple Ogre widget 11 years ago
Marc Zinnschlag 15b7d3263c subclass ESM::DialInfo to keep track of parent topic 11 years ago
graffy76 0cb591e4f6 Fixed path problem with adjuster widget and local data path. 11 years ago
Nikolay Kasyanov a85dffe644 Delete README_Mac.md
Use updated manual from wiki: https://wiki.openmw.org/index.php?title=Development_Environment_Setup#Mac_OS_X
11 years ago
Marc Zinnschlag ea0e8be0d3 disallow sorting (via column headers) in info tables 11 years ago
Marc Zinnschlag 90aa8f9db6 fixed dialogue record loading with multiple content files 11 years ago
Marc Zinnschlag 767cb54e7c added missing columns to journal info table 11 years ago
Marc Zinnschlag 69f28ee4be split info records between journal and topic info tables 11 years ago
gus 683b8d77dd build fix (thanks travis) 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 02ded18fc5 Linux backslash fix 11 years ago
gus 2a927f65d3 perfomances optimisations (pathfinding is computed less often, max 4 times per sec) 11 years ago
gus 650a112e2e better timer 11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago