Marc Zinnschlag
2b619296d7
Merge remote-tracking branch 'scrawl/master'
2015-02-11 11:30:44 +01:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
Alexander "Ace" Olofsson
1a19253158
Fix MSVC build due to missing M_PI define
...
Apparently the header guard on cmath only adds the defines if _USE_MATH_DEFINES is defined when cmath is included for the first time.
So enabling that define and moving cmath up to be the first include, so that nothing else includes it without the define set.
2015-02-10 15:32:54 +01:00
scrawl
801c0eb57c
Detect Creature should detect alive creatures only ( Fixes #2353 )
2015-02-09 20:15:41 +01:00
scrawl
c27c20a859
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
files/materials/water.shader
2015-02-09 19:40:59 +01:00
scrawl
dbd4abd6fe
Fix ripples for D3D - added simpler effect ( Fixes #1649 )
2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
2015-02-09 18:03:28 +01:00
Marc Zinnschlag
985f7cbff9
Merge remote-tracking branch 'miroslavr/master'
2015-02-09 17:58:57 +01:00
Alexander "Ace" Olofsson
8c49812d56
Remove unneeded include in obstacle.hpp
2015-02-09 15:12:10 +01:00
Alexander "Ace" Olofsson
df5a08b6de
Move manualref code out of header
2015-02-09 15:01:49 +01:00
Jordan Ayers
ec3487b669
Sun trajectory: handle mNightStart <= mSunriseTime
...
OMW Bug #781
Note: mNightStart == mSunriseTime is treated as 24-hour night.
2015-02-08 14:31:45 -06:00
scrawl
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
2015-02-08 21:28:29 +01:00
scrawl
ad8790fba0
Fix setWaterLevel script instruction not affecting physics
2015-02-08 15:50:40 +01:00
Jordan Ayers
23024d2beb
Re-work the sun's trajectory.
...
OMW Bug #781
Have the sun travel 15 degrees south of vertical.
2015-02-07 12:36:27 -06:00
Jordan Ayers
2d17eaa5ea
Fix argument name for setSunDirection.
2015-02-06 22:26:58 -06:00
MiroslavR
1d9e973573
Add training progress bar, implement jail screen, tweak wait dialog ( Fixes #1714 )
2015-02-07 04:05:28 +01:00
Marc Zinnschlag
6c4920c58e
Merge remote-tracking branch 'scrawl/master'
2015-02-06 09:23:45 +01:00
scrawl
01b4177872
Make sure birthsign spells are added when loading savegame
2015-02-06 01:27:17 +01:00
scrawl
bea88c3643
Stolen item tracking overhaul part 2 ( Fixes #2338 )
2015-02-06 01:27:16 +01:00
scrawl
8087a7d920
Add possibility to dress up corpses ( Fixes #2221 )
2015-02-05 04:18:43 +01:00
scrawl
aa6ebcd75c
Change stolen items handling to match MW ( Fixes #1443 , Fixes #2290 )
2015-02-05 04:18:43 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
Jordan Ayers
1f036c0381
Patch for COC Spawn Issue.
...
OMW Bug #1079
Fall back to the first static's position, if there are no door markers.
2015-02-04 12:10:56 -06:00
scrawl
fbb8998184
Account for not yet listed cells in getInteriorPtrs
2015-02-04 16:41:14 +01:00
scrawl
14923f3e8b
Fix for broken unsetRefNum
2015-02-03 23:05:06 +01:00
scrawl
c98b7db4c1
Fix swim height, use fSwimHeightScale GMST
2015-01-31 22:40:43 +01:00
scrawl
86165d38d2
Add exception handling in addObjectToScene
2015-01-31 22:40:42 +01:00
scrawl
cbe135c60f
Don't require magicka for casting spells in God Mode ( Fixes #2331 )
2015-01-31 22:40:42 +01:00
scrawl
7542fb5cd9
Show map notes on door marker leading to the cell with the note ( Fixes #2284 )
2015-01-31 22:40:41 +01:00
scrawl
bd0a0e64a9
Fix overwriting script records not working
2015-01-31 22:40:40 +01:00
scrawl
5a9b30a8ca
Don't show VFX on the map ( Fixes #2324 )
2015-01-31 22:40:38 +01:00
scrawl
e712b0353b
Terrain refactoring, reduce game startup time and memory usage
2015-01-29 03:39:01 +01:00
scrawl
f4c8064d39
Fix camera not being attached properly when player becomes vampire ( Fixes #2319 )
2015-01-28 19:14:57 +01:00
scrawl
431f540791
ESSImport: fix NPC factions
2015-01-27 23:12:21 +01:00
scrawl
9d3f0b2ed5
Remove some unused code, include cleanup
2015-01-27 23:12:13 +01:00
scrawl
697ab16ec5
Fix for coverity defects
2015-01-27 19:00:26 +01:00
scrawl
72f7c2e555
Move weather reset to clear() method
2015-01-24 16:45:36 +01:00
scrawl
79d2eebe54
Store selected enchant item in savegame ( Fixes #1702 )
2015-01-23 16:45:47 +01:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
0fd5575efe
Improve warning message in ContainerStore::readState
2015-01-23 15:34:47 +01:00
scrawl
c7d15e6f74
Revert "Revert "Light charge handling fix""
...
This reverts commit b95748d044a421c2e02fa54cdc7e8aa902039e6c.
2015-01-23 15:33:39 +01:00
scrawl
d13335ba40
Ensure the item can be equipped in the given slot when loading inventory
2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0
Revert "Change save format to store relative equipment index"
...
This reverts commit 89d9649b50b2b6e102b90517a5b136cc74415ba0.
2015-01-23 02:32:43 +01:00
scrawl
b95748d044
Revert "Light charge handling fix"
...
This reverts commit 5e0428243b38d18c55b80e7675ea74a0563f5e44.
2015-01-23 02:32:38 +01:00
scrawl
5e0428243b
Light charge handling fix
2015-01-21 01:59:45 +01:00
scrawl
89d9649b50
Change save format to store relative equipment index
...
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
2015-01-20 23:55:26 +01:00
scrawl
9014dc48ee
Don't require the object type id for reading references from savegames
...
This is redundant, since we can look it up from the RefID.
2015-01-20 00:42:25 +01:00
scrawl
235683e449
Remove LightState from openmw save format to streamline inventory loading
2015-01-19 11:36:00 +01:00
scrawl
fc6aa256bf
Add comment
2015-01-15 16:05:25 +01:00
scrawl
6b2df95167
Fix for some coverity defects
2015-01-15 02:03:27 +01:00
