Marc Zinnschlag
3fd887c030
silenced some warnings
2012-10-09 17:11:41 +02:00
Marc Zinnschlag
35d099a638
disabling gcc extensions
2012-10-09 17:10:25 +02:00
greye
31f7325e1f
fix land loading
2012-10-01 15:46:32 +04:00
greye
93078bb0dc
move record ids to defs.hpp
2012-10-01 00:55:27 +04:00
greye
3494e17b7c
wipe record superclass
2012-10-01 00:51:54 +04:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
greye
721324c1db
rm record inheritance, rework esmtool accordingly
2012-09-30 23:34:53 +04:00
Chris Robinson
cd8515396a
Use a multimap to store the text keys
2012-09-28 23:20:15 -07:00
Chris Robinson
9b491edbf8
Small cleanup for loading animation keyframes
2012-09-28 18:53:24 -07:00
scrawl
d163f8203c
change books to RecListWithIDT
2012-09-25 21:38:34 +02:00
greye
1339787863
remove underscores from filenames in esm
2012-09-23 23:12:10 +04:00
greye
7368e7b655
rename getASCII() to getLegacyEnc()
2012-09-23 22:20:18 +04:00
greye
c54750977f
remove underscores in guards
2012-09-23 22:11:08 +04:00
scrawl
bf3aad8be0
handle NCC flag
2012-09-23 18:30:13 +02:00
scrawl
872fcf3e3d
sleeping restoration of health, magicka, and fatigue
2012-09-21 17:53:16 +02:00
greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
greye
09195894cf
restore INGR and MGEF
2012-09-21 12:30:08 +04:00
greye
2d5ddd104b
Land::loadData rework
2012-09-21 12:12:16 +04:00
greye
bd94f257bf
a bit formatting
2012-09-21 09:36:18 +04:00
greye
e69880f77e
almost perfect byte copies, has redundant data
2012-09-20 20:33:30 +04:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
e8bba2b833
disabled loading of land normals again, didn't need them after all
2012-09-20 14:06:30 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
greye
597b88e95a
update saving AI packages
2012-09-18 19:30:19 +04:00
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
2012-09-18 11:25:09 +02:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
Marc Zinnschlag
835c530e06
Merge branch 'ingredients'
2012-09-13 13:31:46 +02:00
scrawl
b5ddc8d4fb
Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision.
2012-09-13 13:10:02 +02:00
Marc Zinnschlag
677158c477
added typesafe access functions for GMST values
2012-09-13 10:41:55 +02:00
Marc Zinnschlag
f2ab4c929d
Issue #356 : added hardcoded magic effect flags *grumble*
2012-09-13 09:26:17 +02:00
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.
2012-09-12 12:41:12 +02:00
Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
2012-09-10 20:29:24 -04:00
Alexander "Ace" Olofsson
7934d8abd9
Fixed an issue with some paths not concatenating properly.
2012-09-09 16:28:02 +02:00
Alexander "Ace" Olofsson
bc6d87ba32
Oops, that would've broken getUserPath() on Linux...
2012-09-08 23:04:53 +02:00
Alexander "Ace" Olofsson
cd3e780614
Removing the unnecessary local variables
2012-09-08 20:34:43 +02:00
Alexander "Ace" Olofsson
97f1be2b05
Testing a third way to solve the path issue
2012-09-08 18:47:31 +02:00
Alexander "Ace" Olofsson
6e317f00eb
Fix the problem in a different way
2012-09-08 15:57:12 +02:00
Alexander "Ace" Olofsson
b6fcd337df
Modified the cache path to work on windows
2012-09-08 15:08:24 +02:00
Marc Zinnschlag
e3d893b001
Merge remote-tracking branch 'jhooks/animationsmooth'
2012-09-06 09:09:46 +02:00
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
2012-09-05 23:39:58 +02:00
scrawl
c27ff546e4
shader cache
2012-09-02 19:40:26 +02:00
scrawl
950bf66334
throw an exception if default value for a setting is not found
2012-09-02 11:39:54 +02:00
scrawl
4f1bcb749f
turned off redundant edge list building
2012-09-02 10:09:41 +02:00
Jason Hooks
0697c7f7f4
Finally merged in master
2012-09-01 17:28:12 -04:00
greye
a90547bbbe
code formatting
2012-08-29 21:35:06 +04:00
greye
75fa0288a3
fix creatures has spells, creatures ai data
2012-08-29 14:35:43 +04:00
greye
02d7aa4135
npc ai packages
2012-08-29 14:35:43 +04:00
Marc Zinnschlag
34c30b132c
Issue #378 : workaround for bad ingredient records in Morrowind.esm
2012-08-28 10:12:22 +02:00
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.
2012-08-27 10:55:39 -04:00
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.
2012-08-22 16:42:53 -04:00
