mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-19 20:53:50 +00:00
Merge branch 'master' into startup
Conflicts: apps/opencs/CMakeLists.txt
This commit is contained in:
Marc Zinnschlag
commit
3f0a49a2f6
7 changed files with 166 additions and 53 deletions
|
|
@ -15,7 +15,7 @@ include (OpenMWMacros)
|
|||
# Version
|
||||
|
||||
set (OPENMW_VERSION_MAJOR 0)
|
||||
set (OPENMW_VERSION_MINOR 20)
|
||||
set (OPENMW_VERSION_MINOR 21)
|
||||
set (OPENMW_VERSION_RELEASE 0)
|
||||
|
||||
set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
|
||||
|
|
@ -306,7 +306,7 @@ endif()
|
|||
|
||||
# Compiler settings
|
||||
if (CMAKE_COMPILER_IS_GNUCC)
|
||||
add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++0x -pedantic)
|
||||
add_definitions (-Wall -Wextra -Wno-unused-parameter -Wno-reorder -std=c++03 -pedantic -Wno-long-long)
|
||||
|
||||
# Silence warnings in OGRE headers. Remove once OGRE got fixed!
|
||||
add_definitions (-Wno-ignored-qualifiers)
|
||||
|
|
@ -496,7 +496,7 @@ if (WIN32)
|
|||
# Warnings that aren't enabled normally and don't need to be enabled
|
||||
# They're unneeded and sometimes completely retarded warnings that /Wall enables
|
||||
# Not going to bother commenting them as they tend to warn on every standard library files
|
||||
4061 4263 4264 4266 4350 4514 4548 4571 4610 4619 4623 4625 4626 4628 4640 4668 4710 4711 4820 4826 4917 4946
|
||||
4061 4263 4264 4266 4350 4371 4514 4548 4571 4610 4619 4623 4625 4626 4628 4640 4668 4710 4711 4820 4826 4917 4946
|
||||
|
||||
# Warnings that are thrown on standard libraries and not OpenMW
|
||||
4347 # Non-template function with same name and parameter count as template function
|
||||
|
|
@ -507,6 +507,11 @@ if (WIN32)
|
|||
4986 # Undocumented warning that occurs in the crtdbg.h file
|
||||
4996 # Function was declared deprecated
|
||||
|
||||
# cause by ogre extensivly
|
||||
4193 # #pragma warning(pop) : no matching '#pragma warning(push)'
|
||||
4251 # class 'XXXX' needs to have dll-interface to be used by clients of class 'YYYY'
|
||||
4275 # non dll-interface struct 'XXXX' used as base for dll-interface class 'YYYY'
|
||||
|
||||
# OpenMW specific warnings
|
||||
4099 # Type mismatch, declared class or struct is defined with other type
|
||||
4100 # Unreferenced formal parameter (-Wunused-parameter)
|
||||
|
|
|
|||
|
|
@ -1,46 +1,77 @@
|
|||
|
||||
set (OPENCS_SRC
|
||||
main.cpp editor.cpp
|
||||
set (OPENCS_SRC main.cpp)
|
||||
|
||||
model/doc/documentmanager.cpp model/doc/document.cpp
|
||||
opencs_units (. editor)
|
||||
|
||||
model/world/universalid.cpp model/world/idcollection.cpp model/world/data.cpp model/world/idtable.cpp
|
||||
model/world/commands.cpp model/world/idtableproxymodel.cpp model/world/record.cpp
|
||||
model/world/columnbase.cpp
|
||||
|
||||
model/tools/tools.cpp model/tools/operation.cpp model/tools/stage.cpp model/tools/verifier.cpp
|
||||
model/tools/mandatoryid.cpp model/tools/reportmodel.cpp
|
||||
|
||||
view/doc/viewmanager.cpp view/doc/view.cpp view/doc/operations.cpp view/doc/operation.cpp view/doc/subviewfactory.cpp
|
||||
view/doc/subview.cpp view/doc/startup.cpp
|
||||
|
||||
view/world/table.cpp view/world/tablesubview.cpp view/world/subviews.cpp view/world/util.cpp
|
||||
view/world/dialoguesubview.cpp
|
||||
|
||||
view/tools/reportsubview.cpp view/tools/subviews.cpp
|
||||
opencs_units (model/doc
|
||||
document
|
||||
)
|
||||
|
||||
set (OPENCS_HDR
|
||||
editor.hpp
|
||||
|
||||
model/doc/documentmanager.hpp model/doc/document.hpp model/doc/state.hpp
|
||||
|
||||
model/world/universalid.hpp model/world/record.hpp model/world/idcollection.hpp model/world/data.hpp
|
||||
model/world/idtable.hpp model/world/columns.hpp model/world/idtableproxymodel.hpp
|
||||
model/world/commands.hpp model/world/columnbase.hpp
|
||||
|
||||
model/tools/tools.hpp model/tools/operation.hpp model/tools/stage.hpp model/tools/verifier.hpp
|
||||
model/tools/mandatoryid.hpp model/tools/reportmodel.hpp
|
||||
|
||||
view/doc/viewmanager.hpp view/doc/view.hpp view/doc/operations.hpp view/doc/operation.hpp view/doc/subviewfactory.hpp
|
||||
view/doc/subview.hpp view/doc/subviewfactoryimp.hpp view/doc/startup.hpp
|
||||
|
||||
view/world/table.hpp view/world/tablesubview.hpp view/world/subviews.hpp view/world/util.hpp
|
||||
view/world/dialoguesubview.hpp
|
||||
|
||||
view/tools/reportsubview.hpp view/tools/subviews.hpp
|
||||
opencs_units_noqt (model/doc
|
||||
documentmanager
|
||||
)
|
||||
|
||||
opencs_hdrs_noqt (model/doc
|
||||
state
|
||||
)
|
||||
|
||||
|
||||
opencs_units (model/world
|
||||
idtable idtableproxymodel
|
||||
)
|
||||
|
||||
|
||||
opencs_units_noqt (model/world
|
||||
universalid data record idcollection commands columnbase
|
||||
)
|
||||
|
||||
opencs_hdrs_noqt (model/world
|
||||
columns
|
||||
)
|
||||
|
||||
|
||||
opencs_units (model/tools
|
||||
tools operation reportmodel
|
||||
)
|
||||
|
||||
opencs_units_noqt (model/tools
|
||||
stage verifier mandatoryid
|
||||
)
|
||||
|
||||
|
||||
opencs_units (view/doc
|
||||
viewmanager view operations operation subview startup
|
||||
)
|
||||
|
||||
|
||||
opencs_units_noqt (view/doc
|
||||
subviewfactory
|
||||
)
|
||||
|
||||
opencs_hdrs_noqt (view/doc
|
||||
subviewfactoryimp
|
||||
)
|
||||
|
||||
|
||||
opencs_units (view/world
|
||||
table tablesubview
|
||||
)
|
||||
|
||||
opencs_units_noqt (view/world
|
||||
dialoguesubview util subviews
|
||||
)
|
||||
|
||||
|
||||
opencs_units (view/tools
|
||||
reportsubview
|
||||
)
|
||||
|
||||
opencs_units_noqt (view/tools
|
||||
subviews
|
||||
)
|
||||
|
||||
|
||||
set (OPENCS_US
|
||||
)
|
||||
|
||||
|
|
@ -57,7 +88,7 @@ find_package(Qt4 COMPONENTS QtCore QtGui QtXml QtXmlPatterns REQUIRED)
|
|||
include(${QT_USE_FILE})
|
||||
|
||||
qt4_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
|
||||
qt4_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR})
|
||||
qt4_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR_QT})
|
||||
qt4_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace MWWorld
|
|||
}
|
||||
|
||||
assert(it != invStore.end());
|
||||
|
||||
|
||||
std::string npcRace = actor.get<ESM::NPC>()->mBase->mRace;
|
||||
|
||||
// equip the item in the first free slot
|
||||
|
|
@ -43,7 +43,7 @@ namespace MWWorld
|
|||
// Beast races cannot equip shoes / boots, or full helms (head part vs hair part)
|
||||
if(npcRace == "argonian" || npcRace == "khajiit")
|
||||
{
|
||||
if(*slot == MWWorld::InventoryStore::Slot_Helmet){
|
||||
if(*slot == MWWorld::InventoryStore::Slot_Helmet){
|
||||
std::vector<ESM::PartReference> parts;
|
||||
|
||||
if(it.getType() == MWWorld::ContainerStore::Type_Clothing)
|
||||
|
|
@ -54,22 +54,22 @@ namespace MWWorld
|
|||
bool allow = true;
|
||||
for(std::vector<ESM::PartReference>::iterator itr = parts.begin(); itr != parts.end(); ++itr)
|
||||
{
|
||||
if((*itr).mPart == ESM::PartReferenceType::PRT_Head)
|
||||
if((*itr).mPart == ESM::PRT_Head)
|
||||
{
|
||||
if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
|
||||
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}", std::vector<std::string>());
|
||||
|
||||
|
||||
allow = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if(!allow)
|
||||
break;
|
||||
}
|
||||
|
||||
if (*slot == MWWorld::InventoryStore::Slot_Boots)
|
||||
{
|
||||
{
|
||||
// Only notify the player, not npcs
|
||||
if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,3 +29,51 @@ get_filename_component(filename ${f} NAME)
|
|||
configure_file(${source_dir}/${f} ${destination_dir}/${filename} COPYONLY)
|
||||
endforeach (f)
|
||||
endmacro (copy_all_files)
|
||||
|
||||
macro (add_file project type file)
|
||||
list (APPEND ${project}${type} ${file})
|
||||
endmacro (add_file)
|
||||
|
||||
macro (add_unit project dir unit)
|
||||
add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
|
||||
add_file (${project} _SRC ${comp} "${dir}/${unit}.cpp")
|
||||
endmacro (add_unit)
|
||||
|
||||
macro (add_qt_unit project dir unit)
|
||||
add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
|
||||
add_file (${project} _HDR_QT ${comp} "${dir}/${unit}.hpp")
|
||||
add_file (${project} _SRC ${comp} "${dir}/${unit}.cpp")
|
||||
endmacro (add_qt_unit)
|
||||
|
||||
macro (add_hdr project dir unit)
|
||||
add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
|
||||
endmacro (add_hdr)
|
||||
|
||||
macro (add_qt_hdr project dir unit)
|
||||
add_file (${project} _HDR ${comp} "${dir}/${unit}.hpp")
|
||||
add_file (${project} _HDR_QT ${comp} "${dir}/${unit}.hpp")
|
||||
endmacro (add_qt_hdr)
|
||||
|
||||
macro (opencs_units dir)
|
||||
foreach (u ${ARGN})
|
||||
add_qt_unit (OPENCS ${dir} ${u})
|
||||
endforeach (u)
|
||||
endmacro (opencs_units)
|
||||
|
||||
macro (opencs_units_noqt dir)
|
||||
foreach (u ${ARGN})
|
||||
add_unit (OPENCS ${dir} ${u})
|
||||
endforeach (u)
|
||||
endmacro (opencs_units_noqt)
|
||||
|
||||
macro (opencs_hdrs dir)
|
||||
foreach (u ${ARGN})
|
||||
add_qt_hdr (OPENCS ${dir} ${u})
|
||||
endforeach (u)
|
||||
endmacro (opencs_hdrs)
|
||||
|
||||
macro (opencs_hdrs_noqt dir)
|
||||
foreach (u ${ARGN})
|
||||
add_hdr (OPENCS ${dir} ${u})
|
||||
endforeach (u)
|
||||
endmacro (opencs_hdrs_noqt)
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ public:
|
|||
|
||||
std::string searchable = normalize_path (proper.begin () + prefix, proper.end ());
|
||||
|
||||
mIndex.insert (std::make_pair (std::move (searchable), std::move (proper)));
|
||||
mIndex.insert (std::make_pair (searchable, proper));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,8 @@
|
|||
|
||||
#include <stdexcept>
|
||||
#include <cassert>
|
||||
#ifndef __clang__
|
||||
#include <cstdint>
|
||||
#else
|
||||
#include <tr1/cstdint>
|
||||
#endif
|
||||
|
||||
#include <libs/platform/stdint.h>
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
@ -29,7 +26,7 @@ public:
|
|||
mBufferOrigin = 0;
|
||||
mBufferExtent = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
size_t read(void* buf, size_t count)
|
||||
{
|
||||
|
|
|
|||
34
readme.txt
34
readme.txt
|
|
@ -3,7 +3,7 @@ OpenMW: A reimplementation of The Elder Scrolls III: Morrowind
|
|||
OpenMW is an attempt at recreating the engine for the popular role-playing game
|
||||
Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
|
||||
|
||||
Version: 0.20.0
|
||||
Version: 0.21.0
|
||||
License: GPL (see GPL3.txt for more information)
|
||||
Website: http://www.openmw.org
|
||||
|
||||
|
|
@ -94,6 +94,38 @@ Allowed options:
|
|||
|
||||
CHANGELOG
|
||||
|
||||
0.21.0
|
||||
|
||||
Bug #253: Dialogs don't work for Russian version of Morrowind
|
||||
Bug #267: Activating creatures without dialogue can still activate the dialogue GUI
|
||||
Bug #354: True flickering lights
|
||||
Bug #386: The main menu's first entry is wrong (in french)
|
||||
Bug #479: Adding the spell "Ash Woe Blight" to the player causes strange attribute oscillations
|
||||
Bug #495: Activation Range
|
||||
Bug #497: Failed Disposition check doesn't stop a dialogue entry from being returned
|
||||
Bug #498: Failing a disposition check shouldn't eliminate topics from the the list of those available
|
||||
Bug #500: Disposition for most NPCs is 0/100
|
||||
Bug #501: Getdisposition command wrongly returns base disposition
|
||||
Bug #506: Journal UI doesn't update anymore
|
||||
Bug #507: EnableRestMenu is not a valid command - change it to EnableRest
|
||||
Bug #508: Crash in Ald Daedroth Shrine
|
||||
Bug #517: Wrong price calculation when untrading an item
|
||||
Bug #521: MWGui::InventoryWindow creates a duplicate player actor at the origin
|
||||
Bug #524: Beast races are able to wear shoes
|
||||
Bug #527: Background music fails to play
|
||||
Bug #533: The arch at Gnisis entrance is not displayed
|
||||
Bug #536: The same entry can be added multiple times to the journal
|
||||
Bug #539: Race selection is broken
|
||||
Feature #39: Video Playback
|
||||
Feature #151: ^-escape sequences in text output
|
||||
Feature #392: Add AI related script functions
|
||||
Feature #456: Determine required ini fallback values and adjust the ini importer accordingly
|
||||
Feature #460: Experimental DirArchives improvements
|
||||
Feature #540: Execute scripts of objects in containers/inventories in active cells
|
||||
Task #401: Review GMST fixing
|
||||
Task #453: Unify case smashing/folding
|
||||
Task #512: Rewrite utf8 component
|
||||
|
||||
0.20.0
|
||||
|
||||
Bug #366: Changing the player's race during character creation does not change the look of the player character
|
||||
|
|
|
|||
Loading…
Reference in a new issue