mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
5,093 Commits
38 Branches
54 Tags
122 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'bbac63bff7'
${ noResults }
Commit Graph

829 Commits (bbac63bff7cd2f16f00c2c9cde102f1dbdbb7c02)

Author SHA1 Message Date
eduard c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 12 years ago
Marc Zinnschlag 334588bf1c Merge branch 'editor2' 12 years ago
eduard c75a5ae212 string compare and tolower 12 years ago
eduard 8545667bbd string compare and tolower 12 years ago
Tom Mason a14b7e4a0f small fixes on text defines 12 years ago
Marc Zinnschlag e9ba7339f3 improved error handling 12 years ago
Marc Zinnschlag afc2e840ae renamed namespace TranslationData to Translation 12 years ago
Marc Zinnschlag 206c613b52 moved translation storage from GUI manager to engine 12 years ago
Marc Zinnschlag 2d468fec02 made previous commits naming standard compliant 12 years ago
Marc Zinnschlag 4c28f3211b Merge remote-tracking branch 'lazydev/master' 12 years ago
lazydev 1f71395660 renaming of translation component; removing of C++11 features 12 years ago
lazydev 74ae479780 Cell names localization fix 12 years ago
Tom Mason 8ac8fdff47 implemented all text defines except a few for keybindings that don't exist yet 12 years ago
Tom Mason f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 12 years ago
Thoronador 5a7a8629b6 remove unnecessary include directive 12 years ago
Thoronador 32f051d61d Remove 'GMST fixing' for dirty GMST records 
The 'fixing' for so-called dirty GMSTs does not work properly in its
current state anyway, so it should be removed. Fixing the 'GMST fixing'
might not be possible, because whether or not a GMST is 'dirty' depends
on the language version of MW. Therefore different 'fixing' algorithms
would be required for the different MW localisations, and I do not see
a good reason why GMST values should be hard-coded in the GMST load
procedure. In my opinion, it only clutters the code.

Last but not least, I believe that it is not the task of the engine to
clean ESM files from dirty entries. That is a job for the modders, who
should only release clean ESM/ESP files in the first place. The engine
should not need to worry about whether a file is 'dirty' or not.

That is why I believe a feature for cleaning ESM/ESP files shall not be
part of the engine.
 12 years ago
Marc Zinnschlag 5cd2fe00ab initialise blank global records 12 years ago
Marc Zinnschlag 8a09e03d5c global variable editing (no undo support yet) 12 years ago
Marc Zinnschlag ef9575498f basic (non-editable) subview for global variables 12 years ago
Marc Zinnschlag d684b3ae11 fixed getString function in NIF loader 12 years ago
scrawl 5f7d349126 several missing includes 12 years ago
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 12 years ago
greye b1ef0026a9 race selection/inventory preview character model update 12 years ago
Marc Zinnschlag 4994a253da Merge branch 'bountydisease' into dialogue 12 years ago
greye c3f0dc0dfb m prefix for NpcAnimation members 12 years ago
scrawl 00a2de432a fix BulletShapeLoader namespace 12 years ago
Marc Zinnschlag 662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 12 years ago
greye 8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 12 years ago
greye 5ac54d1fff alter ESM::Script for storing id as std::string 12 years ago
greye d5628c678f add mId field to every record indexed by id 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
greye f0a3ee0ef9 gmst id should be lowercase, wipe RecIdListT 12 years ago
scrawl 4ca0eb93ee fix markers used for raycasting and blocking activation 12 years ago
Marc Zinnschlag 3f6afb13f1 Merge remote-tracking branch 'scrawl/alchemy' 12 years ago
Marc Zinnschlag 18686614db Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 12 years ago
Marc Zinnschlag 510674aa5e Merge branch 'master' into alchemy 
Conflicts:
	components/esm/loadmgef.hpp
 12 years ago
Marc Zinnschlag 5fbca239dd Issue #61: potion creation (1st part; still missing some implementations) 12 years ago
scrawl 1a2034b4dd training window 12 years ago
scrawl 84a4fd56c3 consider all files in Splash directory 12 years ago
Marc Zinnschlag e05e683da3 Merge remote-tracking branch 'scrawl/spellcreation' 12 years ago
scrawl 8ccb0907e6 assertion -> exception; added the old effect flags again 12 years ago
Marc Zinnschlag 3fd887c030 silenced some warnings 12 years ago
Marc Zinnschlag 35d099a638 disabling gcc extensions 12 years ago
scrawl 21493c2dbd added magic effect flags from Research wiki page 12 years ago
greye 31f7325e1f fix land loading 12 years ago
greye 93078bb0dc move record ids to defs.hpp 12 years ago
greye 3494e17b7c wipe record superclass 12 years ago
greye 2fa4ac177a initial resolving 12 years ago
greye 721324c1db rm record inheritance, rework esmtool accordingly 12 years ago
Chris Robinson cd8515396a Use a multimap to store the text keys 12 years ago
Chris Robinson 9b491edbf8 Small cleanup for loading animation keyframes 12 years ago
scrawl d163f8203c change books to RecListWithIDT 12 years ago
greye 1339787863 remove underscores from filenames in esm 12 years ago
greye 7368e7b655 rename getASCII() to getLegacyEnc() 12 years ago
greye c54750977f remove underscores in guards 12 years ago
scrawl bf3aad8be0 handle NCC flag 12 years ago
scrawl 872fcf3e3d sleeping restoration of health, magicka, and fatigue 12 years ago
greye 18cc435aa1 resolving conflicts 12 years ago
greye 09195894cf restore INGR and MGEF 12 years ago
greye 2d5ddd104b Land::loadData rework 12 years ago
greye bd94f257bf a bit formatting 12 years ago
greye e69880f77e almost perfect byte copies, has redundant data 12 years ago
scrawl 8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl e8bba2b833 disabled loading of land normals again, didn't need them after all 12 years ago
scrawl 86cfc91ef3 global map rendering 12 years ago
greye 597b88e95a update saving AI packages 12 years ago
Marc Zinnschlag 4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Marc Zinnschlag 835c530e06 Merge branch 'ingredients' 12 years ago
scrawl b5ddc8d4fb Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision. 12 years ago
Marc Zinnschlag 677158c477 added typesafe access functions for GMST values 12 years ago
Marc Zinnschlag f2ab4c929d Issue #356: added hardcoded magic effect flags *grumble* 12 years ago
scrawl 906d290935 Markers are actually hidden now. Inspecting the markers in NifSkope revealed why it didn't work previously: the flag that is being looked for is not present in any of the markers, nor any other flag or extra data to identify them. However, the root node name always starts with "marker", making it possible to do a string search. 12 years ago
Jason Hooks c5b25ef70b Very basic actor physics (no set scale/rotate functions) 12 years ago
Alexander "Ace" Olofsson 7934d8abd9 Fixed an issue with some paths not concatenating properly. 12 years ago
Alexander "Ace" Olofsson bc6d87ba32 Oops, that would've broken getUserPath() on Linux... 12 years ago
Alexander "Ace" Olofsson cd3e780614 Removing the unnecessary local variables 12 years ago
Alexander "Ace" Olofsson 97f1be2b05 Testing a third way to solve the path issue 12 years ago
Alexander "Ace" Olofsson 6e317f00eb Fix the problem in a different way 12 years ago
Alexander "Ace" Olofsson b6fcd337df Modified the cache path to work on windows 12 years ago
Marc Zinnschlag e3d893b001 Merge remote-tracking branch 'jhooks/animationsmooth' 13 years ago
Edmondo Tommasina 7b73bfb099 settings.cpp: fix std::runtime_error compile error 
Fix following error:
[ 11%] Building CXX object
components/CMakeFiles/components.dir/nifoverrides/nifoverrides.cpp.o
/home/edmondo/src/openmw/components/settings/settings.cpp: In static
member function ‘static const std::string
Settings::Manager::getString(const std::string&, const std::string&)’:
/home/edmondo/src/openmw/components/settings/settings.cpp:82:15: error:
‘runtime_error’ is not a member of ‘std’
make[2]: ***
[components/CMakeFiles/components.dir/settings/settings.cpp.o] Error 1
 13 years ago
scrawl c27ff546e4 shader cache 13 years ago
scrawl 950bf66334 throw an exception if default value for a setting is not found 13 years ago
scrawl 4f1bcb749f turned off redundant edge list building 13 years ago
Jason Hooks 0697c7f7f4 Finally merged in master 13 years ago
greye a90547bbbe code formatting 13 years ago
greye 75fa0288a3 fix creatures has spells, creatures ai data 13 years ago
greye 02d7aa4135 npc ai packages 13 years ago
Marc Zinnschlag 34c30b132c Issue #378: workaround for bad ingredient records in Morrowind.esm 13 years ago
Michael Mc Donnell eff2799c1b Update UTF 8 table generator to print char values 
This patch is in relation to commit 25fa8165f97 (Use char literals in
UTF 8 conversion to fix 798 warnings), which changed the UTF 8 table
to have char integer values instead of unsigned chars. Those values were
converted using a custom Python script. This patch changes the original
table generator so it can now output the same format.
 13 years ago
Michael Mc Donnell 5fa8165f97 Use char literals in UTF 8 conversion to fix 798 warnings 
The data type is specified as char but the literals are unsigned char. This
results in 798 truncation warnings in vs2010. The literals were converted
with a simple python script to signed char while taking two's complement and
the overflow into account.

Also tested on Ubuntu 12.04 with gcc 4.6.
 13 years ago
Jason Hooks 5202b11235 just moving a comment 13 years ago
Jason Hooks 4a219404fc Super smooth animations; 100 PERCENT COMPLETE 13 years ago
Jason Hooks f21df64808 changing a few things around 13 years ago
Marc Zinnschlag 98219323b7 Merge remote-tracking branch 'mmd/vsdebugfixes' 13 years ago
Jason Hooks cc776810e2 smoother animations 13 years ago
Michael Mc Donnell 7952d38e6c Use debug dlls when debugging in vs2010 (try 2) 
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.

It also defines DEBUG to make it easier turn things on and off when
debugging.

There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
 13 years ago
Marc Zinnschlag 1da56e2832 removed some unused variables 13 years ago
Marc Zinnschlag 2a11a28e81 Revert "Use debug dlls when debugging in vs2010" 
This reverts commit ebe131b326.
 13 years ago