scrawl
41df4289c6
Merge remote-tracking branch 'upstream/openmw-33' into HEAD
...
Conflicts:
apps/openmw/mwworld/store.hpp
2014-10-21 19:40:58 +02:00
scrawl
ba26879fd4
Merge pull request #336 from ace13/openmw-33
...
Fix compile error on Windows
2014-10-21 19:39:36 +02:00
Alexander "Ace" Olofsson
b5a57920b6
Fix compile error on Windows
2014-10-21 19:35:17 +02:00
scrawl
bb10af64c0
Revert "Disable travis IRC spam until the OSX build is fixed"
...
This reverts commit 841d52f1f7
2014-10-21 16:12:33 +02:00
Marc Zinnschlag
5fdd264d07
Merge remote-tracking branch 'origin/master'
2014-10-21 12:38:35 +02:00
Marc Zinnschlag
843493e90a
fixed case-problem in OpenCS script compiler
2014-10-21 12:38:18 +02:00
scrawl
8b3755a770
Compile fix
2014-10-20 17:45:24 +02:00
scrawl
f2877c69d7
Fix old alchemy apparatus still showing in alchemy window after removal
2014-10-20 17:45:18 +02:00
scrawl
192069a181
Add automatic potion naming
2014-10-20 17:45:11 +02:00
scrawl
fd7c181e06
Fix alchemy producing potion IDs from content files
2014-10-20 17:45:06 +02:00
scrawl
9bb51fd9c2
Compile fix
2014-10-20 17:42:51 +02:00
scrawl
ace8e0175b
Fix old alchemy apparatus still showing in alchemy window after removal
2014-10-20 17:28:51 +02:00
scrawl
29ac97be7a
Add automatic potion naming
2014-10-20 17:28:51 +02:00
scrawl
7f06e3e7e3
Fix alchemy producing potion IDs from content files
2014-10-20 17:07:54 +02:00
scrawl
4047e3c928
Properly handle DialInfo records that were marked as Deleted ( Fixes #2035 )
2014-10-19 17:46:28 +02:00
scrawl
b0f98687e6
Properly handle DialInfo records that were marked as Deleted ( Fixes #2035 )
2014-10-19 17:45:18 +02:00
Marc Zinnschlag
154cac506c
Merge remote-tracking branch 'emperorarthur/nif-cleanup'
2014-10-19 16:13:48 +02:00
Marc Zinnschlag
94ae222f0e
Merge branch 'settings'
2014-10-19 13:44:15 +02:00
Marc Zinnschlag
a5bbfff9e2
another layout correction
2014-10-19 13:43:40 +02:00
Marc Zinnschlag
5a1ce4943e
added advance 3D rendering user settings section
2014-10-19 13:41:56 +02:00
Arthur Moore
38bcff2622
Moved base NIF classes into a separate file.
...
This resolves the dependency mess, and makes things more readable.
The dependency tree for nif records now looks like this:
Record.hpp
--base.hpp
----controlled.hpp
----controller.hpp
----data.hpp
----effect.hpp
----extra.hpp
----node.hpp
Node.hpp has many extra dependencies because nifogre only includes it instead of each of these files.
That should be fixed.
2014-10-19 03:01:30 -04:00
Arthur Moore
5abed1c32a
Print a NIF file's version information when an error occurs
2014-10-19 02:54:27 -04:00
Arthur Moore
9ebf3f2f10
Provide more data when nifstream throws a runtime_error
2014-10-19 02:42:28 -04:00
Marc Zinnschlag
8ba2b24a13
updated changelog
2014-10-18 18:13:08 +02:00
Marek Kochanowicz
9213067aee
created new branch as a simple solution to the /manual branch mess
2014-10-18 13:46:11 +02:00
scrawl
bf0669e18c
Ignore some extra string arguments to ShowMap ( Fixes #2029 )
...
Required for a dialogue result script in Morrowind.esm ("ShowMap Dren Plantation").
This must do the same as "ShowMap Dren", which actually does work properly, since ShowMap supports partial string matching.
2014-10-18 00:56:41 +02:00
scrawl
738f010b5e
Ignore some extra string arguments to ShowMap ( Fixes #2029 )
...
Required for a dialogue result script in Morrowind.esm ("ShowMap Dren Plantation").
This must do the same as "ShowMap Dren", which actually does work properly, since ShowMap supports partial string matching.
2014-10-18 00:36:07 +02:00
scrawl
841d52f1f7
Disable travis IRC spam until the OSX build is fixed
2014-10-18 00:02:12 +02:00
scrawl
deabc52c16
Treat "Root Bone" as the animation root if existing ( Fixes #2019 )
2014-10-17 23:29:59 +02:00
scrawl
415f67f859
Treat "Root Bone" as the animation root if existing ( Fixes #2019 )
2014-10-17 23:29:13 +02:00
scrawl
5892fd9e65
Fix NpcAnimation non-existing skeleton crash ( Fixes #2028 )
2014-10-17 23:07:01 +02:00
scrawl
8233f5894a
Fix NpcAnimation non-existing skeleton crash ( Fixes #2028 )
2014-10-17 23:04:36 +02:00
scrawl
f117a75747
Force walk animation when flying ( Fixes #2015 )
2014-10-17 19:11:06 +02:00
scrawl
6d7f4085a5
Add shader implementation of alpha test
2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298
Show tooltip for non-affordable list items ( Fixes #2025 )
2014-10-17 19:02:31 +02:00
scrawl
2be65a89a7
Show tooltip for non-affordable list items ( Fixes #2025 )
2014-10-17 19:01:28 +02:00
Marc Zinnschlag
2106893563
silenced a compiler warning regarding null pointer dereferencing
2014-10-17 15:47:31 +02:00
Marc Zinnschlag
49938182e8
silenced a compiler warning regarding null pointer dereferencing
2014-10-17 15:46:07 +02:00
Marc Zinnschlag
a3c894c1e2
Merge branch 'cellmarker'
2014-10-17 14:26:16 +02:00
Marc Zinnschlag
994159fafd
fixed broken iterator
2014-10-17 14:23:37 +02:00
Marc Zinnschlag
8a05c0e5c0
fixed overlay singleton
2014-10-17 14:23:27 +02:00
Marc Zinnschlag
ba46bcad40
Revert "Don't allow viewing non-existent cells from the regionmap."
...
This reverts commit 7cdab41501
2014-10-17 13:52:21 +02:00
Marc Zinnschlag
4b921c3876
user settings cleanup
2014-10-17 13:49:33 +02:00
Marc Zinnschlag
c97845d35d
better script compiler diagnostics
2014-10-17 10:59:25 +02:00
scrawl
c3ef39eb6f
Fix ItemWidget text cleanup ( Fixes #2022 )
2014-10-17 02:41:43 +02:00
scrawl
86280df55a
DialInfo: Clear SelectStructs from previous loadings when a record is overwritten ( Fixes #2017 )
2014-10-16 19:35:20 +02:00
Marc Zinnschlag
ed44f3ec7d
added tooltip support to user settings UI
2014-10-16 16:22:36 +02:00
scrawl
c4e81adb83
Fix settings window being too small for all tabs on some localizations
2014-10-16 15:49:01 +02:00
Marc Zinnschlag
7de6360695
Removed all content from opencs.ini
...
Not needed since we already have reasonable default values within the code. Keeping the file to allow global modifications to these values.
2014-10-16 14:50:25 +02:00
Marc Zinnschlag
f4894deff1
removed special value text from spin boxes (broken feature, not used anyway)
2014-10-16 14:47:55 +02:00
