Commit Graph

206 Commits (000cfad82d59d8d8ac6860f1ada78d7482a9b1a7)

Author SHA1 Message Date
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
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
scrawl 6067053f08 Merge branch 'next' into water
Conflicts:
	CMakeLists.txt
13 years ago
Chris Robinson 5ae47f783e Use the sound manager's update to make sure music is still playing 13 years ago
Jason Hooks 51fb9e67cd Merge 13 years ago
gugus 7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 13 years ago
Marc Zinnschlag af875896ad fix for issue #179 13 years ago
gugus 10321ff51a Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 13 years ago
gugus 6f7752633a there was no extension in the compiler context. Corrected. But Choice doesn't work. 13 years ago
Michael Papageorgiou 054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 13 years ago
Michael Papageorgiou 03ea3bb62f SoundManager: first attempt at refactoring. BROKEN 13 years ago
Marc Zinnschlag 69f0ec99f1 implemented dialogue scripts 13 years ago
Marc Zinnschlag 1e998545c7 fixed log path 13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Marc Zinnschlag 771d50fe69 removed a redundant assert and a left-over comment 13 years ago
Marc Zinnschlag e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
13 years ago
Marc Zinnschlag 9af08ff18d store screenshots in user directory instead of local directory 13 years ago
Marc Zinnschlag 77201d05bc post-merge fix 13 years ago
Marc Zinnschlag 27caee664e Merge remote branch 'lgro/config' into config
Conflicts:
	components/files/path.hpp
13 years ago
Lukasz Gromanowski bcc4d7a7c9 Issue #133 Handle resources across multiple data directories
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Pieter van der Kloet 17b1546dc1 Changed the way screenshots are created (Bug #191) 13 years ago
Lukasz Gromanowski b004e2479c Issue #133 Handle resources across multiple data directories - WIP
Work In Progress - added support for multiple paths in SoundManager.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Cris Mihalache daa8fb15ce Removed all physics-related code from Engine 13 years ago
Cris Mihalache 6d4fa9274e Moved OpenEngine systems into their appropriate classes 13 years ago
Marc Zinnschlag 16bc374921 animation updates were hooked up to the wrong update function 13 years ago
Jason Hooks ec94ecacaf Zinis branch merge 13 years ago
Lukasz Gromanowski 7c24ae9ac7 Issue #168 - Configuration cleanup - WIP
This is "work in progress" commit, it shall not be merged alone,
without succeeding commits (it's not fully functional).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
Jason Hooks 84f45b1972 underwater view 13 years ago
Jason Hooks ff2bbc9fc5 Transparent water 13 years ago
Marc Zinnschlag 0c2de2c00c Merge branch 'animation2' 13 years ago
Jacob Essex 3b15170d09 Cleaned up and simplified the code relating to the fps display 13 years ago
Jacob Essex 18e4b73a86 Added a more detailed fps counter displaying the triangle and batch count 13 years ago
Jason Hooks d1793bc4bd Animation files in the correct directory 13 years ago
Jason Hooks eab69f18ac File output switch 13 years ago
Jason Hooks 653d999ac4 Animation creatures 13 years ago
Marc Zinnschlag 51d5c7cd59 Merge remote branch 'jhooks/mwrender' into mwrender
Conflicts:
	apps/openmw/engine.cpp

- fixed code that did not compile
- removed tons of tabs
- more clean up
13 years ago
Jason Hooks d8367f4968 Activation fix 13 years ago