4859 Commits (9906c3051dddaaf435d55841f5e9d0d392d575c5)

 

All Branches   

Search

Author	SHA1	Message	Date
Emanuel Guevel	9906c3051d	components/translation: use Utf8Encoder	12 years ago
Emanuel Guevel	67273fc177	mwiniimporter: use Utf8Encoder	12 years ago
Emanuel Guevel	740e2b5769	components/to_utf8: add class Utf8Encoder	12 years ago
Marc Zinnschlag	5c007cd527	updated credits file	12 years ago
Marc Zinnschlag	0af7a2888a	Merge remote-tracking branch 'scrawl/ai_script'	12 years ago
Marc Zinnschlag	25d9918765	post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)	12 years ago
Marc Zinnschlag	c0260697c2	Merge remote-tracking branch 'scrawl/master'	12 years ago
Marc Zinnschlag	ce5d27b07b	Merge remote-tracking branch 'scrawl/button_fixes'	12 years ago
scrawl	42e0501c67	fix typo	12 years ago
scrawl	a5ef669eb6	Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD ... Conflicts: apps/openmw/mwscript/aiextensions.cpp apps/openmw/mwscript/docs/vmformat.txt	12 years ago
scrawl	ba7086cadf	Use race/class names (instead of ID) in replaced escape sequences	12 years ago
scrawl	1718d735b5	Fix menu/journal/book/scroll buttons when using localised MW-installations ... This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.	12 years ago
scrawl	ddbe13e569	Workaround for http://bugs.openmw.org/issues/475	12 years ago
Marc Zinnschlag	ff74f687fb	Merge remote-tracking branch 'lazydev/master'	12 years ago
lazydev	04cca2a1ce	fix for http://bugs.openmw.org/issues/517	12 years ago
Marc Zinnschlag	c613f07b84	updated credits file	12 years ago
Marc Zinnschlag	83fe128e87	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	12 years ago
Marc Zinnschlag	0e80b445a9	Merge remote-tracking branch 'scrawl/master'	12 years ago
scrawl	86f30992d7	fix message boxes not appearing properly when e.g. trading	12 years ago
Emanuel Guevel	2a7336c310	mwiniimporter: handle ini file encodings ... Use components/to_utf8 to handle encodings. Add an --encoding option for choosing between win1250, win1251 and win1252 encodings for the imported ini file.	12 years ago
Marc Zinnschlag	80a0be3264	Merge remote-tracking branch 'blunted2night/msvcbuild'	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
Marc Zinnschlag	4a8bf40a83	Merge remote-tracking branch 'lazydev/master'	12 years ago
Nathan Jeffords	a842fc2c11	added hack to fix an alignment issue in MSVC 2010 ... The default allocator in Visual Studio 2010 does not respect the alignment requirements of classes it is allocating memory for. This results in a potential crash when using OEngine::Physics::PhysicActor that has been allocated on the heap if it is built against a version of Bullet that has SSE intrinsics enabled.	12 years ago
Nathan Jeffords	7228f5d696	added missing reference to <cctype> ... added missing reference to <cctype> that was causing Visual Studio 2010 to fail to compile stringops.hpp	12 years ago
Nathan Jeffords	008d6d6589	added additional library search paths to find bullet ... This allowed CMake to correctly build Visual Studio 2010 project files against a windows compiled version of bullet (2.81 rev 2613)	12 years ago
lazydev	7cd1e87fe8	Merge branch 'master' of git://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp	12 years ago
Emanuel Guevel	e9a464c9f7	mwiniimporter: remove fallback values for Cursors	12 years ago
Emanuel Guevel	e2b348de96	mwiniimporter: fix line ending problem	12 years ago
Marc Zinnschlag	65c7c7f60e	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	12 years ago
greye	7e0713f6c4	fix string case update	12 years ago
lazydev	cd5d95ed22	1. Dialogs in Russian version now works. ... 2. Destination names it travel window are now translated	12 years ago
Marc Zinnschlag	8b2785400b	Merge remote-tracking branch 'trombonecot/comparestring'	12 years ago
eduard	69d9d22579	comparestring	12 years ago
Marc Zinnschlag	e577731a06	Merge remote-tracking branch 'scrawl/master'	12 years ago
scrawl	f56182cac2	fix journal window not rendering any text	12 years ago
Emanuel Guevel	cb71efc427	mwiniimporter: clean up	12 years ago
Emanuel Guevel	38e7dbb970	mwininimporter: add more fallback values	12 years ago
Marc Zinnschlag	714b1924a5	partial dialogue subview implementation	12 years ago
eduard	98103e15eb	conflict resolution	12 years ago
eduard	fb25f407fb	dialoguemanager conflict	12 years ago
eduard	c85400b809	Merge https://github.com/zinnschlag/openmw into comparestring ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwworld/worldimp.cpp components/esm_store/reclists.hpp components/misc/stringops.hpp	12 years ago
Emanuel Guevel	9d043d0193	mwiniimporter: fix string cutting	12 years ago
Emanuel Guevel	b2203d22fc	mwiniimporter: added fallback values ... Ugly comments included. I will merge it on another branch to clean this up later.	12 years ago
Marc Zinnschlag	92623921ad	updated credits file	12 years ago
Marc Zinnschlag	8d4afe3bf5	post merge fix	12 years ago
Marc Zinnschlag	e2a8e2107b	Merge branch 'globals'	12 years ago
Marc Zinnschlag	334588bf1c	Merge branch 'editor2'	12 years ago
Tom Mason	bed8fb69e6	added bounty related scripting functions	12 years ago
Marc Zinnschlag	5f523afa05	Merge remote-tracking branch 'wheybags/master'	12 years ago