Commit Graph

13153 Commits (66c866aec945b0c74939d1c1a317407e9c0bff11)
 

Author SHA1 Message Date
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
10 years ago
Digmaster 84ff11d0ab check if v2 exists before attemping to copy it 10 years ago
Digmaster 464bbe4d6f if v2 doesn't exist, don't erroneously set keyboardUserExists to true. 10 years ago
Digmaster 5d77ebdc60 If v3 doesn't exist, copy from v2 10 years ago
scrawl 97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
10 years ago
Digmaster df5513da7c uses v3 input bindings, not v2 10 years ago
Digmaster a192836582 (hopefully) correct gamecontrollerdb.txt behavior 10 years ago
Digmaster 796b4b01b0 Fix activating every frame when action is bound to a trigger 10 years ago
Digmaster e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 10 years ago
Digmaster 1e4a845b6f Minor code cleanup 10 years ago
Marc Zinnschlag 44d1f43b2b Merge remote-tracking branch 'sandstranger/fixes-for-android' 10 years ago
sylar edd3f9f95c small fix for float 10 years ago
sylar cef725012c fix transpose error fo gles2 10 years ago
Marc Zinnschlag 093c577895 Merge remote-tracking branch 'dteviot/Bug2344' 10 years ago
sylar cda3782cf2 fix crash game on Android after start loading 10 years ago
sylar 70398e2f9f change Jni name method 10 years ago
sylar 1bb29f610f enable mipmapping for Android again 10 years ago
Marc Zinnschlag 70a482b3e8 Merge remote-tracking branch 'dteviot/Bug2346' 10 years ago
Marc Zinnschlag 80e6df6092 Merge remote-tracking branch 'scrawl/opencs' 10 years ago
Marc Zinnschlag 281e0042ab Merge remote-tracking branch 'scrawl/master' 10 years ago
dteviot 72e94380be fix: boost::filesystem::canonical() available from version 1.48. 10 years ago
scrawl e7989a197d Add defaults for some required globals (Fixes #2397) 10 years ago
scrawl 3158d34abb Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all. 10 years ago
Marc Zinnschlag a77fbdc965 Merge remote-tracking branch 'jordan-ayers/bugfix/2400' 10 years ago
dteviot 931c95d0b1 workaround for not building on Linux version of Travis. 10 years ago
dteviot 9d61457956 AddOn files can be checked if game file is checked, but dependencies do not exist. 10 years ago
Jordan Ayers 659a8ba279 Correction to teleportation changes.
OMW Bug #2400
Related to OMW Bug #1533

Don't crash on confiscating items if a prison marker cannot be found.
10 years ago
Jordan Ayers 691ebd2372 Correction to teleportation changes.
OMW Bug #2400
Related to OMW Bug #1533

Don't crash when finding the closest marker to an exterior position.
10 years ago
Bret Curtis 5672c86924 Rename window title for OpenMW-CS 10 years ago
scrawl 24de6ba27e Fix crash for LAND records without data 10 years ago
Marc Zinnschlag e103262095 updated credits file 10 years ago
dteviot cc815c63f1 Fix: no longer loose changes when run install wizard or iniimport. 10 years ago
dteviot 6878e317a7 launcher: decouple Combo Box model from Plug-ins model.
fixes bug reported by scrawl
1. openmw.cfg had content files in order 'Bloodmoon.esm, Tribunal.esm, Morrowind.esm'
2. Blank_ESM_2.0.esm is in the Data Files directory
3. Do an ini file import.
4. Imported profile will have Blank_ESM_2.0.esm as the game file.  Should be Morrowind.esm.

Root cause: Game File combo box and Plugins Grid shared same data model, so changing plug-in file order also changed order of Game File combo box.
10 years ago
Marc Zinnschlag da9bd09a8c Merge remote-tracking branch 'miroslavr/master' 10 years ago
Marc Zinnschlag 9109162030 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 77bb77b367 Fix for instant restore effects (Fixes #2392) 10 years ago
dteviot 63af9d848a Add constraint: Bloodmoon.esm requires Tribunal.esm. 10 years ago
dteviot 6dc202cba3 Removed unneeded parameter from ContentModel::setContentList() 10 years ago
dteviot 84762c4eb8 Progress bar at 0% shows no text. 10 years ago
MiroslavR 47c053444f Make the jail progress last one second 10 years ago
Marc Zinnschlag 8e007c91fd Merge remote-tracking branch 'jordan-ayers/bugfix/1533' 10 years ago
Marc Zinnschlag 07c27065d6 Merge remote-tracking branch 'slothlife/msvc-warning-fixes' 10 years ago
scrawl 68f89318e7 Fix canvas align in skill view 10 years ago
Jordan Ayers 5edafc2a4c Cleanup: Add const to read-only CellRefList access.
OMW Bug #1533
10 years ago
Jordan Ayers 399259a95c Improve CellStore exception messages. 10 years ago
scrawl 387969bf42 Remove an old .gitignore 10 years ago
dteviot f6128a85b2 resolve symlinks when searching for file's last modified time. 10 years ago
Jordan Ayers c21b59ecff Teleportation: Avoid marking searched cells as changed.
OMW Bug #1533
Only mark cells with the target marker / evidence chest as 'changed'.
10 years ago
scrawl 5eadffd0c4 Make launcher's version label selectable so it can be copy-pasted into issue reports 10 years ago
dteviot 514fba5f73 On Windows content list imported from morrowind.ini is sorted by file modified time stamps. 10 years ago