Chris Robinson
63af72c315
Avoid converting to and from quaternions
2013-03-30 17:31:16 -07:00
Marc Zinnschlag
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
2013-03-29 16:48:21 +01:00
Glorf
6643fe789c
Enchanting system
2013-03-28 17:41:00 +01:00
scrawl
918cdcffc2
Split up components/esm/loadlocks
2013-03-22 05:50:54 +01:00
Glorf
f5bf7254a8
Minor console selection improvements
2013-03-18 23:46:17 +01:00
Glorf
a07c910d0b
Feature #535 : Console object selection improvements
2013-03-18 21:33:12 +01:00
Marc Zinnschlag
08f6d04960
constness fixes
2013-03-18 08:29:40 +01:00
Marc Zinnschlag
19c3b5516d
Merge remote-tracking branch 'glorf/fallbacks-next' into next
2013-03-18 08:14:25 +01:00
Glorf
ea7f386e7d
Access to Fallback via getFallback
2013-03-17 13:50:15 +01:00
scrawl
dd57eabc3e
Better use an enum for magic effect IDs
2013-03-16 23:28:26 +01:00
Glorf
521bebd2f4
Fallback system rewritten, added light fallbacks
2013-03-15 10:17:30 +01:00
scrawl
41a958cd4e
Fix hardcoded beast races in MWClass::Npc::getModel
2013-03-12 02:50:23 +01:00
scrawl
46d8f3ce5a
Fix hardcoded race IDs
2013-03-12 02:44:03 +01:00
Glorf
aebd9a3700
Weather to pull
2013-03-10 00:24:14 +01:00
scrawl
5c94c654d4
Fix wrong rotation of objects dropped on the ground
2013-03-09 13:27:24 +01:00
scrawl
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
2013-03-08 23:46:25 +01:00
scrawl
66a754e9aa
Fix tooltip position when hovering the crosshair over NPCs
2013-03-07 15:25:22 +01:00
Marc Zinnschlag
642653d10e
World constructor fixes
2013-03-06 19:57:00 +01:00
Marc Zinnschlag
d839a4c6c2
Merge remote-tracking branch 'scrawl/graphics'
2013-03-05 16:31:22 +01:00
scrawl
fe7b2732d8
Avoid manually updating render targets from within frameRenderingQueued
2013-03-05 14:24:29 +01:00
Marc Zinnschlag
dc3edc6024
Merge branch 'vartype'
2013-03-05 10:59:08 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
scrawl
11f21a1988
Weather update should be before renderer update
2013-03-03 15:10:40 +01:00
Marc Zinnschlag
dc445844d2
Merge remote-tracking branch 'scrawl/z-up'
2013-02-26 14:37:50 +01:00
scrawl
cd68012498
Z-up conversion: raycasts
2013-02-26 14:28:35 +01:00
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
2013-02-26 13:39:10 +01:00
Marc Zinnschlag
bd9884b244
Merge remote-tracking branch 'chris/misc-cleanup'
2013-02-25 19:45:09 +01:00
Marc Zinnschlag
08f13ef5ab
Merge remote-tracking branch 'greye/master'
2013-02-25 19:34:03 +01:00
greye
661fd73c6e
fix rotation for objects in inactive cells and forced vanity mode
2013-02-25 22:00:50 +04:00
Chris Robinson
48271e49ec
Properly update the Ptr object in the mechanics manager when moving across cells
2013-02-25 09:57:34 -08:00
scrawl
355390429e
Fix World::isUnderwater to use dynamic waterlevel
2013-02-25 17:27:50 +01:00
greye
6a8c532244
fix and unify object cell change update in mwrender
2013-02-24 15:04:56 +04:00
Chris Robinson
0148db8ccf
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
2013-02-23 05:59:35 -08:00
greye
d983ed5c78
fix invalid SceneNode pointer on cell change
2013-02-23 16:45:55 +04:00
Chris Robinson
9c3af5f344
Do not interpret noclip mode as flying
2013-02-22 01:26:30 -08:00
Chris Robinson
cfdc820a1f
Make an actor fly when it has a levitate effect
2013-02-20 01:55:12 -08:00
Chris Robinson
5a1a0b7338
Add and use an MWWorld::isFlying method
2013-02-18 22:39:43 -08:00
scrawl
5d403ebdd3
Fix collision debug drawer (tcg)
2013-02-19 04:03:24 +01:00
Chris Robinson
ac717373b1
Add a method to check if an object is on the ground
2013-02-14 22:35:15 -08:00
Chris Robinson
18b606fddf
Use the PhysicActor's set/getOnGround method
2013-02-14 20:10:04 -08:00
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
2013-02-09 09:46:57 -08:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
Mark Siewert
55bd9eef66
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-09 13:03:35 +01:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Chris Robinson
8de2d24d0e
Restore old ground check
2013-02-06 21:57:59 -08:00
Chris Robinson
e577ee2de8
Add a method to set/retrieve being on the ground
2013-02-06 21:44:58 -08:00
Chris Robinson
bdda7278c4
Use 3/4ths of the physic actor's height to test if swimming
2013-02-06 12:56:30 -08:00
Marc Zinnschlag
43912f927a
Merge remote-tracking branch 'potatoesmaster/importer' into next
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-02-06 10:12:40 +01:00
Chris Robinson
9cf30f39bd
Don't apply gravity when swimming
2013-02-05 19:45:51 -08:00
Chris Robinson
2c39760bd5
Move the movement solver code to mwworld's physics system
2013-02-05 12:45:10 -08:00
Chris Robinson
0a4568bd11
Move the PtrMovementList typedef to MWWorld
...
Use it for the doPhysics parameter, too
2013-02-05 11:03:39 -08:00
Chris Robinson
2cdda96798
Clear out some unneeded doPhysics stuff
2013-02-05 10:23:26 -08:00
Chris Robinson
4bd1e63ac1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-02-05 03:26:46 -08:00
Marc Zinnschlag
c409f1184e
cleaned up object movement and fixed a bug regarding local scripts
2013-02-05 12:19:06 +01:00
Tom Mason
ac112ef972
refactored special variable code
2013-02-03 13:27:27 +00:00
Tom Mason
9ad08520fd
Implemented OnPCDrop special variable
...
Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.
2013-01-31 18:45:32 +00:00
Tom Mason
dc91211b12
Fixed Small bug where scripts were being removed when they shouldn't be.
...
Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.
2013-01-31 00:21:04 +00:00
Chris Robinson
fdabef65a1
Use a method to update an object's cell in the mechanics manager
...
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
2013-01-29 00:19:24 -08:00
Chris Robinson
8d98f3649c
Use a separate class to handle activator mechanics
2013-01-28 23:39:11 -08:00
Chris Robinson
7b71b4eb31
Add a missing include
2013-01-27 03:03:48 -08:00
Chris Robinson
0cd3880b20
Merge remote-tracking branch 'zini/master' into animation2
2013-01-26 04:54:52 -08:00
Mark Siewert
dca8dc4fdb
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/esmreader.hpp
- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
2013-01-25 18:22:01 +01:00
Tom Mason
f5f3c2e62d
enabling / disabling should not affect scripts
2013-01-21 20:06:08 +00:00
Tom Mason
31c71c029d
objects with scripts attached, that are inside containers will behave correctly when the container is moved
2013-01-20 17:01:30 +00:00
Tom Mason
23dada0ee4
moved script handling on enable / disable into their own functions
2013-01-20 16:38:56 +00:00
Tom Mason
28c580d280
disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly
2013-01-20 15:43:52 +00:00
Chris Robinson
d2f5a886c7
Handle playgroup and skipanim through mwmechanics
2013-01-16 17:53:18 -08:00
Chris Robinson
63e685ea39
Add a method to get the Animation from a Ptr
2013-01-16 09:59:19 -08:00
Tom Mason
c138e00aa2
objects scripts are now stopped when they are removed from a container
2013-01-13 17:05:12 +00:00
Tom Mason
3517635cfd
added Drop and DropSoulGem functions
2013-01-09 21:16:45 +00:00
Tom Mason
5bfdb2449d
allowed dropObjectOnGround to be used on npcs, not just player
2013-01-09 18:53:14 +00:00
Marc Zinnschlag
649ae645f3
Merge remote-tracking branch 'blunted2night/bug_495_v2'
2013-01-09 12:12:41 +01:00
Nathan Jeffords
719663d86e
added option to override the activation distance
...
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
2013-01-08 20:00:06 -08:00
Nathan Jeffords
b3932e3dea
added a separate activation distance for NPCs
2013-01-07 23:40:17 -08:00
Nathan Jeffords
b9fbd6ae4b
Factored faced object lookups into MWRender::World
...
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
* Changed it to return an object pointer
* Updated clients to use return object directly.
2013-01-07 23:38:08 -08:00
Nathan Jeffords
05dad29005
update MWWord::World to track distances while performing occlusion queries.
...
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
2013-01-07 23:11:15 -08:00
Nathan Jeffords
0108be2e4f
updated MWWorld::PhysicsSystem::getFacedXXX functions
...
* changed the names and return values to be consistent
* made the distance to search a parameter
* change the distance returned to world units instead of percentage of query distance
2013-01-07 23:00:00 -08:00
Nathan Jeffords
86f691d3d5
split MWWord::World::update into multiple functions
2013-01-07 22:48:24 -08:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
282601d6e9
support the allowSkipping extra parameter for playBink command.
2013-01-07 13:19:52 +01:00
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
greye
7e0713f6c4
fix string case update
2012-12-31 11:22:40 +04:00
eduard
69d9d22579
comparestring
2012-12-30 19:56:38 +01:00
eduard
98103e15eb
conflict resolution
2012-12-30 13:46:07 +01:00
eduard
c85400b809
Merge https://github.com/zinnschlag/openmw into comparestring
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
2012-12-30 13:09:37 +01:00
eduard
8545667bbd
string compare and tolower
2012-12-28 17:54:56 +01:00
Marc Zinnschlag
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
2012-12-26 15:50:03 +01:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +04:00
Tom Mason
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
2012-12-20 23:16:34 +00:00
scrawl
64210e6efa
Revert "New Game button"
...
This reverts commit c5dd0e1968
.
2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec
.
2012-12-18 19:09:08 +01:00
scrawl
86671096ec
remove commandline switch for new game
2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968
New Game button
2012-12-16 16:05:31 +01:00
scrawl
faad64b254
Esc cancels the video
2012-12-12 01:13:53 +01:00
scrawl
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
Marc Zinnschlag
8e1a2e3a13
Issue #474 : adjust global variable pcrace
2012-12-04 10:58:43 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
Mark Siewert
b103426cf0
- Partially reimplement deleting objects defined in a parent esX file.
...
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e
- Add some updated files missing from last commit.
...
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
Mark Siewert
31fb715bd7
- Add support for moving existing references by plugin files. No cell changing yet.
...
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
2012-11-17 21:50:25 +01:00
Mark Siewert
2175f13b67
- Add tracking for dependencies between plugins.
...
- Add reference number mangling required for moving references around.
2012-11-17 00:21:51 +01:00
Mark Siewert
42eefaf36f
- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned).
...
- Reference loader now (partially) supports MVRF tag.
2012-11-10 21:43:41 +01:00
greye
235b565bb7
update main character model
2012-11-10 11:51:48 +04:00
greye
83e758ee50
clean up interfaces
2012-11-08 16:37:57 +04:00
greye
2a06d72e32
remove unused custom character classes
2012-11-08 02:27:01 +04:00
greye
9dc9098fa7
update MWBase::World interface since records contains own id
2012-11-08 01:52:34 +04:00
greye
5b9621bca5
store player record data in ESMStore
2012-11-08 01:36:43 +04:00
greye
78740306db
non-const access to Store<T> from ESMStore
2012-11-08 01:21:54 +04:00
Marc Zinnschlag
918316168f
Merge remote-tracking branch 'greye/store' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
2012-11-07 19:34:28 +01:00
greye
11c0e6382f
make ESMStore setting up itself after loading
2012-11-07 15:41:59 +04:00
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
2012-11-06 20:37:29 +01:00
greye
9f1733a415
move record insertion to ESMStore
2012-11-06 17:51:38 +04:00
Marc Zinnschlag
d661d4f6d6
Merge remote-tracking branch 'emoose/bug-368' into next
2012-11-06 13:04:38 +01:00
greye
dccc157f4c
setting up
2012-11-06 15:26:55 +04:00
greye
242a9b5a59
various interface fixes, commented unused code
2012-11-06 14:03:36 +04:00
greye
e74b2c060d
disable createRecord(), Land constness hack, various fixes with Store<T> interface
2012-11-06 13:14:03 +04:00
greye
ff8da265ed
applying new interface vol.9, inconsistent
2012-11-06 12:36:21 +04:00
emoose
3e5b396b56
Changed: world: cleanup
2012-11-05 21:10:04 +00:00
emoose
e8e3c211a4
Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation
2012-11-05 19:56:20 +00:00
emoose
7a7825577a
Changed: use MWWorld::Ptr for PhysicsSystem arguments
2012-11-05 19:37:27 +00:00
Marc Zinnschlag
61942c9c4a
Issue #440 : Make day numbers start at 1 instead of 0
2012-11-05 18:01:50 +01:00
greye
d205723a17
resolving m prefix/ESMStore movement
2012-11-05 18:02:47 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
emoose
cadc753216
Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell
...
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
2012-11-03 19:29:55 +00:00
scrawl
33361e6539
Merge branch 'master' into spellcreation
2012-10-23 10:38:53 +02:00
scrawl
d76522e7a4
searchPtrViaHandle
2012-10-19 19:48:02 +02:00
scrawl
28cc480ce1
fix some alchemy issues and make the gui use the new implementation
2012-10-18 22:21:39 +02:00
scrawl
c991f68a2d
buying created spell
2012-10-15 21:54:19 +02:00
Mark Siewert
1f961d575e
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
components/esm/loadland.hpp
components/esm_store/reclists.hpp
2012-10-07 20:35:54 +02:00
Mark Siewert
28d4d7ea3f
Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
...
- Remove check for 255 master/plugin files.
2012-10-07 20:00:55 +02:00
scrawl
dc33dee22e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
2012-10-01 20:25:23 +02:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
greye
721324c1db
rm record inheritance, rework esmtool accordingly
2012-09-30 23:34:53 +04:00
scrawl
caef570c8a
fix the weather not changing when sleeping/waiting
2012-09-25 21:49:34 +02:00
scrawl
73c69e8eda
video playback
2012-09-25 02:35:50 +02:00
greye
807a56c9e4
fix dynamic potion id
2012-09-23 19:29:00 +04:00
scrawl
9f2668b45b
Task #400 Review GMST access
2012-09-22 21:35:57 +02:00
scrawl
9106e5307c
moved global map from RenderingManager to gui and removed world method
2012-09-21 14:11:01 +02:00
greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
Marc Zinnschlag
a3c680d20a
Merge remote-tracking branch 'scrawl/sleep_wait' into next
2012-09-19 09:41:32 +02:00
scrawl
bf5e30b24f
everything done except health/mana restore
2012-09-19 02:53:06 +02:00
scrawl
ab698bb401
date time label
2012-09-18 20:53:32 +02:00
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
2012-09-18 11:25:09 +02:00
Marc Zinnschlag
4469976be9
Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-09-18 10:44:25 +02:00
gugus
032ff7c879
Clean-up. There is still a little bug.
2012-09-17 13:36:48 +02:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
Jason Hooks
f586f53a42
positioning
2012-09-15 16:45:50 -04:00
scrawl
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
2012-09-15 00:57:29 +02:00
Marc Zinnschlag
b7c9285b24
added support for out of world rendering
2012-09-14 21:12:16 +02:00
scrawl
6ac2a12296
item selection working on the preview
2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0
race selection preview
2012-09-13 19:03:31 +02:00
scrawl
4f3eb3c34a
character preview WIP
2012-09-13 00:54:32 +02:00
Jason Hooks
23777033fd
Starting to implement new PhysicActor
2012-09-05 17:44:11 -04:00
Jason Hooks
2efceba1fc
Tearing apart PhysicActor
2012-09-03 20:32:20 -04:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
gugus
95c27723f7
fixed a bug (see commit reverted)
2012-09-02 18:12:13 +02:00
Jason Hooks
0697c7f7f4
Finally merged in master
2012-09-01 17:28:12 -04:00
scrawl
d9276ca09d
don't make copy of CellRefList in World::getNorthVector
2012-08-28 18:23:59 +02:00
scrawl
3c39c47e2f
don't make copies of CellRefList & LiveCellRef
2012-08-28 18:23:01 +02:00
scrawl
5834b4baa5
door markers on the local map
2012-08-28 17:30:34 +02:00
Marc Zinnschlag
40d4dad15e
Issue #378 : Fix (record wasn't build fully)
2012-08-28 09:32:38 +02:00
greye
6961830efb
using real player eye direction when moving
2012-08-17 15:19:44 +04:00
greye
392e6efcb5
initial player rendering
2012-08-17 15:19:43 +04:00
greye
c46eeaa100
initial 3d-person camera support
2012-08-17 15:19:43 +04:00
Jason Hooks
1f5bc229e0
Separate adjustRigidBody function
2012-08-14 18:04:58 -04:00
Marc Zinnschlag
88e70cb5bd
Merge branch 'decouple'
2012-08-12 18:11:17 +02:00
Marc Zinnschlag
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
2012-08-12 18:11:09 +02:00
Marc Zinnschlag
b68f9d6a28
Issue #107 : MechanicsManager is accessed only through the interface class from now on
2012-08-11 17:30:55 +02:00
greye
f7f8ac0a73
fix move/rotateObject code
2012-08-11 18:28:37 +04:00
Marc Zinnschlag
380defa52f
Merge remote branch 'greye/cross_cell-borders'
2012-08-11 15:08:17 +02:00
greye
47f7a5e988
fix double pos/rot adjustment
2012-08-11 17:01:55 +04:00
Marc Zinnschlag
766e782aae
Merge remote branch 'greye/cross_cell-borders'
2012-08-11 12:05:10 +02:00
greye
45306e4bc3
fixed rotation adjustment
2012-08-11 13:23:54 +04:00
scrawl
44ff31b50a
removed world exit methods
2012-08-10 16:21:53 +02:00
scrawl
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
2012-08-10 15:15:48 +02:00
greye
38b06aee6c
resolving conflicts
2012-08-09 21:49:00 +04:00
Marc Zinnschlag
aca08eb4c2
Merge branch 'decouple' into player_control
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
2012-08-09 16:12:10 +02:00
Marc Zinnschlag
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
2012-08-09 14:33:21 +02:00
greye
ec9cf4d3c6
rotateObject() added, input system rewritten
2012-08-09 00:15:52 +04:00
greye
b6f7f21bcf
fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added
2012-08-08 14:51:33 +04:00
greye
79b7487c87
fix using deleted objects
2012-08-07 22:21:46 +04:00
greye
d32a61b928
fix object moving
2012-08-06 18:20:48 +04:00
Marc Zinnschlag
1db7978361
silenced a warning
2012-08-04 22:03:14 +02:00
Marc Zinnschlag
0c5f886683
Merge remote branch 'greye/player_control'
2012-08-04 21:55:13 +02:00
greye
16ad97610d
add support for some scripting player control switches
2012-08-04 11:54:42 +04:00
Marc Zinnschlag
994e33e3d2
fixed object rotation code
2012-08-04 09:34:49 +02:00
greye
ff62770657
World::isUnderwater(), World::isSwimming()
2012-08-03 14:42:09 +04:00
greye
0e3f70413e
a very little comments
2012-07-31 16:52:21 +04:00
greye
288b63350c
fixed objects update, local script handling
2012-07-31 11:46:57 +04:00
greye
37990b5133
fix player update
2012-07-30 23:54:26 +04:00
greye
d6150b7482
high-level implementation, unstable
2012-07-30 23:28:14 +04:00
greye
aa5f63ffcc
disabled items placing handling
2012-07-26 19:06:48 +04:00
greye
26595f22f6
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
2012-07-26 16:14:11 +04:00
greye
cd04911f3c
dropping on the ground
2012-07-25 20:31:39 +04:00
greye
e7666d3a7f
move responsibility for cell changing from CellStore::insertObject to Class::moveToCell
2012-07-25 20:31:39 +04:00