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
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
