Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
12 years ago
scrawl
4977c33e4c
fixed a stats window resizing problem that I introduced today
12 years ago
Marc Zinnschlag
6c03d7aec4
documentation fix
12 years ago
scrawl
9448ce5968
implemented "get<Control>Disabled" functions
12 years ago
scrawl
89ad2af1d9
key usage to open doors or containers
...
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
12 years ago
scrawl
fdc2a7433c
remove the wrong container open sound
12 years ago
scrawl
d581ac426e
useless cout message
12 years ago
scrawl
996e6280d8
more spell buying window cleanup
12 years ago
scrawl
ba0acd4056
changed some text colors
12 years ago
scrawl
fde69d0c87
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
12 years ago
scrawl
bc6a1979b0
replaced everything with the new method
12 years ago
Marc Zinnschlag
61c8a627aa
added a missing include
12 years ago
Marc Zinnschlag
273ac0a97f
Merge branch 'spellbuying'
12 years ago
Marc Zinnschlag
f17756712a
fixed spell list handling
12 years ago
Marc Zinnschlag
6c928e93d3
added missing initialisation of NPC/creature spell lists from ESX records
12 years ago
scrawl
b66c8099eb
new system for dynamic sizing of buttons & text boxes
12 years ago
scrawl
35dd49f948
fixed some "using namespace" in headers
12 years ago
scrawl
56061474c4
another 3 unnecessary lines
12 years ago
scrawl
bb267dddf6
some stats window cleanup
12 years ago
scrawl
432c089434
fix the spell tooltips to show the spell target
12 years ago
Marc Zinnschlag
bcf3a81a6c
and a tiny bit more of cleanup
12 years ago
Marc Zinnschlag
9c49ca1468
a bit more random cleanup
12 years ago
Marc Zinnschlag
06677a0fc8
fixed ID handling and some misc cleanup
12 years ago
Marc Zinnschlag
3fad1c0786
fixed a crash
12 years ago
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
12 years ago
Adam Hogan
562df5388f
Merge branch 'master' of git://github.com/zinnschlag/openmw
12 years ago
Adam Hogan
ebf80943a9
Added spell buying window
13 years ago
Lukasz Gromanowski
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
13 years ago
Jason Hooks
23777033fd
Starting to implement new PhysicActor
13 years ago
Marc Zinnschlag
0879abb948
Merge branch 'actiontarget'
13 years ago
Marc Zinnschlag
da041f902f
Issue #370 : fixed item taking sound
13 years ago
Marc Zinnschlag
482874f99e
Merge remote-tracking branch 'scrawl/cache'
13 years ago
Marc Zinnschlag
6813bafbfc
added missing sound effect for chest opening; minor cleanup
13 years ago
Marc Zinnschlag
fb8aae243d
Issue #370 : replaced custom target handling in talk action with base class implementation
13 years ago
Marc Zinnschlag
8ed8dd649a
Issue #370 : replaced custom target handling in take action with base class implementation
13 years ago
Marc Zinnschlag
ea1c3fe1e4
Issue #370 : replaced custom target handling in open action with base class implementation
13 years ago
Marc Zinnschlag
8c2b4f996c
Issue #370 : replaced custom target handling in equip action with base class implementation
13 years ago
Marc Zinnschlag
b51c42146f
Issue #370 : replaced custom target handling in read action with base class implementation
13 years ago
Marc Zinnschlag
3f181f9a9d
Issue #370 : Support for targets in containers
13 years ago
Marc Zinnschlag
cc55056adf
Issue #370 : replaced custom target handling in apply action with base class implementation
13 years ago
Marc Zinnschlag
733654d730
Issue #370 : implemented target handling in action base class
13 years ago
Marc Zinnschlag
1cecab6e3d
fixed RefData::getHandle
13 years ago
Marc Zinnschlag
ead04e1cc3
Issue #389 : added AI sequence to CreatureStats; execute AI packages during the regular actor update
13 years ago
Marc Zinnschlag
345eec1135
Issue #389 : added AI package base class and AI packages management class
13 years ago
Marc Zinnschlag
ef6f033dd1
Merge branch 'multidata'
13 years ago
Marc Zinnschlag
2284d76307
re-enabled local data directory support in launcher
13 years ago
Jason Hooks
2efceba1fc
Tearing apart PhysicActor
13 years ago
gugus
d261263824
oups forgot vmformat
13 years ago
scrawl
c27ff546e4
shader cache
13 years ago
gugus
95c27723f7
fixed a bug (see commit reverted)
13 years ago
gugus
99885e8ca4
Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p"
...
This reverts commit 165065d378
.
13 years ago
gugus
fa9f2b268b
PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe
13 years ago
scrawl
950bf66334
throw an exception if default value for a setting is not found
13 years ago
Jason Hooks
0697c7f7f4
Finally merged in master
13 years ago
Marc Zinnschlag
e2bf4694cb
Merge remote-tracking branch 'scrawl/master'
13 years ago
scrawl
760f05c454
the HUD can be toggled with F12 key; useful for screenshots
13 years ago
Marc Zinnschlag
bc34fab17f
Merge remote-tracking branch 'greye/aidata'
13 years ago
Michael Mc Donnell
3c3737ed78
Write error message for exception and fix warning
...
Provides details of what went wrong when reading the .esp and also fixes a warning on vs2010.
13 years ago
greye
a90547bbbe
code formatting
13 years ago
Marc Zinnschlag
81463fa23d
Issue #372 : fixed positions in SoundManager
13 years ago
scrawl
6ad08dfd33
added settings for crosshair & subtitles
13 years ago
Artem Kotsynyak
e9b2f4ee74
fix equipment visibility update
13 years ago
scrawl
1c5055c8ac
fix a problem where hovering a marker would render it on top of the fog of war instead of below
13 years ago
scrawl
7eaf5e7f0f
changed the markers to look more like morrowind's (hover effect)
13 years ago
scrawl
d9276ca09d
don't make copy of CellRefList in World::getNorthVector
13 years ago
scrawl
3c39c47e2f
don't make copies of CellRefList & LiveCellRef
13 years ago
scrawl
571d5095d4
removed a cout
13 years ago
scrawl
5834b4baa5
door markers on the local map
13 years ago
Marc Zinnschlag
40d4dad15e
Issue #378 : Fix (record wasn't build fully)
13 years ago
Marc Zinnschlag
160b52162b
Merge remote-tracking branch 'scrawl/quick_keys'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
13 years ago
scrawl
321f7c3419
fix an infinite recursion regression on several dialogs.
13 years ago
scrawl
5c28a67203
broke something in the last commit.
13 years ago
scrawl
4f19b7fb9b
fix leaks.
13 years ago
scrawl
bc36b0e2bd
remove the restriction on the last quick key
13 years ago
scrawl
6161f81c24
last bits of the quick key menu.
13 years ago
Marc Zinnschlag
14b4263143
Merge remote-tracking branch 'scrawl/alttab'
13 years ago
scrawl
dc8f9bd923
workaround for alt tab view mode toggle
13 years ago
scrawl
9af0b48ad6
show/hide crosshair correctly
13 years ago
scrawl
a4c1d979d6
Merge branch 'master' into quick_keys
13 years ago
scrawl
c5e55d3cac
fix screenshot function
13 years ago
greye
61923349e5
resolving conflicts
13 years ago
scrawl
5ebcaeb098
Merge branch 'next' into quick_keys
13 years ago
scrawl
b1a394552d
mouse click sounds
13 years ago
Marc Zinnschlag
d0cebea580
some cleanup
13 years ago
Marc Zinnschlag
450656a890
Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next
13 years ago
Marc Zinnschlag
ef4910293b
Merge remote-tracking branch 'corristo/osx_f_keys_fix' into next
13 years ago
Douglas Diniz
5cbb08fee1
Task 339 - Moving all sounds to actions
13 years ago
scrawl
c0f27bd5ef
magic selection window
13 years ago
scrawl
fab4cfecb1
some unfinished work on quick keys window
13 years ago
Marc Zinnschlag
1fd4d84173
Merge remote-tracking branch 'mmd/windowswarnings' into next
13 years ago
gugus
165065d378
fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p
13 years ago
Nikolay Kasyanov
71a6ce2202
removed cout spam
13 years ago
Nikolay Kasyanov
5395721c26
more appropriate fix for #189
13 years ago
Douglas Diniz
82e7c04c0a
Changing sounds to Action.
...
Adding onActor to Action to choose between playSound and playSound3D.
13 years ago
Lukasz Gromanowski
770f747eec
Added fix for not visible pthreads functions for linker with glibc 2.15
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
scrawl
f7d537cb28
very small correction
13 years ago
scrawl
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
13 years ago
Lukasz Gromanowski
34513cf16b
Added support for code coverage checking and unittests.
...
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
greye
e6c3e0744e
tvm update and fix
13 years ago
greye
5b2b378f25
tvm script instruction
13 years ago
Marc Zinnschlag
d1656b2f5d
Merge remote-tracking branch 'greye/player_control'
...
Conflicts:
apps/openmw/mwrender/player.cpp
13 years ago
gugus
cc01a5ceed
Merge branch 'next' of https://github.com/zinnschlag/openmw.git into object_movement_creation
13 years ago
gugus
f2d080d091
bugfix
13 years ago
greye
b8e56d61d3
update camera code, add idle time
13 years ago
greye
3f3972eb3b
no vanity in gui mode (thanks scrawl)
13 years ago
greye
d2b451eb7d
entering vanity mode
13 years ago
greye
b6954a4e8d
use the same height on non-1st person modes
13 years ago
scrawl
8817a9634c
don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)
13 years ago
Marc Zinnschlag
1da56e2832
removed some unused variables
13 years ago
greye
14f293882c
still resolving
13 years ago
greye
83356d5505
resolving conflicts
13 years ago
greye
7303d595dd
resolving conflicts
13 years ago
greye
4f10138a04
using real player sight angles on ray cast
13 years ago
greye
0e6e141fd4
camera control related script instructions
13 years ago
greye
60fb1e8df6
fix sky in preview mode movement
13 years ago
greye
6961830efb
using real player eye direction when moving
13 years ago
greye
e8fc942bef
reverse Z-axis rotation to make doors happy
13 years ago
greye
a453a7f035
camera adjustment, fix view mode on start
13 years ago
scrawl
34f796c38e
removed the far clip distance hack which is not needed anymore
13 years ago
scrawl
b97b3d7b71
fix sky position when reflection is enabled, fix delay in sky reflection
13 years ago
greye
575244bd35
fix SkaManager issue
13 years ago
greye
783e81afc3
fix 1st/preview/1st change; 1st invisible model
13 years ago
greye
392e6efcb5
initial player rendering
13 years ago
greye
6f87c0c36d
preview mode, advanced vanity support
13 years ago
greye
fe1a9ac3c5
poor camera with some fixes
13 years ago
greye
db94018865
far better camera movement
13 years ago
greye
a7aeda9a3b
initial vanity mode support
13 years ago
greye
c46eeaa100
initial 3d-person camera support
13 years ago
Jason Hooks
63a40e9ba3
npc xy disabled
13 years ago
Marc Zinnschlag
e97d23e626
Issue #361 : reset skill level in race selection stage
13 years ago
scrawl
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
Marc Zinnschlag
b0506e2220
re-enabling support for multiple data directories
13 years ago
Jason Hooks
8762f4a47a
boxrotation nif field; commented functions
13 years ago
Jason Hooks
7b8b4c366d
Set angle now working for npcs and creatures
13 years ago
Jason Hooks
1f5bc229e0
Separate adjustRigidBody function
13 years ago
scrawl
f9efd543e4
use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1
13 years ago
Michael Mc Donnell
b373d0ec7b
Correct struct to class in forward declarations
...
Fixes http://bugs.openmw.org/issues/362
13 years ago
scrawl
67577c6192
UI cursor & camera sensitivity sliders
13 years ago
scrawl
c7b8787c32
"reset to defaults" button, invert y axis button
13 years ago
scrawl
bc6e4feedc
hotkey window first version
13 years ago
scrawl
c4fe2e4e2a
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
scrawl
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
13 years ago
scrawl
90f1d9c2f2
OSX suggestion by corristo
13 years ago
scrawl
97c45455fd
fix WindowManager destruction
13 years ago
scrawl
86d6f190bf
Input system rewrite
13 years ago
Marc Zinnschlag
c4bf6214db
Merge remote branch 'scrawl/master'
13 years ago
Marc Zinnschlag
88e70cb5bd
Merge branch 'decouple'
13 years ago
Marc Zinnschlag
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
13 years ago
scrawl
b6f427bf5e
fix OpenMW not exiting when the window is closed (alt f4 etc)
13 years ago
Marc Zinnschlag
35a64edf2a
Issue #107 : removed a template from the window manager
13 years ago
Marc Zinnschlag
484cce12a8
Issue #107 : removed redundant getStore function from window manager
13 years ago
Marc Zinnschlag
f37d3cd3c9
Issue #107 : added a few todo comments
13 years ago
Marc Zinnschlag
4ca3cb81d4
Issue #107 : some include clean up
13 years ago
Marc Zinnschlag
e0ba7cf952
Issue #107 : Fixing up the window manager interface
13 years ago
Marc Zinnschlag
020fde70b8
Issue #107 : moving function implementations from hpp to cpp file
13 years ago
Marc Zinnschlag
dbac3d2e5f
Issue #107 : fixing WindowManager::removeDialog
13 years ago
Marc Zinnschlag
a3b27ae756
Issue #107 : Moved ClassPoint from window manager to character creation
13 years ago
Jason Hooks
e7329d5f8b
Creatures now have a properly positioned box shape
13 years ago
gugus
fb91f76a2b
fixed a crash
13 years ago
gugus
0c8045d606
allow exterior cell for positioncell. Crash!
13 years ago
gugus
0bc48cc5ea
little fix (thanks greye!)
13 years ago
gugus
379fbccf8c
Merge branch 'move_rotate_fix' of https://github.com/greye/openmw.git into object_movement_creation
13 years ago
Marc Zinnschlag
0231533d05
Issue #107 : InputManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
b68f9d6a28
Issue #107 : MechanicsManager is accessed only through the interface class from now on
13 years ago
scrawl
dcf1e66456
fix main menu placement after resolution changes
13 years ago
greye
f7f8ac0a73
fix move/rotateObject code
13 years ago
scrawl
2ebf4721d1
small main menu fix
13 years ago
Marc Zinnschlag
380defa52f
Merge remote branch 'greye/cross_cell-borders'
13 years ago
greye
47f7a5e988
fix double pos/rot adjustment
13 years ago
Marc Zinnschlag
bc16dc81b9
Merge remote branch 'greye/cross_cell-borders'
13 years ago
gugus
eaf6a8df94
some correction
13 years ago
greye
355ca649c2
camera flip control rewritten
13 years ago
gugus
5d1c01a58e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag
766e782aae
Merge remote branch 'greye/cross_cell-borders'
13 years ago
Marc Zinnschlag
f3edea77b2
MSCV compatibility fix
13 years ago
Marc Zinnschlag
b53b27533a
fixes some include guards
13 years ago
Marc Zinnschlag
6eb9f15b6d
fixed time stamp operator
13 years ago
greye
45306e4bc3
fixed rotation adjustment
13 years ago
greye
5018db3332
removed some redundant code, added some comments
13 years ago
gugus
54221aab89
Merge branch 'cross_cell-borders' of https://github.com/greye/openmw.git into object_movement_creation
13 years ago
gugus
7fa1dc93d7
2nd try: position/ PositionCell
13 years ago
greye
0042020385
should fix 'north direction' bug
...
not even compiled
13 years ago
greye
bed6545e45
still fix assertion fail
13 years ago
greye
56c9c4dbd9
remove some redundant code
13 years ago
scrawl
11fadf4a07
forgot something
13 years ago
scrawl
44ff31b50a
removed world exit methods
13 years ago
scrawl
f72956b918
- added a simple main menu (with Return, Options and Exit buttons)
...
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
13 years ago
Jason Hooks
38c2c5d480
Creatures now use object physics
13 years ago
gugus
b664b174f0
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into object_movement_creation
...
Conflicts:
apps/openmw/mwscript/transformationextensions.cpp
13 years ago
gugus
cb5b69104d
PositionCell
13 years ago
Jason Hooks
083e3537b4
post merge
13 years ago
greye
38b06aee6c
resolving conflicts
13 years ago
Marc Zinnschlag
aca08eb4c2
Merge branch 'decouple' into player_control
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
13 years ago
greye
b5bc7bc424
SoundManager dependency on camera pos/dir
13 years ago
Marc Zinnschlag
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
d00d40cc3f
Issue #107 : Journal is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
a84145a087
Issue #107 : minor corrections
13 years ago
greye
181d45661f
fix rotation angles
13 years ago
greye
6b996d8c34
fix disabled camera on start
13 years ago
greye
df60f4bf92
stub for soundmanager, adjust rotation mode
13 years ago
Marc Zinnschlag
923109b260
Issue #107 : DialogueManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
e6ede480c7
Issue #107 : fixed up some interfaces
13 years ago
greye
378fcc2460
fix DisablePlayerControl logic
13 years ago
greye
1511eb3549
implemented enable/disable player looking switch
13 years ago
greye
a2d87d5f5b
added camera flip control, fixed input rotation axis
13 years ago
greye
ec9cf4d3c6
rotateObject() added, input system rewritten
13 years ago
Marc Zinnschlag
28ecfb4290
Issue #107 : ScriptManager is accessed only through the interface class from now on
13 years ago
Marc Zinnschlag
9b567e4ba6
Issue #107 : Removed a redundant function in world interface; added a comment
13 years ago
greye
b6f7f21bcf
fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added
13 years ago
greye
79b7487c87
fix using deleted objects
13 years ago
greye
d32a61b928
fix object moving
13 years ago
greye
ee97a204f2
fix npc animation key update
13 years ago
gugus
8a485e213b
first try of the Position script instruction. Still missing: check if overlapp with an object.
13 years ago
gugus
d850a3ee49
some correction
13 years ago
Marc Zinnschlag
f5ee5a5414
Merge remote branch 'edmondo/master'
13 years ago
Marc Zinnschlag
1db7978361
silenced a warning
13 years ago
Marc Zinnschlag
0c5f886683
Merge remote branch 'greye/player_control'
13 years ago
Jason Hooks
cacf0bd10d
Basic collision with npcs
13 years ago
greye
16ad97610d
add support for some scripting player control switches
13 years ago
Marc Zinnschlag
994e33e3d2
fixed object rotation code
13 years ago
Marc Zinnschlag
e4dc01832b
fixing object rotation script instructions (wrong argument type and missing error handling)
13 years ago
Edmondo Tommasina
11d0761528
terrainmaterial.cpp: fix std::runtime_error compile error
13 years ago
gugus
b2ce1dfd1a
getStartingPos
13 years ago
gugus
7d6ad6ad94
setPos and getPos Script instructions. Cell-crossing is not tested yet.
13 years ago
greye
ff62770657
World::isUnderwater(), World::isSwimming()
13 years ago
Marc Zinnschlag
c251fbdf23
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
libs/openengine/ogre/renderer.cpp
13 years ago
gugus
e9aac4512b
Build fix for Windows
...
Fixes a number of places where uint was used and not defined. This commit
was originally authored by gus. It rebased by Michael Mc Donnell to take
recent commit fixes into account.
13 years ago
gugus
ebd8b064f6
getStartingAngle script instruction
13 years ago
Marc Zinnschlag
f6d657a5f4
Merge branch 'osx_fix'
13 years ago
scrawl
15a16aeba1
Fixed DirectX HLSL shaders and re-enabled them in the gui
13 years ago
greye
f2a2e5f57d
remove MWWorld::Player::setPos()
13 years ago
greye
0e3f70413e
a very little comments
13 years ago
greye
288b63350c
fixed objects update, local script handling
13 years ago
Nikolay Kasyanov
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
13 years ago
Nikolay Kasyanov
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
greye
37990b5133
fix player update
13 years ago
greye
d6150b7482
high-level implementation, unstable
13 years ago
gugus
d37d0b1947
build fix for windows
13 years ago
Marc Zinnschlag
db10baafe1
Merge branch 'scriptconsole'
13 years ago
Marc Zinnschlag
2ccecd839b
improved the help text for --script-run; updated readme.txt
13 years ago
Marc Zinnschlag
fd6c155118
Issue #352 : added --script-run switch
13 years ago
Marc Zinnschlag
23f8595b87
Issue #352 : refactored script execution in console
13 years ago
Marc Zinnschlag
90de02b901
Issue #350 : console only script instructions
13 years ago
Nikolay Kasyanov
0cdb651c5e
removed excess invocation
13 years ago
Nikolay Kasyanov
fbe9a94568
bug #348 : fixed OS X deployment
...
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
13 years ago
Marc Zinnschlag
0da3f2cb59
Issue #314 : Playing drink sound when using a potion
13 years ago
Marc Zinnschlag
8b08928dae
Issue #351 : Added sound playing to Action
13 years ago
Marc Zinnschlag
78fe6fdce5
Issue #351 : Refactoring Action class
13 years ago
scrawl
7cf2fc4009
Merge branch 'master' into shadersystem
13 years ago
scrawl
6077965d27
fix the directx startup issue on windows
13 years ago
Marc Zinnschlag
7725190f89
removed some redundant code
13 years ago
greye
aa5f63ffcc
disabled items placing handling
13 years ago
greye
26595f22f6
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
13 years ago
greye
b734460dc9
Merge branch 'master' of https://github.com/zinnschlag/openmw
13 years ago
scrawl
06bd2cd919
Merge branch 'master' into shadersystem
13 years ago
greye
cd04911f3c
dropping on the ground
13 years ago
greye
49b1d5e127
fix object placing
13 years ago
greye
e7666d3a7f
move responsibility for cell changing from CellStore::insertObject to Class::moveToCell
13 years ago
greye
bcc47cd5fb
local scripts, move placing to World::placeObject(Ptr, CellStore, Position)
13 years ago
greye
d5fe378a66
Revert "local script registration"
...
This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
13 years ago
greye
aff05b9d36
local script registration
13 years ago
greye
e1c7d1f529
fixed item sinking
13 years ago
greye
6a3a728a56
Class::getModel implementation
13 years ago
greye
87050e48c8
physics getObjectHeight(), MWWorld::Class::getModel() definition
13 years ago
greye
71253c64ab
moving part 2, adding position parameter, stable
13 years ago
greye
61cb012ee7
moving Scene::insertObject to CellStore::insertObject, part 1
13 years ago
Chris Robinson
9f0c1eeb7b
Support playgroup mode 0
13 years ago
Chris Robinson
13ab2baef0
Use a struct to hold the current animation times and remaining loop count
13 years ago
Chris Robinson
fd1e3f6ec5
Add support for playgroup mode 2
13 years ago
Chris Robinson
20121f3b0a
Remove some unused stuff
13 years ago
Chris Robinson
9a7a629d0f
Add support for playing animation groups
13 years ago
Nikolay Kasyanov
94ce95c679
bug #348 : works again on OS X
13 years ago
Chris Robinson
f953d7f8c0
Store text keys from base NIF animations
13 years ago
Chris Robinson
36be1536d9
Return text keys from NIFs when creating entities
13 years ago
scrawl
8c8228a15c
fix terrain num lights setting
13 years ago
Chris Robinson
44975854e5
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
13 years ago
Chris Robinson
f67983bbee
Don't assume one sub-entity for the night sky entities
13 years ago
Marc Zinnschlag
2d080ce4ef
compile fix
13 years ago
Marc Zinnschlag
483a6d8605
Merge remote branch 'scrawl/shadersystem'
13 years ago
scrawl
02a52c0ff1
fixed some more settings bugs
13 years ago
scrawl
3ebc6fd590
fixed a settings window bug
13 years ago
scrawl
a70f93b024
fix "Crash when running openmw with --start="XYZ", remove HLSL for windows
13 years ago
scrawl
ab35bfa32c
fixed a sky issue
13 years ago
scrawl
cfa0519721
Merge branch 'master' into nif-cleanup
13 years ago
scrawl
1fef086088
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
...
This reverts commit 546b640022
, reversing
changes made to fcaa8aae06
.
13 years ago
scrawl
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
Marc Zinnschlag
a24e7c9de2
Merge remote branch 'scrawl/shadersystem'
13 years ago
scrawl
2eca27bba9
fix horizon color of the sky reflection
13 years ago
Marc Zinnschlag
2c5d3d8df9
Merge remote branch 'scrawl/shadersystem' into shadersystem
...
Attention: We have submodules again. Don't forget to update!
Conflicts:
components/files/configurationmanager.cpp
13 years ago
scrawl
1dbfd60305
Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup
13 years ago
scrawl
afe7c41729
removed some unused code
13 years ago
greye
32b1350b63
CreatureStats class
13 years ago
Chris Robinson
77446a0d58
Fix skipAnim, only skip one animation update
13 years ago
Chris Robinson
e81fc42daa
Remove the beast-race special cases from updateParts
...
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
13 years ago
Chris Robinson
c5b9098517
Remove an unused field from EntityList
13 years ago
scrawl
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
13 years ago
Chris Robinson
81ce8dbe12
Combine animation handling into the base class
13 years ago
Chris Robinson
fcaa8aae06
Don't skip animation state updates for NPCs
13 years ago
scrawl
e7ab3544ac
removed some redundant code
13 years ago
scrawl
acc5c3bbbf
some fixes
13 years ago
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
scrawl
21728020f6
fixed the water on local map
13 years ago
Chris Robinson
2db80a1504
Rename a couple methods to match their scripting counterparts
13 years ago
Chris Robinson
66860825cf
Remove some unused and unneeded bits from the Animation class
13 years ago
Chris Robinson
8b5b74f9ee
Add a quick hack to let "playgroup all" work on creatures and NPCs
13 years ago
scrawl
f5ffea4d4b
new button, water timescale
13 years ago
scrawl
e077814a8c
water
13 years ago
Chris Robinson
a86ed46ec4
Use the race ID specified in the ref base's record instead of the race record
...
The latter is localized and doesn't match with international versions.
13 years ago
scrawl
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
13 years ago
Chris Robinson
6caa39629d
Reimplement the skirt part
13 years ago
Chris Robinson
b505d4ace0
Fix feet and entity part detachment
13 years ago
Chris Robinson
4af1bce659
Restore and fix some missing parts
13 years ago
Chris Robinson
d9b64b77ec
Attach skinned parts to the scene node instead of the named bone
13 years ago
Chris Robinson
db948969c9
Attach NPC parts to the proper bone
13 years ago
Chris Robinson
04e496a6ca
Store the entity lists for NPC parts
13 years ago
Chris Robinson
6611b0b317
Use an array instead of a bunch of nearly-identical if blocks
13 years ago
Chris Robinson
02d39080c8
Destroy entities when they're done with.
13 years ago
Chris Robinson
4109d0d923
Destroy entities removed from the NPC
13 years ago
Chris Robinson
92546ca18d
Move the last bits of code to createEntities
13 years ago
Chris Robinson
94f3e7a6c0
Store the entity list in the object
13 years ago
Chris Robinson
a590db2cf4
Create entities when loading NIFs for the NPC base
13 years ago
Chris Robinson
3efd2030e2
Create entities when loading NIFs for creatures
13 years ago
Chris Robinson
3dedac5cb1
Create mesh entities for objects when loading the NIF
13 years ago
Chris Robinson
c6cc82a51a
Handle multiple entities per NPC part
13 years ago
Chris Robinson
89cfe778f0
Support multiple entities for the NPC base
13 years ago
Chris Robinson
0a4a141f2e
Support multiple meshes for creatures
13 years ago
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
scrawl
4434fb640e
Merge branch 'master' into shadersystem
13 years ago
Marc Zinnschlag
483b125aad
avoid locking up in case actor updates repeatedly throw exceptions
13 years ago
Marc Zinnschlag
6744375636
fixed a logic error in the auto equip code
13 years ago
Marc Zinnschlag
beb18282bb
Issue #342 : various fixes
13 years ago
Marc Zinnschlag
76de2f7360
Issue #342 : handle magic effects 79-82 and 17-20
13 years ago
Marc Zinnschlag
a3652f16ce
Issue #342 : factored out dynamic stats calculation into a separate function
13 years ago
Marc Zinnschlag
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
13 years ago
Marc Zinnschlag
0d3a7d482e
Merge remote branch 'modred11/master'
13 years ago
Marc Zinnschlag
4bfed952bc
Merge remote branch 'guidoj/master'
13 years ago
Marc Zinnschlag
e9b95d55cd
Revert "Proper way to find and use libtbb"
...
This reverts commit d6bf2b7d29
.
13 years ago
guidoj
a021165d9f
Changed standard C lib includes to C++ format
13 years ago
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
Dmitry Marakasov
d6bf2b7d29
Proper way to find and use libtbb
13 years ago
Dmitry Marakasov
0e934a52ca
Include soundmanager.hpp for Play_Normal enum
13 years ago
Dmitry Marakasov
1c53add6c4
Include boost/shared_ptr.hpp for boost:shared_ptr
13 years ago
Chris Robinson
a539e98274
Handle all meshes when inserting objects into the scene
13 years ago
scrawl
509e9d7034
Merge branch 'master' into shadersystem
13 years ago
Chris Robinson
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
13 years ago
Marc Zinnschlag
da916cecfb
fixed a bug in a cmake script that resulted in some files being compiled twice
13 years ago
scrawl
778e59ee37
terrain as it was before, with about 4x less code
13 years ago
scrawl
29f91753f7
correction
13 years ago
scrawl
93c641efa7
terrain albedo
13 years ago
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago