David Cernat
38ccc2671c
Merge pull request #164 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
8 years ago
scrawl
3693f05ef5
Transform world-space particle systems in update callback so that animations are accounted for
8 years ago
scrawl
c45013c983
Fix particle systems not being rendered in their first frame
8 years ago
David Cernat
a1988ac6ef
Merge pull request #161 from OpenMW/master
...
Add OpenMW commits up to 21 Feb 2017
8 years ago
scrawl
4aa40d16bc
Increase the importance of light radius when sorting lights (Bug #2759 )
8 years ago
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
8 years ago
Koncord
158e9b3b09
[Server] Add ability to set password to server from config & scripts
8 years ago
David Cernat
3e50cf60e7
[General] Update version to 0.5.0
8 years ago
David Cernat
a4526605a6
[General] Remove goldValue from ContainerItem because it is never useful
8 years ago
David Cernat
cdffbc05f7
Merge pull request #159 from OpenMW/master
...
Add OpenMW commits up to 19 Feb 2017
8 years ago
scrawl
3b24bb9a5e
Use OS X cursor workaround for GL_VENDOR ATI and add an environment variable for control
8 years ago
David Cernat
4f2b88df8a
[General] Remove owner var from ContainerItem because it is always empty
8 years ago
David Cernat
d9a566f0f6
Merge pull request #156 from OpenMW/master
...
Add OpenMW commits up to 18 Feb 2017
8 years ago
scrawl
aa8459b5c7
Revert "Remove redundant allocations for NIF meshes"
...
This reverts commit a7c5beb7c5
.
Conflicts:
components/nif/data.cpp
components/nifbullet/bulletnifloader.cpp
components/nifosg/nifloader.cpp
8 years ago
scrawl
6a37909ee7
Revert "Fix race conditions caused by Array <-> GLBufferObject interactions (Bug #3580 )"
...
This reverts commit 115e563a7a
.
8 years ago
David Cernat
941d6269c1
[General] Slightly reorder variables in ID_OBJECT_PLACE
8 years ago
David Cernat
27c4015f50
[General] Remove unused packet placeholder ID_OBJECT_HEALTH
8 years ago
David Cernat
c32c004516
Merge pull request #151 from OpenMW/master
...
Add OpenMW commits up to 16 Feb 2017
8 years ago
scrawl
57b585570a
Preload magic effect visuals of the player's selected weapon/spell
8 years ago
David Cernat
3b604a432e
[General] Restructure ID_CONTAINER to allow multiple containers at once
8 years ago
David Cernat
c8cbfbef62
[General] Sketch out server requests to players for container data
8 years ago
David Cernat
2ed9ae5739
Merge pull request #149 from OpenMW/master
...
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
8 years ago
scrawl
e00b420f68
Move saving of LandData into Land::save
8 years ago
scrawl
325bf66653
Return const Land in ESMStore
8 years ago
David Cernat
a5d7c5fd39
Merge pull request #148 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2017
8 years ago
Marc Zinnschlag
93c5630e02
Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents'
8 years ago
scrawl
892d1b162d
nifloader: ignore nodes named 'bounding box' ( Fixes #3650 )
8 years ago
MAtahualpa
b4ef9e2314
Update loadbook.cpp
8 years ago
MAtahualpa
5a58ab1837
Update loadbook.hpp
8 years ago
David Cernat
6763718412
Merge pull request #146 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/actors.cpp
8 years ago
scrawl
bbcba57495
Disable hitAttemptActorId saving code for now
8 years ago
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
8 years ago
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 years ago
scrawl
67e4a7e37b
Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead
8 years ago
scrawl
d141b98f0c
Add base animations to preloadCommonAssets
8 years ago
scrawl
839928e210
Fix light data being reset for the wrong light
8 years ago
scrawl
a46593fa74
Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread
8 years ago
scrawl
d3e1dbe920
Fix race conditions in terrain loader caused by static variables
8 years ago
scrawl
4d53ab6c32
nifloader: attempt to remove redundant root node when a Skeleton is added
8 years ago
scrawl
2a42c4781e
nifloader: override animflags instead of accumulating them
8 years ago
scrawl
0187f2ce4c
nifloader: combine animFlags and particleFlags (Bug #2100 )
8 years ago
scrawl
bccfd6cef8
nifloader: handle textures with no image that are later assigned in a FlipController
...
As found in vurt's trees (Bug #2100 )
8 years ago
scrawl
792f505b2a
Fix potential crash in ShaderVisitor for textures with no image assigned
8 years ago
scrawl
45ae8d5ffa
Add support for GL_AMBIENT colorMode to shaders as required by particle systems
8 years ago
scrawl
c00532d82d
Add LightStateCache to avoid redundantly setting the same gl_Light
...
Normally, osg::State would do this for us (via lastAppliedAttribute), but since we're using a custom StateAttribute to apply all lights at once, we have to track ourselves.
Further reduction of GL calls in a typical scene by ~2%
8 years ago
scrawl
4d4dc1b9c1
Add specialized DisableLight state attribute for more efficient undoing of light state
...
Seems to reduce # of GL calls by 10-15% in a typical scene.
8 years ago
David Cernat
6144ca95d8
Set version to 0.4.2
8 years ago
David Cernat
5038353792
[General] Rename BaseEvent's state into doorState & adjust related funcs
8 years ago