Marc Zinnschlag
96b181bb54
Merge remote-tracking branch 'xethik/master'
11 years ago
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.
11 years ago
Xethik
58bb0b8773
Bug #907
...
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
11 years ago
Marc Zinnschlag
99fe6e68c7
Merge remote-tracking branch 'mckibbenta/tgm'
11 years ago
scrawl
d5ef843f56
Fix a missing model update
11 years ago
mckibbenta
6bb6ba6372
added god mode comment
11 years ago
mckibbenta
3035675a26
Merge branch 'master' of https://github.com/zinnschlag/openmw
11 years ago
mckibbenta
644f081c60
minor changes
11 years ago
Marc Zinnschlag
9637e1641b
fix for building with system tinyxml
11 years ago
Marc Zinnschlag
bf8a25c2c6
Merge remote-tracking branch 'mckibbenta/tgm'
11 years ago
mckibbenta
89b7d6121d
Initial toggleGodMod/tgm instruction. Currently only affects player health.
11 years ago
mckibbenta
85b8af6262
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
11 years ago
scrawl
09e692f1f6
Fixed polish font
11 years ago
scrawl
10c21579bc
Item stacking case sensitivity fix
11 years ago
mckibbenta
e545f49807
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
12 years ago
Marc Zinnschlag
7076ea9467
Merge remote-tracking branch 'scrawl/map'
12 years ago
scrawl
3ddeb075fb
Fix a cell border seam on the map
12 years ago
Chris Robinson
82a09a988b
Minor pathfinding cleanup
12 years ago
Chris Robinson
8f23b330d3
Remove unnecessary initialization
12 years ago
Chris Robinson
9499ac4fd5
Increase the distance for reaching a path node
12 years ago
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.
12 years ago
mckibbenta
f65172bdca
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
12 years ago
mckibbenta
eef9df504a
fiddlings
12 years ago
scrawl
c8e31725dc
Fix weather sounds persisting on a new game
12 years ago
Marc Zinnschlag
ce90c2f3be
Merge remote-tracking branch 'kcat/master'
12 years ago
Chris Robinson
e589d0ec91
Werewolves can't activate activators
12 years ago
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.
12 years ago
scrawl
5918b84666
Don't crash on resize events during load
12 years ago
Chris Robinson
92082dae66
Modify the current magicka and fatigue when the base changes
12 years ago
Chris Robinson
305b5fec0f
Avoid needlessly copying the MagicEffects
12 years ago
Chris Robinson
281fdbd81b
Cleanup some redundancy
12 years ago
Chris Robinson
33c173a23a
Update the watched Ptr when changing it
12 years ago
Chris Robinson
39af9a13fa
Remove some unused functions
12 years ago
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.
12 years ago
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.
12 years ago
Chris Robinson
02df8ab841
Store the underwater sound to easily stop it
12 years ago
Chris Robinson
16331bf1ed
Avoid a hack to play the underwater sound properly
12 years ago
scrawl
839d251cc5
Renamed Terrain::Terrain to Terrain::World to make VC happy
12 years ago
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
12 years ago
Marc Zinnschlag
dcc55b60c3
Merge remote-tracking branch 'kcat/misc-cleanup'
12 years ago
mckibbenta
60fa69139e
minor changes
12 years ago
Chris Robinson
f2889e4bb5
Remove unused functions and parameters
12 years ago
Chris Robinson
3843357cd2
Fix actor stepping
12 years ago
Chris Robinson
0463dc0653
Use a smaller static geometry size for interior cells
12 years ago
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.
12 years ago
scrawl
3f8a69b4ad
Don't crash when trying to delete a reference that doesn't exist anymore
12 years ago
scrawl
5af89a9e8f
Fix an AABB assert for loading empty exterior cells
12 years ago
scrawl
c6d2d1999a
Fix an item duplication glitch
12 years ago
mckibbenta
06701467ab
Merge branch 'master' into tgm
12 years ago
mckibbenta
8998b90e8b
initial do-nothing implementation; registered opcode
12 years ago
Chris Robinson
ca24a809fc
Use the position of the actor to determine if they're swimming
12 years ago
Chris Robinson
3fa65f21dd
Use a proper cone shape with a contact test to check for melee hits
12 years ago
Chris Robinson
f5d03a16c1
Rename getFacedObject and getFacedHandle for melee hits
12 years ago
Marc Zinnschlag
2823e5693d
Merge remote-tracking branch 'scrawl/hit'
12 years ago
scrawl
22d5598082
Fix bad_cast exception when hitting creatures
12 years ago
scrawl
1adce8afb3
Fix ambient light getting set from the cell data for non-interior cells
12 years ago
Marc Zinnschlag
e03e2f0817
Merge remote-tracking branch 'scrawl/master'
12 years ago
scrawl
758d989a03
If multiple plugins have land data for the same cell, the last plugin should win
12 years ago
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
12 years ago
Chris Robinson
c855ab65cf
Non-colliding objects are considered flying
12 years ago
Chris Robinson
602be9bbe7
Avoid swimming into the air from underwater
12 years ago
Chris Robinson
9f09bb6f6f
Use separate inputs for swimming and flying
12 years ago
Chris Robinson
a546ace94d
Remove an unused method
12 years ago
vorenon
3bf3bd4b8c
Silenced some warnings
12 years ago
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.
12 years ago
Chris Robinson
0e56b2facb
Merge remote-tracking branch 'zini/master' into physics
12 years ago
Chris Robinson
d9040df9d6
Increase the max number of physics iterations
...
Should help with highly tessellated collision meshes with high
framerates.
12 years ago
scrawl
ecf7786d11
terrain_num_lights was removed
12 years ago
scrawl
fa76d1631b
Some terrain fixes
12 years ago
scrawl
0545622f5a
Fix werewolf state not getting completely reset when starting a new game
12 years ago
Chris Robinson
a993af53e7
Merge remote-tracking branch 'zini/master' into physics
12 years ago
Chris Robinson
a17997a973
Continually add bits of input velocity to inertia when falling
12 years ago
scrawl
8c8653160d
Crash fix, material fix
12 years ago
scrawl
13afcc9324
Don't link to OgreTerrain
12 years ago
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
12 years ago
Chris Robinson
d727b15580
Fix tracing down
12 years ago
Chris Robinson
394fc75697
Clean up the trace struct
12 years ago
Chris Robinson
b351109649
Get rid of the old newtrace method
12 years ago
Chris Robinson
14acacf401
Use a better method to do actor physics traces
12 years ago
Chris Robinson
76b812f75f
Improve actor movement collision handling
12 years ago
Chris Robinson
584eec3743
Store the object class in the LiveCellRef
12 years ago
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
12 years ago
Chris Robinson
cf6e3ab933
Fix a potential divide-by-zero
12 years ago
Chris Robinson
dca599b8c5
Add NPC landing sounds for soundgen keys
12 years ago
Chris Robinson
2ec39f3622
Don't start the jump animation until after the actor is airborn
...
A bit counter-intuitive, but otherwise certain jump animations will improperly
add an offset to the initial inertia.
12 years ago
Chris Robinson
ac3d3df9fc
Implement jumping animations
12 years ago
Chris Robinson
48e594b7c4
Improve stepping down when starting on the ground
12 years ago
Chris Robinson
3ca4d54bf9
Better handle animations with a 0-length loop
12 years ago
Chris Robinson
1aa92067c2
Fix tracing down
12 years ago
Chris Robinson
6e9f15793d
Implement a jumping state
12 years ago
Chris Robinson
7770203dff
Some physics cleanup
...
Gets rid of some unneeded/unused variables, and halves the 'on ground'
offset.
12 years ago
Chris Robinson
b0f8045c72
Improve mid-air control
12 years ago
Chris Robinson
8c3564326e
Improve movement inertia
...
Handles all 3 axis. Incoming velocity is only added to inertia when
leaving the ground, and does not continually add to it.
12 years ago
Chris Robinson
9d56e2d86d
Apply movement by queueing it to do later
12 years ago
Chris Robinson
96bab88da6
Add physics methods to queue and apply movements
12 years ago
Chris Robinson
0481e64b02
Fix tracing down
12 years ago
Chris Robinson
8bcce0fb55
Clean up the trace struct
12 years ago
Chris Robinson
62c7b3698d
Get rid of the old newtrace method
12 years ago
Chris Robinson
65ce3c6ba5
Use a better method to do actor physics traces
12 years ago
Chris Robinson
d82f54c771
Improve actor movement collision handling
12 years ago