1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Commit graph

219 commits

Author SHA1 Message Date
scrawl
934caf7a2b removed --report-focus which is now useless 2012-04-19 01:16:41 +02:00
scrawl
cac662ca98 basic tooltips 2012-04-14 17:47:44 +02:00
Marc Zinnschlag
a4fb71a0fc Merge remote branch 'scrawl/graphics' 2012-04-12 18:46:02 +02:00
scrawl
800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 2012-04-12 14:26:21 +02:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
scrawl
b1c84f28a9 Merge branch 'master' into water
Conflicts:
	files/settings-default.cfg
2012-04-08 16:11:16 +02:00
Marc Zinnschlag
f52b9cc162 Merge branch 'autoequip' 2012-04-07 18:48:30 +02:00
scrawl
e492a69c8f Merge branch 'inputfix' into water 2012-04-05 21:27:59 +02:00
scrawl
a3151fe525 fixed input handling priority in the main loop 2012-04-05 21:16:51 +02:00
scrawl
88c50c5171 Merge branch 'master' into water 2012-04-05 15:38:46 +02:00
scrawl
3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 2012-04-05 01:21:36 +02:00
Sebastian Wick
57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg
Conflicts:
	apps/openmw/main.cpp
2012-04-04 20:58:02 +02:00
Sebastian Wick
73705dadf6 parse fallback with boost program option custom validators 2012-04-03 02:14:39 +02:00
Sebastian Wick
ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 2012-04-02 20:47:09 +02:00
scrawl
00cc45c537 FPS is now a setting instead of commandline option 2012-04-02 16:10:54 +02:00
scrawl
2b4b941192 Merge branch 'master' into gamesettings 2012-04-02 15:21:10 +02:00
scrawl
5accca385c fix crash on exit when no user settings exist 2012-04-02 13:47:25 +02:00
scrawl
7b3adb27a3 backend changes, terrain num lights setting 2012-04-01 18:48:37 +02:00
scrawl
f4bbcb48a6 settings-default.cfg 2012-04-01 17:14:49 +02:00
scrawl
6091a0504d first settings test (config file has to be created manually) 2012-04-01 16:59:35 +02:00
scrawl
30407d3a2c Merge branch 'master' into occlusionquery 2012-04-01 14:16:25 +02:00
scrawl
4e63f89829 silence an error regarding faced handle 2012-04-01 13:09:30 +02:00
Marc Zinnschlag
509650d5f3 Merge remote branch 'ace/fs-fix' 2012-03-31 11:37:18 +02:00
Marc Zinnschlag
0892df0ad3 framework for gamemechanics-realted actor updated 2012-03-30 17:01:55 +02:00
Alexander "Ace" Olofsson
4a9a416d46 Can find files even if no .bsa file exists now 2012-03-30 14:45:32 +02:00
scrawl
e6303fc3f4 Merge branch 'master' into water
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
2012-03-28 21:37:20 +02:00
Chris Robinson
fa70a72b75 Remove some unused sound manager fields and constructor parameters 2012-03-24 00:22:54 -07:00
scrawl
6067053f08 Merge branch 'next' into water
Conflicts:
	CMakeLists.txt
2012-03-22 21:41:32 +01:00
Chris Robinson
5ae47f783e Use the sound manager's update to make sure music is still playing 2012-03-20 10:46:10 -07:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
gugus
7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-19 00:20:43 +01:00
Marc Zinnschlag
af875896ad fix for issue #179 2012-03-18 11:09:38 +01:00
gugus
10321ff51a Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-16 17:58:23 +01:00
gugus
6f7752633a there was no extension in the compiler context. Corrected. But Choice doesn't work. 2012-03-07 18:44:09 +01:00
Michael Papageorgiou
054a176c86 Added new FileLibrary class to handle music, this fixes a number of issues. 2012-03-07 17:46:51 +02:00
Michael Papageorgiou
03ea3bb62f SoundManager: first attempt at refactoring. BROKEN 2012-03-06 01:21:00 +02:00
Marc Zinnschlag
69f0ec99f1 implemented dialogue scripts 2012-03-05 16:56:14 +01:00
Marc Zinnschlag
1e998545c7 fixed log path 2012-03-02 15:15:44 +01:00
Marc Zinnschlag
be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Marc Zinnschlag
771d50fe69 removed a redundant assert and a left-over comment 2012-02-24 20:20:32 +01:00
Marc Zinnschlag
e02cba58b1 Merge branch 'master' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
9af08ff18d store screenshots in user directory instead of local directory 2012-02-13 18:34:21 +01:00
Marc Zinnschlag
77201d05bc post-merge fix 2012-02-13 16:42:01 +01:00
Marc Zinnschlag
27caee664e Merge remote branch 'lgro/config' into config
Conflicts:
	components/files/path.hpp
2012-02-13 16:36:57 +01:00
Lukasz Gromanowski
bcc4d7a7c9 Issue #133 Handle resources across multiple data directories
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 14:21:07 +01:00
Pieter van der Kloet
17b1546dc1 Changed the way screenshots are created (Bug #191) 2012-02-10 20:23:59 +01:00
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>
2012-01-29 20:27:03 +01:00
Cris Mihalache
daa8fb15ce Removed all physics-related code from Engine 2012-01-29 20:51:20 +02:00
Cris Mihalache
6d4fa9274e Moved OpenEngine systems into their appropriate classes 2012-01-29 17:31:18 +02:00