mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 04:19:55 +00:00
Code Issues Releases Wiki Activity
13239 commits 38 branches 54 tags 122 MiB
Commit graph

848 commits

Author SHA1 Message Date
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
scrawl
99e1720980 Add SceneManager and clone utility 2015-03-26 18:02:51 +01:00
scrawl
72400747f2 OpenCS: preliminary port of cell rendering to OSG 2015-03-25 23:35:10 +01:00
scrawl
aedafe651a OpenCS: delete physicssystem, will be replaced with OSG picking 2015-03-25 19:08:09 +01:00
scrawl
af27a10b0c OpenCS: preliminary port of PreviewWidget to OSG 2015-03-20 16:22:33 +01:00
scrawl
40fc097722 OpenCS: use the new VFS, restored resource tables 2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3 OpenCS compiles and runs again (no rendering) 2015-03-19 17:21:15 +01:00
scrawl
4d0bb6329a Fix incorrect reference check 
This check was broken for exterior cells (empty cell id).

It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
 2015-03-16 01:50:57 +01:00
Marc Zinnschlag
cf077dcf5d Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn' 2015-03-14 14:25:49 +01:00
Marc Zinnschlag
55bd0c728e Merge branch 'threadfix' 2015-03-14 12:00:35 +01:00
Marc Zinnschlag
c0dfad23b3 Fixed editor operation multi-threading (Fixes #923) 2015-03-14 12:00:24 +01:00
cc9cii
17e6244bd6 Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
cc9cii
fd86076db3 More warning fixes. 2015-03-14 08:09:19 +11:00
cc9cii
4f6c772437 Fix more warnings. 2015-03-14 06:36:35 +11:00
cc9cii
488bc76da5 Fix saving land data. 2015-03-13 22:06:55 +11:00
cc9cii
589b0b9171 Add saving land and land textures. Should resolve Bug #2447. 2015-03-13 08:01:48 +11:00
Marc Zinnschlag
8e37e9a14a removed redundant functions 2015-03-12 10:51:50 +01:00
Marc Zinnschlag
8a8db8bc24 Merge remote-tracking branch 'cc9cii/editor-clone-fix' 2015-03-12 10:45:51 +01:00
cc9cii
dc9af19dcf Don't use C++11 features. 2015-03-12 08:28:26 +11:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
cc9cii
28259f914c Remove potential memory leak. 2015-03-11 10:49:21 +11:00
cc9cii
43ec933b7b Revert to the original clone() method. Create a new copy method for modified records. 2015-03-10 09:45:35 +11:00
cc9cii
8ac7b77d36 For RefId's, modify a copy of the base record rather than modifying the record directly. 2015-03-10 06:51:54 +11:00
cc9cii
8b3adec3ec Added a missing copy constructor. 2015-03-09 21:25:41 +11:00
cc9cii
f90cdec53b Remove default parameters from the implementation. 2015-03-09 16:24:35 +11:00
cc9cii
6087a18c94 Implement clone() using a new Record constructor. 2015-03-09 14:58:07 +11:00
cc9cii
128371c902 Copy base data to modified. 2015-03-08 15:50:50 +11:00
cc9cii
a54ab153b0 Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429. 2015-03-08 10:05:10 +11:00
Marc Zinnschlag
0b70fdac57 added start script verifier 2015-03-05 11:24:01 +01:00
Marc Zinnschlag
1ed606065c save start script records 2015-03-03 16:11:00 +01:00
Marc Zinnschlag
4e1c086d6a load start up script records 2015-03-03 14:31:59 +01:00
cc9cii
66ef9d237c Another try to make it work with gcc/travis. 2015-03-03 10:12:40 +11:00
cc9cii
7c0f5b72c5 Add enum namespace to workaround travis. 2015-03-03 08:31:06 +11:00
cc9cii
a8427c2efb Do not add NAME subrecords while saving magic effects or scripts. 2015-03-03 07:36:11 +11:00
Marc Zinnschlag
64938b3796 Merge remote-tracking branch 'cc9cii/saving-skil' 2015-03-01 10:36:26 +01:00
Marc Zinnschlag
59c7fe28d9 Merge remote-tracking branch 'naclander/master' 2015-03-01 10:23:08 +01:00
cc9cii
5ff66ad40b Fix Bug #2402. SKIL records should not have NAME subrecord. 2015-03-01 13:09:23 +11:00
scrawl
3158d34abb Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all. 2015-02-25 20:25:41 +01:00
Nathan Aclander
6d7e1242cc Fixed incorrect casting 
Only cast to strings things that are ints. Also I missed an mFactionRank to cast.
 2015-02-20 20:18:31 -08:00
Nathan Aclander
539e8276c8 Silenced clang warning by converting int to string 2015-02-19 19:05:19 -08:00
Alexander "Ace" Olofsson
a61019dfa8 Update referencecheck.cpp 
MSVC does not allow for the usage of 'and' or 'or' literals
 2015-02-15 04:47:25 +01:00
Kamil Bar
3b7a23aa72 Fixed charge checks for light and other objects, corrected CellRef charge union comments 2015-02-13 13:11:10 +01:00
Kamil Bar
9628415e21 Missing change & changed comments to represent actual code 2015-02-13 12:16:46 +01:00
Kamil Bar
52a064afc3 Fixed charges checking 2015-02-13 12:13:40 +01:00
Kamil Bar
e1314d6211 Implement OpenCS reference validation (Feature #831) 2015-02-13 04:45:18 +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
scrawl
c7d15e6f74 Revert "Revert "Light charge handling fix"" 
This reverts commit b95748d044.
 2015-01-23 15:33:39 +01:00
scrawl
b95748d044 Revert "Light charge handling fix" 
This reverts commit 5e0428243b.
 2015-01-23 02:32:38 +01:00