Marc Zinnschlag
26bd2be1e8
Merge branch 'equipment' into next
2012-02-23 13:02:20 +01:00
Marc Zinnschlag
8f60d5b180
made container store data members private
2012-02-23 13:01:53 +01:00
Marc Zinnschlag
af23cc352e
more cleanup
2012-02-23 12:58:12 +01:00
Marc Zinnschlag
699246e54b
removed insertIntoContainer function from MWWorld::Class hierarchy
2012-02-23 12:53:48 +01:00
Marc Zinnschlag
f39aa2a68d
changed take action to use the new container store interface
2012-02-23 12:38:25 +01:00
Marc Zinnschlag
1d551030d1
container related script instruction are using the new container interface now
2012-02-23 12:34:51 +01:00
Marc Zinnschlag
e13e858c7a
fixed container store iterator; new add function
2012-02-23 12:34:25 +01:00
Marc Zinnschlag
b7ea110632
manually created objects were initialised incompletely
2012-02-23 12:33:50 +01:00
Marc Zinnschlag
db205cf8aa
Merge remote branch 'scrawl/next' into test
...
Conflicts:
libs/openengine
2012-02-20 14:54:08 +01:00
Marc Zinnschlag
e02cba58b1
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
2012-02-20 14:34:27 +01:00
Marc Zinnschlag
1beaea0115
forgot to add cone file
2012-02-20 14:14:39 +01:00
Marc Zinnschlag
ade6658d4d
Merge remote branch 'ace/win-packaging'
2012-02-20 14:11:22 +01:00
Marc Zinnschlag
781b16a00e
removed bCollision variable from World
2012-02-20 14:07:16 +01:00
Marc Zinnschlag
7eae24bb45
some fixes
2012-02-20 14:02:24 +01:00
Marc Zinnschlag
4a16553acc
replaced an include with a forward declaration
2012-02-20 12:44:17 +01:00
Marc Zinnschlag
e3e6b3809f
added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write)
2012-02-20 12:38:34 +01:00
Jason Hooks
7e1e746201
More changes
2012-02-19 17:59:50 -05:00
scrawl
60856b46e6
moved the renderer update call from OMW::Engine to RenderingManager
2012-02-19 23:22:29 +01:00
Jason Hooks
38a0d1d1c5
Merging in master
2012-02-19 15:39:12 -05:00
Jason Hooks
e330c22d68
Removing unneeded files
2012-02-19 02:04:47 -05:00
Jason Hooks
e58f2f5363
Eliminating unnecessary data from skeletons and shape saving
2012-02-19 02:01:15 -05:00
Jason Hooks
2217847c57
Fixing a crash
2012-02-18 15:29:40 -05:00
scrawl
457d9fd9f8
updated vmformat.txt
2012-02-18 18:30:01 +01:00
scrawl
f81b615976
implemented script functions FadeIn, FadeOut, FadeTo
2012-02-18 18:25:28 +01:00
scrawl
899aa5b870
fix last commit, also reacts to ToggleWireframe and not only twf
2012-02-18 16:36:54 +01:00
scrawl
40e23fe26f
added twf console command
2012-02-18 16:06:03 +01:00
Alexander "Ace" Olofsson
6a71cf21b0
Added OpenAL redistributable to OpenMW installer
2012-02-16 08:52:26 +01:00
Marc Zinnschlag
10d4771550
Merge remote branch 'corristo/osx-packaging'
2012-02-13 16:35:13 +01:00
Marc Zinnschlag
1a6a49b9b8
Merge remote branch 'lgro/fix_warnings'
2012-02-13 11:06:41 +01:00
Nikolay Kasyanov
5a42c6c6f5
Feature #162 - Need to create app bundle using CMake, not by hand WIP. Removed libpng dependency from launcher
2012-02-13 10:31:43 +04:00
Lukasz Gromanowski
8829d46bda
Clean up compilation warnings.
...
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-12 15:45:08 +01:00
Marc Zinnschlag
273eac12a1
Merge remote branch 'jhooks/animation2' into animation2
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
components/nifogre/ogre_nif_loader.cpp
2012-02-12 13:41:06 +01:00
Marc Zinnschlag
facc36fa34
Merge remote branch 'corristo/osx-packaging' into packaging
2012-02-12 13:35:54 +01:00
Marc Zinnschlag
8ae2120e15
Merge remote branch 'ace/win-packaging' into packaging
2012-02-12 13:35:33 +01:00
Marc Zinnschlag
a0ac6e5150
cells were sometimes not fully loaded
2012-02-12 12:35:29 +01:00
Marc Zinnschlag
bc71fb47e0
minor fix
2012-02-10 21:24:33 +01:00
Pieter van der Kloet
17b1546dc1
Changed the way screenshots are created (Bug #191 )
2012-02-10 20:23:59 +01:00
Marc Zinnschlag
4fcb721054
openengine update (physics crash workaround
2012-02-10 14:59:22 +01:00
Marc Zinnschlag
bb7730a708
Merge branch 'lightfix'
2012-02-10 14:55:52 +01:00
gugus
597e670eef
corrected the light problem
2012-02-10 14:51:49 +01:00
Marc Zinnschlag
00ac2deefb
Merge remote branch 'pvdk/cmakeogre' into cmakeogre
2012-02-10 14:36:34 +01:00
Marc Zinnschlag
b878c87ba8
Merge branch 'renderingfix'
2012-02-10 14:33:27 +01:00
Pieter van der Kloet
7bf8497215
Fixed CMake problem with Ogre plugins path
2012-02-07 21:41:08 +01:00
Pieter van der Kloet
efe3a3fcbe
Merge branch 'master' of https://github.com/zinnschlag/openmw into cmakeogre
2012-02-07 21:38:16 +01:00
Marc Zinnschlag
c4e028effe
fixing a faulty include
2012-02-06 10:48:58 +01:00
Marc Zinnschlag
0b0254d30e
spelling fix
2012-02-06 10:48:14 +01:00
Marc Zinnschlag
784c6fe0ff
some cleanup
2012-02-06 10:41:13 +01:00
Marc Zinnschlag
e1600d9a2a
fixed movable object cleanup for ordinary objects
2012-02-06 10:29:18 +01:00
Marc Zinnschlag
c471aa950f
re-enabled batching for statics; fixed a misplaced assert
2012-02-06 09:42:24 +01:00
Marc Zinnschlag
ee02154805
lights without a mesh were not rendered
2012-02-04 10:48:15 +01:00