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
scrawl
c8562d8442
toggleCollisionBoxes actually does something useful now
2012-11-20 02:20:54 +01:00
scrawl
f5355e3e92
512x512 map, slightly faster
2012-11-16 22:26:00 +01:00
scrawl
dc67a547b0
global map explored overlay
2012-11-16 19:34:09 +01:00
scrawl
aefde3f5bc
Merge branch 'master' into globalmap
2012-11-15 13:21:24 +01:00
scrawl
7c22690116
Merge branch 'next' into globalmap
2012-11-10 21:19:10 +01:00
greye
50867e8d87
fix gender selection update, main model visibility and couple of crashes
2012-11-10 19:57:50 +04:00
greye
235b565bb7
update main character model
2012-11-10 11:51:48 +04:00
greye
b1ef0026a9
race selection/inventory preview character model update
2012-11-10 11:41:12 +04:00
greye
c3f0dc0dfb
m prefix for NpcAnimation members
2012-11-08 23:11:43 +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
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
2012-11-06 20:37:29 +01:00
Marc Zinnschlag
6d5333be05
some code cleanup
2012-11-06 13:08:25 +01:00
greye
e74b2c060d
disable createRecord(), Land constness hack, various fixes with Store<T> interface
2012-11-06 13:14:03 +04:00
greye
932a9dc6f9
applying new interface vol.8, inconsistent
2012-11-06 11:53:00 +04:00
emoose
5c1b3fc043
Fixed: scene: adjust rotation/scale when creating objects
2012-11-05 20:45: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
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
scrawl
38828acac9
transparent overlay
2012-11-04 12:13:04 +01:00
scrawl
b7aa7e4cef
pause all animations
2012-11-04 11:57:51 +01: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
greye
9f923e7963
fix crashing if /home/greye/.cache not exist
2012-10-25 15:14:34 +04:00
Marc Zinnschlag
e05e683da3
Merge remote-tracking branch 'scrawl/spellcreation'
2012-10-12 17:19:30 +02:00
Marc Zinnschlag
35d099a638
disabling gcc extensions
2012-10-09 17:10:25 +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
21493c2dbd
added magic effect flags from Research wiki page
2012-10-01 23:33:07 +02:00
scrawl
fa358ab196
change the inventory preview to "inventoryhandtohand" animation pose
2012-10-01 18:04:21 +02:00
Marc Zinnschlag
35d7b5e5b0
Merge remote-tracking branch 'greye/record_saving'
2012-10-01 09:50:20 +02:00
Marc Zinnschlag
29633bd02f
Merge remote-tracking branch 'greye/master'
2012-10-01 09:46:20 +02:00
greye
f907a6a86f
updateListener() every frame
2012-10-01 11:24:44 +04:00
Chris Robinson
6942fa97da
Specify a proper up vector for the listener
2012-09-30 17:23:05 -07:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
Marc Zinnschlag
20a263738a
Merge remote-tracking branch 'chris/animation'
2012-09-29 12:39:56 +02:00
Chris Robinson
41f80908d9
Simplify getting the stop time when playing all animation groups
2012-09-29 01:10:49 -07:00
Chris Robinson
cd8515396a
Use a multimap to store the text keys
2012-09-28 23:20:15 -07:00
scrawl
044ab3d2b6
fix error in framelistener with tcg enabled
2012-09-28 17:02:18 +02:00
scrawl
359824d614
oops
2012-09-25 21:49:34 +02:00
scrawl
4453459378
re-use the texture across preview instances
2012-09-25 21:49:34 +02:00
scrawl
e2b1329620
fix the race selection escape crash
2012-09-25 21:49:34 +02:00
scrawl
9f2668b45b
Task #400 Review GMST access
2012-09-22 21:35:57 +02:00
scrawl
78b2d51cfc
fix a map crash
2012-09-22 16:52:31 +02:00
scrawl
47d9fae89f
don't use cache
2012-09-21 20:35:50 +02:00
scrawl
f49401bb53
center map on the player, dynamic map size
2012-09-21 16:26:04 +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
greye
2d5ddd104b
Land::loadData rework
2012-09-21 12:12:16 +04:00
