cc9cii
cc6153eb8e
Removed temporary key bindings.
2014-10-06 14:21:44 +11:00
cc9cii
6d687993b8
Remove C++11 stuff.
2014-10-06 14:08:35 +11:00
cc9cii
e38417e662
Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide.
...
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.
2014-10-06 13:55:36 +11:00
cc9cii
dbb2781817
Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.
2014-10-06 08:20:09 +11:00
cc9cii
85d93807c5
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
2014-10-05 19:25:37 +11:00
cc9cii
c9e054cdd7
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9
.
2014-10-04 06:20:10 +10:00
cc9cii
3aea1bf5f9
CMake changes for using Ogre Overlay.
2014-10-04 05:48:56 +10:00
Marc Zinnschlag
9fd82212b3
Merge remote-tracking branch 'cc9cii/opencs-settings'
2014-10-03 13:11:05 +02:00
scrawl
81a9dc0655
Hotfix for not being able to scroll the world map
2014-10-02 22:44:06 +02:00
cc9cii
115841d31d
Do not save window size on exit.
2014-10-03 05:59:24 +10:00
scrawl
083bcaf483
Fix journal quest logs not being marked finished when there are multiple quest IDs in the log
2014-10-02 19:26:37 +02:00
scrawl
8dc20712de
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-02 18:22:39 +02:00
scrawl
58672c6bb5
Fix for crash in main menu when reflections are enabled
2014-10-02 18:12:49 +02:00
scrawl
db086a4d89
Remove unused PairCachingGhostObject
2014-10-02 17:23:43 +02:00
Marc Zinnschlag
a166034e12
Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup'
2014-10-02 17:19:32 +02:00
Marc Zinnschlag
f64964d5dd
Merge remote-tracking branch 'scrawl/master'
2014-10-02 17:04:10 +02:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
eda296f1e3
Remove workaround for Ogre 1.8 (no longer supported)
2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6
Don't sell racial spells ( Fixes #1961 )
2014-10-02 16:50:05 +02:00
scrawl
cc63f7f051
Fix broken idle camera
2014-10-02 14:23:13 +02:00
scrawl
afbd2de511
Fix broken alchemy magnitude/duration
2014-10-02 13:55:42 +02:00
scrawl
7e10818bdf
Fix uninitialized flags for custom-made spells
2014-10-02 13:55:42 +02:00
scrawl
d99e416208
Remove some unused methods from OEngine::Gui::Layout
2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67
Remove comment for old MyGUI version
2014-10-02 13:55:42 +02:00
scrawl
a33514fa1d
More shader compatibility fixes
2014-10-02 13:55:36 +02:00
Marc Zinnschlag
ce52735df6
Merge remote-tracking branch 'cc9cii/Bug-No-1750'
2014-10-02 08:43:59 +02:00
Jordan Ayers
3bc91c66e6
Disease Check: Shorten the resistance calculations.
2014-10-01 19:29:03 -05:00
Jordan Ayers
a9a0930b85
Disease check: Reuse corprus check from spells.hpp.
2014-10-01 19:26:25 -05:00
scrawl
1c51694aa9
Don't update physics and animation for actors outside the AI processing distance
2014-10-02 00:27:04 +02:00
scrawl
cd52002740
Remove some unneeded bits from collision mask
2014-10-02 00:27:04 +02:00
scrawl
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
2014-10-02 00:27:03 +02:00
scrawl
85f5754bb6
Apply third person camera distance to the camera node instead of only the camera itself ( Fixes #1705 )
2014-10-02 00:26:57 +02:00
cc9cii
517a797a3e
Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.
2014-10-02 07:00:15 +10:00
scrawl
f9b6cc468d
Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action ( Fixes #1960 )
2014-10-01 17:54:18 +02:00
scrawl
46adf6344a
Adjust third person camera height and default distance to match vanilla MW
2014-10-01 17:45:20 +02:00
cc9cii
5ffb740120
Fix silly mistake (thanks scrawl for picking that up)
2014-10-01 07:19:15 +10:00
scrawl
ee8b85aa2c
Fix priority bug in AiSequence::stack ( Fixes #1959 )
2014-09-30 22:57:38 +02:00
scrawl
c826de49a5
Potential shader compatibility fix
2014-09-30 22:57:00 +02:00
scrawl
795dfdb557
Fix size_t underflow for journals with 1 page ( Fixes #1958 )
2014-09-30 18:14:25 +02:00
scrawl
c010c28337
Implement ToggleWorld instruction
2014-09-30 15:54:09 +02:00
Marc Zinnschlag
850a40d4e2
fixed resources table drag source problem
2014-09-30 13:15:15 +02:00
cc9cii
a9745cce1e
Suppress some compiler warnings.
2014-09-30 21:02:31 +10:00
cc9cii
dee090355f
Changes to compile on Ubuntu 14.04.
2014-09-30 19:23:19 +10:00
cc9cii
687b62dfd3
Revert some changes (mostly iostream adds)
2014-09-30 18:46:26 +10:00
Jordan Ayers
da9d858201
Add 'const' to a spell helper function.
2014-09-29 20:59:10 -05:00
cc9cii
312b7cd571
Merge branch 'master' into QtOGre
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
components/nif/niffile.hpp
libs/openengine/bullet/physic.hpp
2014-09-30 10:52:04 +10:00
scrawl
3e153d0a9b
Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2
2014-09-29 22:30:21 +02:00
scrawl
b345c50a86
Run stepSimulation before moving actors
...
Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.
2014-09-29 14:55:31 +02:00
scrawl
7f18f85a1d
Forgot const
2014-09-29 12:04:19 +02:00
cc9cii
7675df60ba
Fix far clip distance (again), workaround for broken settings minimum value.
2014-09-29 08:17:51 +10:00