1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 06:19:55 +00:00
Commit graph

7529 commits

Author SHA1 Message Date
scrawl
2eedb3acec Include fix 2015-02-27 20:22:43 +01:00
scrawl
75db4d6473 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 2015-02-11 12:11:59 +01:00
scrawl
dfaab1188f Fix for broken levelled creature spawning (Fixes #2365) 2015-02-11 12:10:46 +01:00
Marc Zinnschlag
2b619296d7 Merge remote-tracking branch 'scrawl/master' 2015-02-11 11:30:44 +01:00
scrawl
bf1839b370 Always print the exception to stderr 2015-02-10 22:01:57 +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
218f789d88 Fix player DrawState reset when selecting enchanted item (Fixes #2356) 2015-02-09 20:16:29 +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
fce404acc5 Remove some including of mwbase/world.hpp
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
2015-02-09 17:45:48 +01:00
Alexander "Ace" Olofsson
f2c5060cc0 Fix cstdint issue on travis GCC build 2015-02-09 16:37:20 +01:00
Alexander "Ace" Olofsson
d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 2015-02-09 16:23:41 +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
9dbd9af31c Adjust fix for Bug #2360 to repair affected savegames 2015-02-08 21:26:58 +01:00
scrawl
b542143e3a Fix faction reputation case sensitivity issue (Fixes #2360) 2015-02-08 21:04:01 +01:00
scrawl
ad8790fba0 Fix setWaterLevel script instruction not affecting physics 2015-02-08 15:50:40 +01:00
scrawl
01e32aef79 Fix exception moving a disabled object between cells 2015-02-08 14:34:31 +01:00
MiroslavR
2223a69ab8 Fix getpcinjail returning 0 when the console is open 2015-02-07 20:13:11 +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
MiroslavR
9bbe6f8c5e Remove todo 2015-02-07 18:39:05 +01:00
MiroslavR
1230cf49bf Properly center jail progress widget, fix a bug with it not disappearing if the console is open 2015-02-07 18:38:41 +01: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
9ce3e4b4e1 UI consistency fix in levelup dialog 2015-02-06 01:27:17 +01:00
scrawl
61ec9196c8 Cap the displayed attribute multiplier in levelup to attribute points left to 100 2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78 Fix iLevelUpTotal not being used in the levelUp logic 2015-02-06 01:27:17 +01:00
scrawl
55cd9b526c Skill progress bar changed to match MW 2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0 ESSImport: import player skill progress 2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e Skill progress refactoring 2015-02-06 01:27:16 +01:00
scrawl
dd8aab2a7f Adjust help for --load-savegame again 2015-02-06 01:27:16 +01:00
scrawl
356d1c7657 ESSImport: convert stolen item tracker 2015-02-06 01:27:16 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
c1862cbfc2 Clarify documentation for --load-savegame 2015-02-05 04:18:43 +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
955505c167 Remove unused function 2015-02-05 04:18:43 +01:00
scrawl
27dc49a135 Rewrite game settings manager
Removes the abhorrent dependency on Ogre for this code and improves the error handling.
2015-02-05 04:18:42 +01:00
scrawl
6ea59c93ab Ignore the object scale in Move instruction (Fixes #2275) 2015-02-05 04:18:42 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +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