Commit Graph

8243 Commits (3452bd2e0b59903673509dac6eb3bfc2b8c7cceb)
 

Author SHA1 Message Date
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
scrawl 4f35fd8184 Removed a workaround from Renderer, some cleanup 11 years ago
Marc Zinnschlag b20943b123 Merge remote-tracking branch 'ace/win-package' into openmw-27 11 years ago
Alexander "Ace" Olofsson 632a53ead4 Support packing the OpenCS into windows builds 11 years ago
Marc Zinnschlag ba88c94d58 first attempt at an info record collection 11 years ago
Marc Zinnschlag 45f5a66bcc use result of getAppendIndex instead of always appending at the end 11 years ago
gus a6e7c6c104 disable AI combat for creatures 11 years ago
gus 5b20cce849 CMake fix 11 years ago
gus 0e86209224 linux fix :p 11 years ago
gus b7a9243173 fighting should stop when the target is dead 11 years ago
gus 12d8b4e0f8 bugfix 11 years ago
gus 2d84f7d33d NPC run 11 years ago
gus d7584f9df7 getLineOfSight, no script instruction yet 11 years ago
Marc Zinnschlag 29fce6d11f increased version number 11 years ago
Marc Zinnschlag f5fbe7361f Merge remote-tracking branch 'lgro/saving' into saving 11 years ago
graffy76 b51bef0d98 fixed missing adjuster widget in file dialog open view 11 years ago
Lukasz Gromanowski d51c9b64dd Issue #913: Merge --master and --plugin switches
Launcher part of master/plugin switches merge.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Lukasz Gromanowski 489475a32f Corrected compilation error (g++ 4.8.2) triggered by not found declaration
in argument-dependent lookup at the point of instantiation.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Marc Zinnschlag c2bbbef637 Merge remote-tracking branch 'rainChu/drowning-gauge' 11 years ago
gus 2515a1239e improved combat conditions 11 years ago
Marc Zinnschlag 9a80e11182 reimplemented add and appendBlankRecord via insertRecord 11 years ago
gus 968968502e NPC always face you when fighting 11 years ago
Marc Zinnschlag 525d6fadec added Collection insert function for arbitrary position and reimplemented appendRecord in via this function 11 years ago