Commit Graph

90 Commits (5181c601c058eee946023514ee9606f7fb24c8a7)

Author SHA1 Message Date
David Cernat 8729c3c5e3 Add OpenMW commits up to 9 Mar 2019
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
5 years ago
David Cernat 6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
5 years ago
David Cernat fba07194cf Add OpenMW commits up to 29 Oct 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 84cab59057 Add OpenMW commits up to 19 Aug 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
5 years ago
Andrei Kortunov 3032b177a1 Remove redundant includes 6 years ago
Andrei Kortunov 0937f02598 Get rid of unnecessary string streams 6 years ago
Andrei Kortunov 2961f0d810 Allow to use the %Name for creatures (bug #4644) 6 years ago
Capostrophic 363516049d Actually fix General number formatting 6 years ago
Marc Zinnschlag dc9aedca7d Merged merge request !33 6 years ago
Andrei Kortunov 1452684d9e Use new logging system for components 6 years ago
James Carty 1c49698053 Implement 'g' flag 6 years ago
James Carty 579f35511a Add support for scietific notation flag for MessageBox 6 years ago
David Cernat 63a86f145d [Client] Record type of each InterpreterContext for later checking 7 years ago
scrawl 29556a1802 More consistent wording of errors/warnings
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
8 years ago
scrawl 4322e76cb6 Fix shadowing warnings 8 years ago
scrawl a5da3a269e Fix shadowing warnings 8 years ago
MiroslavR f6f3f71db5 Improve format specifiers for message boxes 9 years ago
scrawl a94029267f Fix an inverted condition (Bug #3209) 9 years ago
scrawl ed57293e54 Allow '^' escape characters in books
http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7
9 years ago
scrawl 39feb547a0 Broken lower casing fix (Fixes #3068) 9 years ago
scrawl f875597be5 Don't use tolower()
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
9 years ago
Marc Zinnschlag 8eb6d337d5 deal with script execution from within a script (Fixes #2964) 9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl b3f5ac5dbb Include cleanup 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 8c810e3620 Move rng to components 10 years ago
dteviot 2cfc4c0286 script Random() command now returns correct range. 10 years ago
scrawl c7be850162 Add messagebox escape characters for spell/weapon cycling hotkeys 10 years ago
scrawl f7ba1dbfc8 Add error handling for getPcRank and similar defines (Fixes #2071) 10 years ago
Marc Zinnschlag 8952154488 inherit target ID when starting a script from another script 11 years ago
Marc Zinnschlag 27c84d6cb7 the reference for a targeted script is now determined when needed instead of at the start of the script execution 11 years ago
Marc Zinnschlag 75ab8de3d2 added opcode for running scripts with explicit references (targeted scripts) 11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
Marc Zinnschlag d6e212a02b Merge branch 'master' into script 11 years ago
Marc Zinnschlag 3b990795c4 added access to remote access of local variables of global scripts 11 years ago
scrawl 0cc1cd8f7e Fix message box formatting bug 11 years ago
scrawl 26d972280f Fix a few text defines 11 years ago
Lukasz Gromanowski 50b6e828cc Added asserts in Interpreter::installSegmentX methods.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
scrawl 78e6dab9d2 Dialogue history rewrite WIP 12 years ago
Marc Zinnschlag a1ece7de30 Bug #613: fixed assert in string literal access function 12 years ago
Marc Zinnschlag b255472cc6 fixed a spelling mistake 12 years ago
Nathan Jeffords 08fa9dcd3e replaced std::string concatenation with std::ostringstream
Changed a block of code that was performing a series of string
concatenations to use an ostringstream instead. This allowed the removal
of calls to std::to_string (not C++03 compliant) and fixes an compile
error in MSVC 2010 (ambigous overload when calling std::to_string).
12 years ago
Tom Mason a14b7e4a0f small fixes on text defines 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
Marc Zinnschlag fe85de5ea7 Issue #181: assignment to member variables 13 years ago
Marc Zinnschlag 10b27e582b Issue #181: various fixed to member variable access 13 years ago
Marc Zinnschlag ce43ff8d05 Issue #181: added member variable access opcodes 13 years ago