krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
12969 commits 35 branches 0 tags 65 MiB
Commit graph

9832 commits

Author SHA1 Message Date
slothlife
cfe81bafe8 Remove setting CMAKE_BUILD_TYPE to Debug 
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
 2015-02-11 21:46:00 -06: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
03257ecae5 QString encoding fix 2015-02-09 20:15:41 +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
b714e5211d Redefinition of default template argument 
Sometimes it's annoying how MSVC casually allows you to break C++ standards
 2015-02-09 17:25:55 +01:00
Alexander "Ace" Olofsson
f77ae711e4 Fix template closer 2015-02-09 17:10:09 +01:00
Alexander "Ace" Olofsson
cfcaf4528f Some more forward-declaring for OpenMW-CS 2015-02-09 16:50:34 +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
Marc Zinnschlag
ea21fbcbe6 Merge remote-tracking branch 'dteviot/master' 2015-02-06 09:22:57 +01:00
Nikolay Kasyanov
5534306eb3 Few rename fixes 2015-02-06 08:59:00 +02: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
5096e5dc0c esmtool minor/major skills fix 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
dteviot
cac250a90d Fixed typo in comment. 2015-02-06 12:45:15 +13:00
dteviot
9d9cabf40d Fix: Importer creates a single Content List (Fixes #2345) 2015-02-06 12:24:06 +13: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
9825b68dfb Fix SDL eating SIGINT signals in the launcher (Fixes #2328) 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
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
0b7b627443 CMake fix for opencs rename 2015-02-03 13:57:40 +01:00
Marc Zinnschlag
0557d45bd1 renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
MiroslavR
ee8f88fc42 Reset health modifier when actor dies (Fixes #2330) 2015-02-01 22:04:49 +01:00
Marc Zinnschlag
82ff737c31 Merge remote-tracking branch 'scrawl/master' 2015-02-01 12:10:28 +01:00
scrawl
7e33471edb Fix code duplication 2015-01-31 22:40:43 +01:00
scrawl
c98b7db4c1 Fix swim height, use fSwimHeightScale GMST 2015-01-31 22:40:43 +01:00
scrawl
57a259c526 Remove references to no longer used font 2015-01-31 22:40:43 +01:00
scrawl
56799c79f4 Fix attachArrow exception when changing weapon (Fixes #2332) 2015-01-31 22:40:42 +01:00
scrawl
fec8cf91f5 Add exception handling to various uses of DataStream::read 2015-01-31 22:40:42 +01:00
scrawl
86165d38d2 Add exception handling in addObjectToScene 2015-01-31 22:40:42 +01:00
scrawl
73e57f53a8 Always print openmw version in the log 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
7d76f1a113 PlaceAt count argument should spawn independent references (Fixes #2283) 2015-01-31 22:40:41 +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
54e79c8c98 Use mouse pressed event for pin button instead of mouse click 2015-01-31 22:40:41 +01:00
scrawl
c093e284d9 Delegate cleanup 2015-01-31 22:40:41 +01:00
scrawl
bdcc3a4036 Add missing swish sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
326eaea8a6 Add missing sound for drawing throwing weapons (Fixes #2308) 2015-01-31 22:40:40 +01:00
scrawl
0497a40d09 Fix incorrect sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead 
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
 2015-01-31 22:40:40 +01:00
scrawl
bd0a0e64a9 Fix overwriting script records not working 2015-01-31 22:40:40 +01:00
scrawl
d1b5956a98 Fix crash on exit 2015-01-31 22:40:40 +01:00
scrawl
51c05264b0 ESSImport: note where skill progress is stored (not converted yet) 2015-01-31 22:40:39 +01:00
scrawl
c4038f7021 ESSImport: convert camera first/third person state 2015-01-31 22:40:39 +01:00
scrawl
f3c79c0aa0 ESSImport: convert player DrawState, cleanup 2015-01-31 22:40:39 +01:00
scrawl
2e4b5858e7 ESSImport: add ANSI color code highlighting for --compare switch 2015-01-31 22:40:39 +01:00
scrawl
b9acf437fd Remove friendly hits from the save file 
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
 2015-01-31 22:40:39 +01:00
scrawl
ef3ba12cb6 Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
scrawl
e7056b4e27 ESSImport: convert Dead flag 2015-01-31 22:40:39 +01:00
scrawl
5a9b30a8ca Don't show VFX on the map (Fixes #2324) 2015-01-31 22:40:38 +01:00
scrawl
7e3843de42 ESSImport: convert Attacked flag 2015-01-31 22:40:38 +01:00
scrawl
081c8c8615 ESSImport: convert to utf8, based on encoding setting in openmw.cfg 2015-01-31 22:40:38 +01:00
scrawl
417f60f467 Use the mooncircle textures (Fixes #1624, Fixes #1743) 2015-01-31 22:40:38 +01:00
scrawl
e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 2015-01-31 22:40:38 +01:00
scrawl
dac1290597 Reduce size of water plane and increase subdivisions (Fixes #969) 2015-01-31 22:40:37 +01:00
Marc Zinnschlag
c02c72e134 Merge remote-tracking branch 'jordan-ayers/topic/dialogue-set' 2015-01-30 18:23:14 +01:00
Jordan Ayers
419046e121 Dialogue: Use std::set for known topics in the manager. 
There were three different data structures being used for topic lists
in this code.  (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >.  This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.

The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
 2015-01-29 18:28:13 -06:00
Marc Zinnschlag
1150b41c18 Merge remote-tracking branch 'scrawl/master' 2015-01-29 16:12:29 +01:00