Commit Graph

2781 Commits (db928dcb2ffae1a12240d9dc0567c677d3d5df57)
 

Author SHA1 Message Date
Aleksandar Jovanov db928dcb2f put an opening bracket on a new line 13 years ago
Aleksandar Jovanov 9893e4b384 made player respect NpcStats for mDrawState 13 years ago
Aleksandar Jovanov 23cc1d17ca missing ; added 13 years ago
Aleksandar Jovanov c589cbd4ff enum bug fix 13 years ago
Aleksandar Jovanov 15526d6110 only fists support lacks 13 years ago
Aleksandar Jovanov c1afd534fc all stuff added 13 years ago
Aleksandar Jovanov b4ee01e691 missing file 13 years ago
Aleksandar Jovanov b1259ca15c added a 'backend' for NPC/Player draw state 13 years ago
Aleksandar Jovanov d5b8d4ef49 Revert "test commit"
This reverts commit 8c607870c0.

reverting the test commit in the test branch
13 years ago
Aleksandar Jovanov 8c607870c0 test commit 13 years ago
Marc Zinnschlag f52b9cc162 Merge branch 'autoequip' 13 years ago
Roman Melnik bdbb8a8d84 Merge remote-tracking branch 'upstream/master' into windowsPinning
Conflicts:
	apps/openmw/mwgui/window_manager.cpp (keep both changes)
13 years ago
Roman Melnik 1bf79fd022 Windows pinning: support for MapWindow
Set correct skin for the Map Window.
13 years ago
Lukasz Gromanowski e21e8c221d Added explicit cast to char in ToUTF8::windows_XXXX tables.
Added explicit cast to char, without that gcc 4.7 (with default settings)
is showing a lot of:

narrowing conversion of ‘...’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Wnarrowing]

warnings.
13 years ago
Roman Melnik 72b3f6121d Windows Pinning: add files to CMakeLists.txt
Add new files (map_window and window_pinnable_base)
13 years ago
Marc Zinnschlag b7614dd0ce Merge remote branch 'chris/sound' 13 years ago
Chris Robinson 87e8917c4d Don't try to play sounds when no sound output is initialized 13 years ago
Marc Zinnschlag 8bf9b371c7 removed remains of input framelistener 13 years ago
Roman Melnik ef0a185e11 Pinnable windows: hide hud elements
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.

Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
13 years ago
scrawl a3151fe525 fixed input handling priority in the main loop 13 years ago
Marc Zinnschlag 000cfad82d Merge remote branch 'scrawl/gamesettings' 13 years ago
Dmitry Marakasov 84b475130a Add missing include 13 years ago
Marc Zinnschlag d45abcd89c Merge remote branch 'k1ll/master' 13 years ago
Marc Zinnschlag 01500e979a another fix for optional arguments 13 years ago
k1ll f2c4e513a4 Add support for building with a static build of the MyGui Libraries. 13 years ago
Marc Zinnschlag 1201c271b2 Merge remote branch 'swick/initocfg' 13 years ago
Sebastian Wick f7bfea5861 typo 2 -.- 13 years ago
Sebastian Wick 56c9992b29 typo 13 years ago
Sebastian Wick 8c84f68dab fix for older boost versions; unsigned warning 13 years ago
Marc Zinnschlag 6fd3d5c776 Merge remote branch 'lgro/master' 13 years ago
Lukasz Gromanowski ea8e5cb6f8 Issue #225: Land struct is not copyable.
Disabled copy constructor and assignment operator in Land structure.
13 years ago
Lukasz Gromanowski cd2789b15a Revert "Issue #225: Correction to commit ae98904."
This reverts commit 0e5c90d3e7.
13 years ago
Sebastian Wick 5dd65c11ee forgot to save the file 13 years ago
Sebastian Wick 57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg
Conflicts:
	apps/openmw/main.cpp
13 years ago
Sebastian Wick 6ccb32d26c import nosound option 13 years ago
Sebastian Wick d3a6484bbc set the default value for --fallback the right way 13 years ago
Sebastian Wick a974d88cf1 Revert "set a default value for --fallback"
This reverts commit 94a220dcdd.
13 years ago
Sebastian Wick 94a220dcdd set a default value for --fallback 13 years ago
Sebastian Wick 48b7b03453 typo; World::getFallback(std::string key, std::string def) 13 years ago
Sebastian Wick 16e7bf353a remove debug message 13 years ago
Sebastian Wick de510d445b throw an error if the --fallback syntax is wrong 13 years ago
Sebastian Wick 329ba24eab streamlined command line options 13 years ago
Marc Zinnschlag e403c7158a Merge remote branch 'gus/DialogueSystem' 13 years ago
Marc Zinnschlag cc9696cc2c Merge remote branch 'scrawl/minimap' 13 years ago
scrawl 51e33cc090 fixed map of some interiors 13 years ago
Sebastian Wick 329d59e52b typo 13 years ago
Sebastian Wick 73705dadf6 parse fallback with boost program option custom validators 13 years ago
Sebastian Wick d87dffa948 should work... but does not even compile 13 years ago
Sebastian Wick 2d23d79fd5 allways merge fallback; better syntax 13 years ago
Marc Zinnschlag 26371a82a5 Merge remote branch 'scrawl/crashfix' 13 years ago