Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
2015-07-07 19:19:37 +02:00
scrawl
519fb9482a
Minor cleanup
2015-07-02 18:45:11 +02:00
scrawl
ca21e9ecb1
Fix magic hit VFX showing when casting on a static object
2015-06-30 03:14:49 +02:00
scrawl
882e359008
Move attackStrength to the CharacterController, where it should have been to begin with
...
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
2015-06-26 05:15:07 +02:00
scrawl
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
2015-06-22 20:09:02 +02:00
scrawl
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
2015-06-21 17:28:18 +02:00
scrawl
b648722d3b
Don't use the ParticleSystem for computing placeable bounds (Bug #2700 )
2015-06-17 15:13:41 +02:00
scrawl
1c151f2f0a
Re-enable some outcommented sky code
2015-06-16 20:56:48 +02:00
scrawl
3da8f6e62e
Water ripples
2015-06-16 20:36:48 +02:00
scrawl
76bdf7a5b7
Add night-eye effect
2015-06-11 23:16:05 +02:00
scrawl
16e080e252
Fix the physics debug drawer lagging a frame behind
2015-06-07 17:00:00 +02:00
scrawl
4c09ecef72
Normalize fixes
2015-06-05 03:41:10 +02:00
scrawl
ddfed35d1c
Object placement raycasts should use the rendering meshes
2015-06-05 02:26:16 +02:00
scrawl
b70383d127
Remove last remains of Ogre math
2015-06-03 21:37:21 +02:00
scrawl
cc6d5a3ba0
Fix player setup bug
2015-06-03 19:44:21 +02:00
scrawl
7bacb9418d
Various math code ported to osg
2015-06-03 19:41:19 +02:00
scrawl
2a85a22dba
Write savegame screenshot
2015-06-03 16:40:16 +02:00
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
2015-06-03 03:18:29 +02:00
scrawl
292fa0b5e3
Unify raycasting techniques for "on touch" magic
...
We don't want pixel-precise raycasting here. Gets annoying when trying to hit a skeleton.
2015-06-03 03:16:26 +02:00
scrawl
cee1db532f
Improve area orb positioning for "on touch" spells
2015-06-03 03:04:39 +02:00
scrawl
2883ecc19a
Fix the hilarious bug of NPCs falling to their deaths in interiors
2015-06-03 02:48:45 +02:00
scrawl
cdd0623009
Terrain rendering
2015-06-03 01:35:41 +02:00
scrawl
01944c33f5
Basic water rendering
2015-06-02 16:35:35 +02:00
scrawl
de8e5f0db1
Restore projectiles
2015-06-01 21:41:13 +02:00
scrawl
bed31996c9
Camera raycast
2015-06-01 15:34:46 +02:00
scrawl
f88079fddd
Restore the isOnGround hack
2015-06-01 02:40:42 +02:00
scrawl
ccd95419e5
Restore various raycasting
2015-06-01 01:57:15 +02:00
scrawl
e306853570
Fix chargen crash
2015-06-01 00:50:55 +02:00
Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
scrawl
a066b24303
Restore WeaponAnimation
2015-05-31 01:07:43 +02:00
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
2015-05-30 11:39:53 +02:00
scrawl
cc3bfe2bb2
Restore collision tracker
2015-05-30 01:32:00 +02:00
scrawl
fd50be0fb8
Restore various gameplay
2015-05-30 01:00:24 +02:00
scrawl
c811ac6afe
Port fog of war
...
Not optimized yet, need to work on fog texture's DataVariance.
2015-05-28 03:50:49 +02:00
scrawl
8b3054aa8b
Fix for player collision cleanup issue
2015-05-28 02:45:38 +02:00
scrawl
3dcb167066
Map rendering
2015-05-26 16:40:44 +02:00
scrawl
d84990be85
Restore getCollisions
2015-05-24 03:59:22 +02:00
scrawl
8b322fcd06
Implement getFacedObject using osgUtil::IntersectionVisitor
2015-05-24 03:36:34 +02:00
scrawl
9a0db5d55a
Restore cell changes
2015-05-24 01:32:00 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
scrawl
0de6839890
Minor cleanup
2015-05-23 06:07:11 +02:00
scrawl
04e827ecf6
Don't try to play an empty video
2015-05-23 05:42:21 +02:00
scrawl
d1b6289cad
Don't teleport followers when using teleportation spells
2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
85345e663a
Restore getHitContact
2015-05-22 04:36:33 +02:00
scrawl
cac7c1e535
Restore various physics features
2015-05-22 04:36:33 +02:00
scrawl
9b8e2e9db3
Port MWRender::Camera
2015-05-22 00:29:27 +02:00
scrawl
8bcfac1ea3
Fix adjustPosition not always working correctly ( Fixes #2563 )
...
moveObject was returning an incorrect Ptr for cell movements.
2015-05-17 18:16:42 +02:00
scrawl
24bb2e152c
Apply texture filter setting changes
2015-05-14 21:42:04 +02:00
scrawl
3e86dd7df0
Apply runtime changes to field of view & view distance
2015-05-14 18:46:28 +02:00
scrawl
b7258c8d23
Readded Objects::updatePtr
2015-05-14 17:34:55 +02:00
scrawl
bc237ee1fe
Actor placement fix
2015-05-14 17:14:49 +02:00
scrawl
7a3bc69df7
Readded sound listener
2015-05-12 19:02:56 +02:00
scrawl
ccab8cc9a1
Register Player in the PhysicsSystem
2015-05-12 17:40:42 +02:00
scrawl
65f0195c71
Readded animated collision shape support
2015-05-12 16:26:11 +02:00
scrawl
19988d5e45
Remove RefData::getHandle
2015-05-12 04:04:54 +02:00
scrawl
47758c11cd
Readded collision objects and movement physics
2015-05-12 03:02:15 +02:00
scrawl
b312f50b1f
Fix regression with detect spells detecting deleted objects ( Fixes #2518 )
2015-05-11 16:38:15 +02:00
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
2015-05-10 01:09:00 +02:00
scrawl
c843cfc8e2
Physics stub in preparation for rewrite
2015-05-10 00:28:51 +02:00
scrawl
1943110170
Add bullet debug drawer
2015-05-03 00:39:01 +02:00
scrawl
9cf9c2876e
Pathgrid rendering
2015-05-02 22:45:39 +02:00
scrawl
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
2015-05-02 17:48:24 +02:00
scrawl
d9d84bd7b2
Remove bullet raycasting shapes, to be replaced with OSG ray casts
2015-05-01 21:43:21 +02:00
scrawl
bd8f0248f0
Player rendering
2015-05-01 18:21:50 +02:00
k1ll
a230050ec8
Boost tr1 unordered map does not work with mingw
2015-04-29 18:31:29 +02:00
scrawl
8971a200f7
Sky fix
2015-04-26 14:34:14 +02:00
scrawl
7809caf9dc
Dead code removal
2015-04-25 15:53:11 +02:00
scrawl
0ff7b2ff11
MechanicsManager, frame update
2015-04-25 15:19:17 +02:00
scrawl
9f12e53956
Scale NPCs by their Weight property ( Fixes #814 )
2015-04-24 14:49:20 +02:00
scrawl
1c0e3a6488
rotateObject, scaleObject
2015-04-23 23:50:46 +02:00
scrawl
8c810e3620
Move rng to components
2015-04-22 17:58:55 +02:00
scrawl
68f93294da
Port EffectManager
2015-04-19 17:55:56 +02:00
scrawl
edc5cad79e
Port Animation::addEffect
2015-04-19 01:57:52 +02:00
scrawl
5dd1ab24fe
More efficient StateSetController, beginnings of sky rendering
2015-04-14 15:58:16 +02:00
scrawl
c92592493e
OpenMW: create a window and render the starting cell(s)
2015-04-12 15:38:30 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
2015-03-13 17:33:08 +01:00
scrawl
3879ce6ac1
Get rid of "player" string checks ( Fixes #2216 )
2015-03-11 23:07:39 +01:00
dteviot
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
2015-03-08 13:22:56 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
scrawl
58807064b4
Revert "Fix reference cell movement leaving behind deleted Ptrs for script access"
...
This reverts commit 666248618e
2015-03-07 15:31:21 +01:00
scrawl
666248618e
Fix reference cell movement leaving behind deleted Ptrs for script access
2015-03-02 23:20:59 +01:00
Marc Zinnschlag
281e0042ab
Merge remote-tracking branch 'scrawl/master'
2015-02-26 13:23:15 +01:00
scrawl
e7989a197d
Add defaults for some required globals ( Fixes #2397 )
2015-02-25 20:35:11 +01:00
Jordan Ayers
659a8ba279
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash on confiscating items if a prison marker cannot be found.
2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash when finding the closest marker to an exterior position.
2015-02-24 20:51:57 -06:00
Marc Zinnschlag
8e007c91fd
Merge remote-tracking branch 'jordan-ayers/bugfix/1533'
2015-02-22 21:58:01 +01:00
Jordan Ayers
5edafc2a4c
Cleanup: Add const to read-only CellRefList access.
...
OMW Bug #1533
2015-02-22 12:25:10 -06:00
Jordan Ayers
c21b59ecff
Teleportation: Avoid marking searched cells as changed.
...
OMW Bug #1533
Only mark cells with the target marker / evidence chest as 'changed'.
2015-02-21 17:55:05 -06:00
Marc Zinnschlag
4c5bba2947
Merge remote-tracking branch 'dteviot/SpellCastingFixes'
2015-02-17 16:44:14 +01:00
dteviot
8d7de7d1ec
Telekinesis allows safe opening of traps ( Fixes #1916 )
...
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
2015-02-17 22:14:25 +13:00
Jordan Ayers
6d1aec6970
Confiscate stolen goods: Support Mournhold prisons.
...
OMW Bug #1533
2015-02-14 16:09:17 -06:00
Jordan Ayers
5ef78903dc
Teleportation: Support markers in Mournhold.
...
OMW Bug #1533
Note: the 'stolen goods' search is not yet correct for Mournhald.
2015-02-14 15:43:09 -06:00
Jordan Ayers
1d18d3ff4c
Add a full search to findInteriorPositionInWorldSpace.
...
Part of OMW Bug #1533
Implement a search for one of the 'nearest' exterior cells. In this
case, 'nearest' means the fewest number of cells away via door markers.
This causes the world map position to update immediately after teleporting,
unless the new cell has no connecting path to an exterior. Intervention
spells and Jail travel will be much closer to vanialla Morrowind,
except for in Mournhold.
2015-02-12 22:38:08 -06:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
scrawl
801c0eb57c
Detect Creature should detect alive creatures only ( Fixes #2353 )
2015-02-09 20:15:41 +01:00
Marc Zinnschlag
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
2015-02-09 18:03:28 +01:00
Alexander "Ace" Olofsson
8c49812d56
Remove unneeded include in obstacle.hpp
2015-02-09 15:12:10 +01:00
