Emanuel Guevel
2b992ef3b5
Acrobatics: use calculated fatigueTerm
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4c151e59a2
Acrobatics: do not touch modified stats
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4860514865
Acrobatics: cosmetic changes
2013-10-02 23:34:24 +02:00
mckibbenta
857deb3723
Merge branch 'master' into tgm
2013-10-02 13:54:03 -04:00
mckibbenta
073f64c8bb
stop weapon condition degredation (for the player) with tgm on
2013-10-02 13:46:33 -04:00
Emanuel Guevel
496f786c2a
Implement Disable/EnableLevitation script functions
...
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad
f1b4c2e400
Fixed first person offset to use world transform
...
It slipped my mind that some necks might not be perfectly vertical.
2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad
ed0c31b485
Refactored, moved logic out of NpcAnimation
...
The logic is now handled by RenderingManager, and Camera sets its
animation's first person offset height. Due to how NpcAnimation seems to
be updated, it has to be the one to actually set its own nodes, in the
case of the hands. Otherwise, the hands would not move without a messier
hack.
2013-10-02 05:16:52 -04:00
Emanuel Guevel
b8c60dabb3
Reintroduce Acrobatics changes made by Glorf
...
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad
0ddb5097fc
Revert "Bug #840 , First Person Sneaking Camera Height"
...
This reverts commit 296abfd48f
2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad
296abfd48f
Bug #840 , First Person Sneaking Camera Height
...
Also, added comments to existing code in the area.
2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad
00a776a1a8
Fixed compilation failure on my machine
...
Fixed shared records not being populated before the player record is
moved.
2013-09-30 02:54:20 -04:00
greye
4cdb57e388
workaround segfault on --new-game switch
2013-09-30 10:30:40 +04:00
Lukasz Gromanowski
9c2145eda1
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches into content in openmw
and mwiniimporter.
Extension in content files is now required.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-09-29 09:11:57 +02:00
Marc Zinnschlag
0f1c4cb00e
cleanup
2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c
Switched to using proper enums as opposed to ints.
2013-09-23 08:31:36 -04:00
Berulacks
0c518fb047
Replaced tabs with spaces.
2013-09-23 07:36:50 -04:00
Berulacks
c423479f20
Fixed bug #887
2013-09-23 07:31:14 -04:00
graffy76
70ac14b8ba
Merge branch 'master' into esxSelector
2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
2013-09-21 23:06:29 -05:00
Marc Zinnschlag
94bb97e766
replacing tabs with spaces
2013-09-21 08:40:00 +02:00
Marc Zinnschlag
96b181bb54
Merge remote-tracking branch 'xethik/master'
2013-09-21 08:07:00 +02:00
Xethik
094e4d93b7
Generally speaking, you should never compare iterators from two different compilers
...
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
2013-09-20 21:38:10 -04:00
Xethik
58bb0b8773
Bug #907
...
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
2013-09-20 21:26:12 -04:00
Marc Zinnschlag
99fe6e68c7
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-19 15:14:35 +02:00
scrawl
d5ef843f56
Fix a missing model update
2013-09-16 19:22:08 +02:00
mckibbenta
6bb6ba6372
added god mode comment
2013-09-15 16:12:59 -04:00
mckibbenta
3035675a26
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-09-15 15:49:18 -04:00
mckibbenta
644f081c60
minor changes
2013-09-15 15:48:32 -04:00
Marc Zinnschlag
9637e1641b
fix for building with system tinyxml
2013-09-14 13:33:49 +02:00
Marc Zinnschlag
bf8a25c2c6
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-12 19:07:35 +02:00
mckibbenta
89b7d6121d
Initial toggleGodMod/tgm instruction. Currently only affects player health.
2013-09-12 08:30:00 -04:00
mckibbenta
85b8af6262
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-12 08:08:07 -04:00
scrawl
09e692f1f6
Fixed polish font
2013-09-10 22:11:57 +02:00
scrawl
10c21579bc
Item stacking case sensitivity fix
2013-09-07 01:00:38 +02:00
mckibbenta
e545f49807
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-02 18:40:37 -04:00
Marc Zinnschlag
7076ea9467
Merge remote-tracking branch 'scrawl/map'
2013-09-02 10:55:12 +02:00
scrawl
3ddeb075fb
Fix a cell border seam on the map
2013-08-31 04:36:23 +02:00
Chris Robinson
82a09a988b
Minor pathfinding cleanup
2013-08-29 19:17:27 -07:00
Chris Robinson
8f23b330d3
Remove unnecessary initialization
2013-08-29 17:41:20 -07:00
Chris Robinson
9499ac4fd5
Increase the distance for reaching a path node
2013-08-29 17:41:20 -07:00
Chris Robinson
f9dbce685a
Avoid killing AIWander and AITravel when far away
...
This fixes the problem of certain NPCs not wandering because they
happened to spawn near a cell border away from the player, which
immediately "completed" the wander package.
AIWander can't cause NPCs to cross cell boundaries, so there's no risk
of them walking into an unloaded to. AITravel will now simply stop
moving, and resume later when the cell is loaded.
2013-08-29 17:41:20 -07:00
mckibbenta
f65172bdca
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-08-29 20:26:36 -04:00
mckibbenta
eef9df504a
fiddlings
2013-08-29 20:25:36 -04:00
scrawl
c8e31725dc
Fix weather sounds persisting on a new game
2013-08-29 15:16:08 +02:00
Marc Zinnschlag
ce90c2f3be
Merge remote-tracking branch 'kcat/master'
2013-08-28 21:05:07 +02:00
Chris Robinson
e589d0ec91
Werewolves can't activate activators
2013-08-28 11:36:22 -07:00
Chris Robinson
84d259ab8e
Avoid reconstructing strings for updating the dynamic stats
...
Attributes still do this, but they change infrequently enough that it doesn't
matter.
2013-08-28 10:50:29 -07:00
scrawl
5918b84666
Don't crash on resize events during load
2013-08-28 17:05:28 +02:00
Chris Robinson
92082dae66
Modify the current magicka and fatigue when the base changes
2013-08-27 22:44:52 -07:00
Chris Robinson
305b5fec0f
Avoid needlessly copying the MagicEffects
2013-08-27 21:40:31 -07:00
Chris Robinson
281fdbd81b
Cleanup some redundancy
2013-08-27 17:56:47 -07:00
Chris Robinson
33c173a23a
Update the watched Ptr when changing it
2013-08-27 17:22:07 -07:00
Chris Robinson
39af9a13fa
Remove some unused functions
2013-08-27 17:13:49 -07:00
Chris Robinson
189541aa72
Apply drowning damage based on the update duration
...
1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat.
2013-08-27 17:08:23 -07:00
Chris Robinson
f216b25be8
Slightly randomize time between environment sounds
...
We should use the "Minimum Time Between Environmental Sounds" and
"Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't
have them.
2013-08-27 16:04:19 -07:00
Chris Robinson
02df8ab841
Store the underwater sound to easily stop it
2013-08-27 13:48:20 -07:00
Chris Robinson
16331bf1ed
Avoid a hack to play the underwater sound properly
2013-08-27 13:26:57 -07:00
scrawl
839d251cc5
Renamed Terrain::Terrain to Terrain::World to make VC happy
2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
Marc Zinnschlag
dcc55b60c3
Merge remote-tracking branch 'kcat/misc-cleanup'
2013-08-26 08:51:19 +02:00
mckibbenta
60fa69139e
minor changes
2013-08-25 19:20:14 -04:00
Chris Robinson
f2889e4bb5
Remove unused functions and parameters
2013-08-25 16:08:45 -07:00
Chris Robinson
3843357cd2
Fix actor stepping
2013-08-25 16:08:43 -07:00
Chris Robinson
0463dc0653
Use a smaller static geometry size for interior cells
2013-08-25 16:08:43 -07:00
Chris Robinson
bd6dd071aa
Use the non-accumulation root's parent as the accumulation root
...
This relies on the non-accumulation root not being the skeleton root. I haven't
found an instance where this isn't the case.
2013-08-25 16:08:42 -07:00
scrawl
3f8a69b4ad
Don't crash when trying to delete a reference that doesn't exist anymore
2013-08-26 00:14:02 +02:00
scrawl
5af89a9e8f
Fix an AABB assert for loading empty exterior cells
2013-08-26 00:13:42 +02:00
scrawl
c6d2d1999a
Fix an item duplication glitch
2013-08-25 17:40:08 +02:00
mckibbenta
06701467ab
Merge branch 'master' into tgm
2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b
initial do-nothing implementation; registered opcode
2013-08-24 21:19:12 -04:00
Chris Robinson
ca24a809fc
Use the position of the actor to determine if they're swimming
2013-08-23 13:44:16 -07:00
Chris Robinson
3fa65f21dd
Use a proper cone shape with a contact test to check for melee hits
2013-08-23 12:27:40 -07:00
Chris Robinson
f5d03a16c1
Rename getFacedObject and getFacedHandle for melee hits
2013-08-23 12:27:39 -07:00
Marc Zinnschlag
2823e5693d
Merge remote-tracking branch 'scrawl/hit'
2013-08-22 15:35:17 +02:00
scrawl
22d5598082
Fix bad_cast exception when hitting creatures
2013-08-22 12:17:12 +02:00
scrawl
1adce8afb3
Fix ambient light getting set from the cell data for non-interior cells
2013-08-22 10:47:48 +02:00
Marc Zinnschlag
e03e2f0817
Merge remote-tracking branch 'scrawl/master'
2013-08-21 19:50:08 +02:00
scrawl
758d989a03
If multiple plugins have land data for the same cell, the last plugin should win
2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
2013-08-21 17:26:11 +02:00
Chris Robinson
c855ab65cf
Non-colliding objects are considered flying
2013-08-21 07:24:54 -07:00
Chris Robinson
602be9bbe7
Avoid swimming into the air from underwater
2013-08-21 07:24:54 -07:00
Chris Robinson
9f09bb6f6f
Use separate inputs for swimming and flying
2013-08-21 07:24:54 -07:00
Chris Robinson
a546ace94d
Remove an unused method
2013-08-21 07:24:54 -07:00
vorenon
3bf3bd4b8c
Silenced some warnings
2013-08-21 13:53:49 +02:00
Chris Robinson
1a9672e31b
Don't update player physics more than 60 times a second
...
Bullet and/or our collision handling code doesn't like timesteps much
smaller than that. Ideally we should do physics in 60fps (or even 30fps)
steps and use prediction and interpolation to get more, but that's not
straight forward and needs a fixed timestep loop to lock physics and
logic together.
2013-08-20 11:31:49 -07:00
Chris Robinson
0e56b2facb
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 04:42:28 -07:00
Chris Robinson
d9040df9d6
Increase the max number of physics iterations
...
Should help with highly tessellated collision meshes with high
framerates.
2013-08-20 04:41:52 -07:00
scrawl
ecf7786d11
terrain_num_lights was removed
2013-08-20 12:31:47 +02:00
scrawl
fa76d1631b
Some terrain fixes
2013-08-20 12:08:46 +02:00
scrawl
0545622f5a
Fix werewolf state not getting completely reset when starting a new game
2013-08-20 11:24:19 +02:00
Chris Robinson
a993af53e7
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 02:21:44 -07:00
Chris Robinson
a17997a973
Continually add bits of input velocity to inertia when falling
2013-08-20 02:10:18 -07:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
scrawl
13afcc9324
Don't link to OgreTerrain
2013-08-19 22:22:14 +02:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
Chris Robinson
d727b15580
Fix tracing down
2013-08-19 20:39:37 +02:00
Chris Robinson
394fc75697
Clean up the trace struct
2013-08-19 20:39:37 +02:00
Chris Robinson
b351109649
Get rid of the old newtrace method
2013-08-19 20:39:37 +02:00
Chris Robinson
14acacf401
Use a better method to do actor physics traces
2013-08-19 20:39:37 +02:00
