scrawl
1fef086088
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
...
This reverts commit 546b640022
, reversing
changes made to fcaa8aae06
.
13 years ago
scrawl
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
scrawl
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
13 years ago
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
13 years ago
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
13 years ago
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
13 years ago
scrawl
63ce143a04
fix triangle / batch counts with compositors
13 years ago
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
13 years ago
scrawl
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
13 years ago
scrawl
7ebbc099b3
allow stacking gui modes
13 years ago
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
13 years ago
Marc Zinnschlag
bee03b5180
Merge remote branch 'scrawl/gui'
13 years ago
scrawl
d69501b061
change daedric font to .zip resource
13 years ago
scrawl
2b584300d6
throw an exception when no default settings file is found, which indicates a packaging error
13 years ago
Marc Zinnschlag
e26f39e563
fixed exception handling during subsystem setup
13 years ago
scrawl
7f15385dc5
unrelated cleanup
13 years ago
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
13 years ago
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
13 years ago
Marc Zinnschlag
7102a825c2
Issue 255: moved global scripts into script manager (simplifying the environment class)
13 years ago
scrawl
934caf7a2b
removed --report-focus which is now useless
13 years ago
scrawl
cac662ca98
basic tooltips
13 years ago
Marc Zinnschlag
a4fb71a0fc
Merge remote branch 'scrawl/graphics'
13 years ago
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
13 years ago
scrawl
a727bcd4a4
override nif transparency settings (part 1)
13 years ago
scrawl
2a4fcf42a3
basic shadows
13 years ago
scrawl
b1c84f28a9
Merge branch 'master' into water
...
Conflicts:
files/settings-default.cfg
13 years ago
Marc Zinnschlag
f52b9cc162
Merge branch 'autoequip'
13 years ago
scrawl
e492a69c8f
Merge branch 'inputfix' into water
13 years ago
scrawl
a3151fe525
fixed input handling priority in the main loop
13 years ago
scrawl
88c50c5171
Merge branch 'master' into water
13 years ago
scrawl
3f05aba76d
got MRT working, some minor quirks to solve (black viewport background)
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
73705dadf6
parse fallback with boost program option custom validators
13 years ago
Sebastian Wick
ab9c430632
fallback in apps/openmw; fix for apps/mwiniimporter
13 years ago
scrawl
00cc45c537
FPS is now a setting instead of commandline option
13 years ago
scrawl
2b4b941192
Merge branch 'master' into gamesettings
13 years ago
scrawl
5accca385c
fix crash on exit when no user settings exist
13 years ago
scrawl
7b3adb27a3
backend changes, terrain num lights setting
13 years ago
scrawl
f4bbcb48a6
settings-default.cfg
13 years ago
scrawl
6091a0504d
first settings test (config file has to be created manually)
13 years ago
scrawl
30407d3a2c
Merge branch 'master' into occlusionquery
13 years ago
scrawl
4e63f89829
silence an error regarding faced handle
13 years ago
Marc Zinnschlag
509650d5f3
Merge remote branch 'ace/fs-fix'
13 years ago
Marc Zinnschlag
0892df0ad3
framework for gamemechanics-realted actor updated
13 years ago
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
13 years ago
scrawl
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
13 years ago
Chris Robinson
fa70a72b75
Remove some unused sound manager fields and constructor parameters
13 years ago