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.
2012-06-10 11:14:46 +02:00
scrawl
0ba0b2122e
set the implicit object for script excution by clicking on it
2012-06-02 12:25:24 +02:00
scrawl
738e107b52
Merge branch 'master' into next
2012-05-26 05:31:32 +02:00
Marc Zinnschlag
0131c53005
Issue #176 : removed enable/disable functions from MWWorld::Class
2012-05-25 17:28:27 +02:00
Marc Zinnschlag
684208dfc9
Issue #176 : when deleting objects, don't go through disable to remove actors from the mechanics manager
2012-05-24 13:26:07 +02:00
scrawl
656a8f1be9
working menu transparency slider
2012-05-23 01:32:36 +02:00
Marc Zinnschlag
3e85151c9d
Merge remote branch 'scrawl/inventoryGUI'
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-05-21 10:13:27 +02:00
Marc Zinnschlag
74ae3605e0
Issue #256 : added getTimeStamp function to World
2012-05-19 09:31:45 +02:00
scrawl
fca9f1fc5f
gold dropping works without crash, but the code needs clean up.
2012-05-16 22:56:54 +02:00
scrawl
5875ce5128
select the correct gold base object (still crashing)
2012-05-16 22:13:56 +02:00
scrawl
f73d3ad33f
fix to the "drop object on ground" feature. still crashes for gold.
2012-05-16 21:27:02 +02:00
scrawl
ca4fa21d64
removed the attempt to unify activation and use scripts which was incorrect
2012-05-15 20:51:19 +02:00
scrawl
ab6336b745
using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)
2012-05-15 18:05:53 +02:00
scrawl
b18ee198b4
use a raycast to determine where to place object, if distance is too far
...
drop it on the ground
2012-05-15 16:47:23 +02:00
scrawl
933a40de14
better floating object label positioning.
2012-05-14 21:37:43 +02:00
scrawl
d3e162ec83
dropping items works
2012-05-14 17:41:17 +02:00
scrawl
6acb777c5a
minimum framerate fix
2012-05-01 20:51:32 +02:00
scrawl
86b6184f43
pMove in a seperate loop with fixed timestep to prevent frame-dependent movement
2012-04-30 23:55:22 +02:00
scrawl
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
2012-04-30 18:46:51 +02:00
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
2012-04-24 02:02:03 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
scrawl
d37bc9cba8
basic mouse-over info for in-game objects
2012-04-15 17:10:08 +02:00
scrawl
75dd651205
Merge branch 'terraincollision' into physicsterrain
...
Conflicts:
apps/openmw/mwworld/physicssystem.cpp
2012-04-09 13:56:09 +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
48b7b03453
typo; World::getFallback(std::string key, std::string def)
2012-04-04 16:15:15 +02:00
Sebastian Wick
16e7bf353a
remove debug message
2012-04-04 16:08:46 +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
c0af3c7241
Merge branch 'master' into terraincollision
...
Conflicts:
apps/openmw/mwworld/scene.cpp
2012-04-02 19:57:58 +02:00
scrawl
e0631dd9be
Merge branch 'master' into minimap
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-04-02 14:38:02 +02:00
Marc Zinnschlag
cdd0182912
Merge remote branch 'scrawl/occlusionquery'
...
Reduced cout spam
Conflicts:
apps/openmw/mwrender/occlusionquery.cpp
2012-04-02 11:33:16 +02:00
scrawl
0a5757791c
Merge branch 'master' into minimap
2012-04-01 20:17:07 +02:00
scrawl
ee754eda6c
don't create sky until entering an exterior cell
2012-04-01 15:07:41 +02:00
scrawl
df8e0bbff2
player check
2012-04-01 14:53:41 +02:00
scrawl
80456778be
fix for pickup up transparent objects, workaround for doors
2012-04-01 14:22:04 +02:00
scrawl
521b9eec6c
Merge branch 'master' into minimap
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/world.cpp
2012-03-30 15:31:07 +02:00
scrawl
4a6d034591
Merge branch 'master' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
2012-03-30 14:39:42 +02:00
scrawl
79c2a2e465
implemented toggleWater (twa); formatting again
2012-03-29 18:33:08 +02:00
scrawl
01ecf3e0be
attempt at rotation (BROKEN)
2012-03-29 18:16:11 +02:00
scrawl
37e6db69d8
fix
2012-03-29 17:07:59 +02:00
scrawl
f497813043
formatting, added Water::setHeight
2012-03-29 15:49:24 +02:00
scrawl
39b3afb98f
use camera height instead of player height for underwater check
2012-03-29 05:03:34 +02:00
scrawl
4249d2c536
add getNorthVector method
2012-03-28 03:15:10 +02:00
scrawl
43b1f896f4
fix object pickup when player is very close to object
2012-03-27 22:36:02 +02:00
scrawl
8f6d10f229
fix uninitalised stuff
2012-03-27 20:59:58 +02:00
scrawl
53d4be5cf6
object pickup should work everywhere
2012-03-25 20:52:56 +02:00
scrawl
743ea0c9be
use hardware occlusion query for sun glare effect
2012-03-24 17:59:26 +01:00
Jason Hooks
51fb9e67cd
Merge
2012-03-18 21:31:31 -04:00
scrawl
a67cc8e73b
more fixes
2012-03-16 19:02:33 +01:00
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
