Nikolay Kasyanov defab0e4b5 Merge remote-tracking branch 'upstream/master' into osx_fix ...

Conflicts:
	CMakeLists.txt

2012-07-31 01:06:18 +04:00

..

bsa

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

compiler

Mostly removal of unnecessary #include's and a little clean up

2012-07-17 09:27:12 +02:00

esm

Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"

2012-07-23 15:36:12 +02:00

esm_store

Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"

2012-07-23 15:36:12 +02:00

file_finder

Issue #133 Handle resources across multiple data directories

2012-02-12 14:21:07 +01:00

files

bug #348: cleanup

2012-07-31 01:01:00 +04:00

interpreter

Issue #181: assignment to member variables

2012-06-16 14:29:55 +02:00

misc

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

nif

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

nifbullet

Merge remote branch 'zini/master' into nif-cleanup

2012-07-17 10:57:15 -07:00

nifogre

consider all material properties for nif material sharing, instead of just the texture

2012-07-26 23:40:55 +02:00

nifoverrides

override nif transparency settings (part 1)

2012-04-11 20:13:15 +02:00

settings

fix some settings bugs

2012-06-23 12:25:28 +02:00

terrain

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

to_utf8

Changed standard C lib includes to C++ format

2012-07-17 09:44:24 +02:00

CMakeLists.txt

bug #348: cleanup

2012-07-31 01:01:00 +04:00

doc.hpp

second set of additional doxygen comments

2010-09-25 20:15:05 +02:00