Marc Zinnschlag
|
8086933282
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
15 years ago |
Marc Zinnschlag
|
8d85211fa1
|
modified Npc and Creature class to let them store a copy of their own ID
|
15 years ago |
Armin Preiml
|
305563e595
|
disabled char encoding method for windows, although you'll need to add the iconv libs
|
15 years ago |
Marc Zinnschlag
|
6b1b3b20fd
|
store info records in dialogue records
|
15 years ago |
Marc Zinnschlag
|
d47de55ce9
|
read info records
|
15 years ago |
Marc Zinnschlag
|
69ea00455f
|
Merge branch 'poly'
Conflicts:
apps/openmw/mwworld/world.cpp
|
15 years ago |
Marc Zinnschlag
|
f50ced4616
|
added missing record classes
|
15 years ago |
Armin Preiml
|
986325b3b2
|
Changed decoding code page from ISO-8859-1 to WINDOWS-1252
|
15 years ago |
Armin Preiml
|
f3ee9ced5c
|
Added cmake file for the iconv library and extended relevant
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
|
15 years ago |
Nicolay Korslund
|
f87810ce7a
|
Moved esmtool to apps/
|
15 years ago |
athile
|
5fe4313b95
|
Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux.
|
15 years ago |
Marc Zinnschlag
|
d57e67e722
|
added global variable handling to compiler context (not working yet because of case problems)
|
15 years ago |
athile
|
59a2e8dcf7
|
Merge upstream
|
15 years ago |
athile
|
819c146ad1
|
Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings
|
15 years ago |
athile
|
b2485e8a52
|
Windows build fixes
|
15 years ago |
athile
|
d67f0c74b0
|
Merge remote branch 'upstream/master'
|
15 years ago |
Marc Zinnschlag
|
e4f85cb3e6
|
directory structure reorganisation (still missing the mangle stuff)
|
15 years ago |