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
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
ff8da265ed
applying new interface vol.9, inconsistent
2012-11-06 12:36:21 +04:00
emoose
5c1b3fc043
Fixed: scene: adjust rotation/scale when creating objects
2012-11-05 20:45:04 +00: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
accf8b2f71
Updated Bug #430 fix so it only moves the player now
2012-11-04 23:26:26 +00: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
emoose
15f972cc62
fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit
...
todo: going from CharacterCreation back to CreateClassDialog loses data
2012-11-02 20:33:08 +00:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
2f0b47fc38
test
2012-09-13 00:21:58 +02:00
scrawl
d5a08e31e7
scene does not disappear anymore during load
2012-09-11 17:36:20 +02:00
scrawl
2b339f6c0f
loading screen
2012-09-11 16:37:54 +02: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
484cce12a8
Issue #107 : removed redundant getStore function from window manager
2012-08-12 14:36:46 +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
45306e4bc3
fixed rotation adjustment
2012-08-11 13:23:54 +04:00
greye
5018db3332
removed some redundant code, added some comments
2012-08-11 12:13:16 +04: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
f2a2e5f57d
remove MWWorld::Player::setPos()
2012-07-31 19:30:24 +04:00
greye
26595f22f6
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
2012-07-26 16:14:11 +04:00
greye
49b1d5e127
fix object placing
2012-07-25 20:31:39 +04:00
greye
e1c7d1f529
fixed item sinking
2012-07-25 20:31:39 +04:00
greye
61cb012ee7
moving Scene::insertObject to CellStore::insertObject, part 1
2012-07-25 20:31:39 +04:00
greye
b760225179
wrong branch
...
This reverts commit d36d6aacf4
.
2012-07-24 00:00:10 +04:00
greye
d36d6aacf4
move Scene::insertObject to CellStore::insertObject, part 1
2012-07-23 23:56:20 +04:00
greye
9a2690f849
Revert "wrong"
...
This reverts commit 3aa53fea32
.
2012-07-23 23:07:28 +04:00
greye
3aa53fea32
wrong
2012-07-23 23:06:53 +04:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Marc Zinnschlag
87667ab57e
Issue #107 : Ptr related include cleanup
2012-07-03 13:55:53 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
scrawl
36d26e0681
set the camera orientation after using teleport doors
2012-05-30 15:52:39 +02:00
Marc Zinnschlag
0131c53005
Issue #176 : removed enable/disable functions from MWWorld::Class
2012-05-25 17:28:27 +02:00
scrawl
1f85475536
Merge branch 'master' into inventoryGUI
2012-05-17 19:03:41 +02:00
scrawl
ae77e7b0d8
don't try to retrieve land data from non-predefined cells.
2012-05-17 18:11:34 +02:00
Marc Zinnschlag
6b74fec8ed
don't do a half finished cell change, when trying to switch to an interior cell that does not exist
2012-05-17 17:13:41 +02:00
scrawl
fca9f1fc5f
gold dropping works without crash, but the code needs clean up.
2012-05-16 22:56:54 +02:00
scrawl
178ad876d7
fix for objects other than Miscellaneous.
2012-05-16 22:17:13 +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
d3e162ec83
dropping items works
2012-05-14 17:41:17 +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