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

1993 commits

Author SHA1 Message Date
scrawl
c1e6b8608b Always create a skeleton if there's an "ArrowBone" node (Fixes #2117) 2014-11-23 16:37:31 +01:00
Marc Zinnschlag
cd5d02402f Merge remote-tracking branch 'scrawl/wizard' 2014-11-21 09:48:57 +01:00
scrawl
e11bec1a37 Fix the launcher not properly reloading data directories 2014-11-20 22:36:24 +01:00
scrawl
31fab533fe OSX build fix 2014-11-20 18:14:49 +01:00
Marc Zinnschlag
86037149cd add optional string argument for activate instruction (ignored) 2014-11-20 11:06:32 +01:00
scrawl
c6558fe487 Fix Ogre being initialised twice 2014-11-19 13:19:02 +01:00
scrawl
751211351c Fix multi-line comment warning 2014-11-18 17:54:24 +01:00
scrawl
4fa303d7c4 Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
 2014-11-18 17:43:51 +01:00
Marc Zinnschlag
95dfb07816 make [ a whitespace character in scripts (Fixes #2126) 2014-11-15 09:53:08 +01:00
scrawl
273a80e2c0 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-11-11 15:43:46 +01:00
scrawl
92ab292e18 Make MODL subrecord for light records optional (Fixes #2114) 2014-11-09 04:50:54 +01:00
MiroslavR
b8d5a9486a Make Restore/Damage Attribute/Skill effects continuous 2014-11-08 00:57:03 +01:00
Arthur Moore
4a9a9855bf NIFStream getUInt should return an unsigned integer 2014-10-31 05:01:26 -04:00
Arthur Moore
4583dc05db Move NIFStream functions into a cpp file where they belong 2014-10-31 04:54:16 -04:00
scrawl
ccab8b1a92 Fix bug in TerrainGrid::getWorldBoundingBox (Fixes #2075) 2014-10-29 16:01:55 +01:00
scrawl
f7ba1dbfc8 Add error handling for getPcRank and similar defines (Fixes #2071) 2014-10-28 16:07:37 +01:00
scrawl
f57ddec6a2 Allow NIF rotation matrices that include scale values (Fixes #2052) 2014-10-27 21:53:00 +01:00
scrawl
fc1a897fbf Add comment to WNAM in ESM::Land 2014-10-27 21:53:00 +01:00
scrawl
4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:46:28 +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
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
6d7f4085a5 Add shader implementation of alpha test 2014-10-17 19:11:06 +02:00
Marc Zinnschlag
a3c894c1e2 Merge branch 'cellmarker' 2014-10-17 14:26:16 +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
cc9cii
313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-10-13 20:45:30 +11:00
Thoronador
4d62541b62 fix usage of numeric_limits static functions min() and max() 
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
 2014-10-12 23:28:16 +02:00
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11:00
Marc Zinnschlag
a0dbb40c8e Allow script names starting with digits (Fixes #1730) 2014-10-11 14:48:52 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
 2014-10-10 16:11:54 +02:00
cc9cii
406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 2014-10-09 23:47:30 +01:00
Marc Zinnschlag
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +02:00
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02:00
sylar
4c46da79de changed android configs paths 2014-10-07 23:31:22 +04:00
cc9cii
c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
 2014-10-04 06:20:10 +10:00
scrawl
eda296f1e3 Remove workaround for Ogre 1.8 (no longer supported) 2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6 Don't sell racial spells (Fixes #1961) 2014-10-02 16:50:05 +02:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +02:00
Marc Zinnschlag
d64127106b load and save pathgrid records 2014-10-02 12:30:15 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
cc9cii
687b62dfd3 Revert some changes (mostly iostream adds) 2014-09-30 18:46:26 +10:00
cc9cii
312b7cd571 Merge branch 'master' into QtOGre 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
 2014-09-30 10:52:04 +10:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
4b8ea25cf0 Add missing case folding for dependency filenames (Fixes #1940) 2014-09-26 20:47:53 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
790e0150b1 Fix global map markers being duplicated when cell is visited again 2014-09-26 16:51:48 +02:00
scrawl
6b82e3665b Remove old nifbullet test 2014-09-26 16:10:55 +02:00
scrawl
487e318ede Remove old niftool test 2014-09-26 15:25:51 +02:00
scrawl
fc4f069d0f Remove old BSA tests 2014-09-26 15:22:08 +02:00
Marc Zinnschlag
850dbb55a5 improved magic effect IDs 2014-09-26 13:36:54 +02:00
scrawl
0bc840aadd Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
scrawl
e4c097b4f7 Fix wrong default ExpandDirection for AutoSizedButton 2014-09-25 19:22:26 +02:00
scrawl
6b65502557 Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +02:00
Marc Zinnschlag
58a9176c18 preparing magic effects record for use in OpenCS 2014-09-25 14:16:00 +02:00
scrawl
1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 2014-09-25 00:04:38 +02:00
scrawl
45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 2014-09-24 12:21:19 +02:00
Marc Zinnschlag
02247fe712 load and save sound gen records 2014-09-23 12:20:02 +02:00
Marc Zinnschlag
147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix' 
Conflicts:
	CMakeLists.txt
 2014-09-23 08:57:49 +02:00
slothlife
35ced14e45 Fix for MSVC warnings 2014-09-22 21:33:09 -05:00
eroen
0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 2014-09-22 15:36:42 +02:00
Marc Zinnschlag
89beecad8c Merge remote-tracking branch 'scrawl/master' 2014-09-21 12:24:53 +02:00
scrawl
4d6ebfb496 Allow KeyFrameControllers on the RootCollisionNode and its children (Bug #1934) 2014-09-20 17:13:51 +02:00
scrawl
144c818b41 Throw an exception if a required Ogre plugin is not found 2014-09-20 16:12:52 +02:00
scrawl
dec9ffdb6c ESM: Make sure to clear old list when a list is overwritten by another content file (Fixes #1932) 2014-09-20 13:34:20 +02:00
Sebastian Wick
41094a8641 the global config path is not always $prefix/etc, so just define the whole path in the build system 2014-09-19 20:23:39 +02:00
Sebastian Wick
2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 2014-09-19 03:15:28 +02:00
Marc Zinnschlag
d1d861e1be Merge branch 'run' 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
 2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009 allow project scope scripts 2014-09-14 11:41:28 +02:00
Marc Zinnschlag
9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 2014-09-14 10:45:26 +02:00
scrawl
a413e91442 ImageButton: get texture size from MyGUI, rather than from Ogre 2014-09-12 05:17:45 +02:00
scrawl
c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 2014-09-12 05:14:21 +02:00
scrawl
ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 2014-09-12 04:27:23 +02:00
scrawl
ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 2014-09-11 23:33:54 +02:00
Marc Zinnschlag
9ae9104a45 Merge branch 'openmw-32' 2014-09-11 14:22:07 +02:00
Marc Zinnschlag
14f32563e7 fixed script compiler code ordering issue 2014-09-09 13:55:10 +02:00
scrawl
f3f869e99a Don't produce NaN's for 0-length controllers in NifOgre::DefaultFunction 2014-09-07 23:47:57 +02:00
Marc Zinnschlag
d4c27d4ce0 Merge remote-tracking branch 'mellotanica/master' 2014-09-07 10:10:54 +02:00
Rohit Nirmal
e315a72582 Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
Marco Melletti
9b6faa2ffa wrong rearrangement fixes 
misleading comments fixed
 2014-09-06 17:04:50 +02:00
Marco Melletti
e1393ad2df reputation sorted out 2014-09-06 15:16:04 +02:00
Marco Melletti
2e47290ed0 finished loadnpc.hpp, fixed npdt 52byte structure 2014-09-05 21:23:25 +02:00
scrawl
1c178768f5 Allow Script records with missing SCDT (precompiled code, not used anyway) 
Not sure on the exact conditions, but this was missing in a plugin that I made in the TES-CS, while vanilla MW would load it just fine.
 2014-09-05 16:43:20 +02:00
Marco Melletti
bc7e154643 done with header files, unsure about mSkills and mReputation in 
loadnpc.hpp
 2014-09-04 13:23:29 +02:00
Marco Melletti
8bce460f34 loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix 2014-09-03 14:40:32 +02:00
scrawl
819234cdfe Use rbegin() instead of --end() 2014-09-02 05:46:12 +02:00
scrawl
9809748eba Store NIF keys mapped by time and use lower_bound for searches 2014-09-02 04:29:30 +02:00
scrawl
0da4757ee6 Merge branch 'master' of github.com:scrawl/openmw 2014-09-01 02:04:18 +02:00
scrawl
267cf4e140 Implement ResetActors script instruction (Fixes #1859) 2014-08-30 18:27:32 +02:00
Marc Zinnschlag
2eadff54d4 Merge remote-tracking branch 'rohitnirmal/scan-build-fixes' 2014-08-29 13:40:37 +02:00
Rohit Nirmal
b5eb16b663 Silence some scan-build warnings. 2014-08-28 20:55:32 -05:00
cc9cii
df87859d7c Move the workaround to loadscpt.cpp as per feedback comments. 2014-08-29 07:41:49 +10:00
Marc Zinnschlag
ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 2014-08-28 12:34:08 +02:00
cc9cii
7ff1136d81 For compiling in Windows with MSVC. 2014-08-27 21:25:47 +10:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
scrawl
c2a91148f3 Implement multiple emitter nodes for NiBSPArrayController 
The particles for the flame, frost and storm atronachs work correctly now.
 2014-08-26 03:06:30 +02:00
scrawl
44642ae21b Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd) 2014-08-26 02:09:23 +02:00
Marc Zinnschlag
f1f38fc786 Merge remote-tracking branch 'miroslavr/master' 2014-08-25 22:03:40 +02:00
MiroslavR
46e9ee408f Do not allow mods to change fixed effect properties in the legacy format, but allow it entirely in the new format. 2014-08-25 18:59:50 +02:00
MiroslavR
3823e36f05 Merge branch 'master' of github.com:OpenMW/openmw 2014-08-25 00:56:35 +02:00