19033 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Miloslav Číž	de42aa9d03	Make thrown projectiles rotate	2017-11-23 00:32:22 +01:00
AnyOldName3	4612597877	Switch to insert_or_assign semantics when adding shadow defines to the global shader defines.	2017-11-22 20:54:39 +00:00
AnyOldName3	98cd9fc144	Add preliminary support for global shader defines.	2017-11-22 20:07:07 +00:00
Andrei Kortunov	86a17b1e3e	Get rid of the redundant Utf8Stream when during journal index creation	2017-11-22 09:06:54 +04:00
Andrei Kortunov	3571f7f413	Remove getEncoding() from WindowManager	2017-11-22 08:32:38 +04:00
scrawl	2136003e1c	Reapply commit a3f821cdc which got lost in a merge	2017-11-21 22:43:56 +00:00
scrawl	cd4f71d5cd	Merge pull request #1555 from akortunov/guifixes ... Reworked trade window	2017-11-21 22:40:16 +00:00
AnyOldName3	7a9df977c7	Add some prerequisits for making shadows disableable	2017-11-21 17:20:57 +00:00
AnyOldName3	166ba22072	Prevent line count changes within conditional blocks (because of conditional includes or @foreach expansion) ruining line numbering.	2017-11-21 16:53:12 +00:00
Andrei Kortunov	67acb83b62	Add missing include	2017-11-21 13:27:33 +04:00
Andrei Kortunov	5f41f7c48d	Clean code up a bit	2017-11-21 13:03:38 +04:00
Andrei Kortunov	ba91cd658b	Convert topic name to Unicode	2017-11-21 12:31:23 +04:00
Andrei Kortunov	ea36956ff1	Reworked trade window	2017-11-21 10:00:53 +04:00
Andrei Kortunov	f0ca3eabd3	Merge from upstream master	2017-11-21 09:39:54 +04:00
Andrei Kortunov	a83a43e376	Determine when need to use the Cyrillic journal index	2017-11-21 09:32:35 +04:00
scrawl	e840c4352f	Merge pull request #1556 from jbo-85/master ... Fix search paths in FindSDL2.cmake to find SDL2 built from source	2017-11-20 23:27:51 +00:00
scrawl	cc3c27f241	Clean up layout files to use Spacer class	2017-11-20 23:20:04 +00:00
scrawl	a3f821cdcd	Disable keyboard for trade +/- buttons ... For one, because their RepeatClick handler breaks the keyboard function, and because its redundant anyway (just press Up/Down arrow with the edit box focused to do the same thing)	2017-11-20 23:20:04 +00:00
scrawl	9fda3b6db4	Fix NumericEditBox behavior broken by switch to std::stoi ... For some reason stoi doesn't throw an error for '1foo' while 'foo1' does. Now the edit box flat out rejects any non-digit key events.	2017-11-20 23:20:03 +00:00
scrawl	719255c5c6	Merge pull request #1557 from akortunov/journalfix ... [Feedback needed] Handle 128px Tx_menubook_topics textures	2017-11-20 23:07:18 +00:00
scrawl	39a9e90b1d	Merge pull request #1553 from drummyfish/leakfix ... Fix memory leak in WindowManager	2017-11-20 20:39:38 +00:00
Andrei Kortunov	ce5bdd6361	Split the JournalBooks::createTopicIndexBook()	2017-11-20 22:25:53 +04:00
Andrei Kortunov	a391990f2a	Provide multibyte toLower() and single chars comparator	2017-11-20 21:30:46 +04:00
Andrei Kortunov	4dcaf040e6	A Russian journal index	2017-11-20 19:37:24 +04:00
Andrei Kortunov	60d0c83cca	Handle 128px Tx_menubook_topics textures	2017-11-20 17:39:28 +04:00
jbo-85	f896c9acb6	Fix search paths in FindSDL2.cmake to find SDL2 built from source	2017-11-19 11:56:24 +01:00
Miloslav Číž	ea2bbce68a	Fix memory leak in WindowManager	2017-11-18 19:27:09 +01:00
AnyOldName3	0f6f097cf2	Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm	2017-11-17 18:24:08 +00:00
AnyOldName3	3d18ddc8e4	Take into account previous #line directives when expanding @foreach shader macros	2017-11-17 17:18:33 +00:00
scrawl	36f4f0ef85	Don't increase simulationTime while the game is minimized (Fixes #4211)	2017-11-16 18:48:49 +00:00
scrawl	cf40d19d7d	Merge pull request #1551 from thegriglat/abs ... Change abs to std::abs	2017-11-15 17:34:59 +00:00
scrawl	35d68f038d	Update dialogue topics list after result script is run ... Regression from 0.42.	2017-11-15 17:20:40 +00:00
scrawl	60fba7acd8	Fix reorder warning	2017-11-15 17:20:08 +00:00
scrawl	c36d250044	Parse dialogue text for keywords after the resultscript runs (Fixes #4210)	2017-11-15 17:20:06 +00:00
scrawl	7c5d2a1ac4	Update dialogue topics list after result script is run ... Regression from 0.42.	2017-11-15 17:20:06 +00:00
scrawl	5a93b6a324	Enable word-wrapping for the console history	2017-11-15 17:20:05 +00:00
Grigorii Latyshev	6e4f6c4bd5	Change abs to std::abs	2017-11-13 21:36:55 +01:00
Alexander Stillich	93e9df15c9	Fixed parameter naming	2017-11-11 22:58:02 +00:00
Alexander Stillich	52b3507a2b	Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all	2017-11-11 22:58:02 +00:00
Alexander Stillich	09aac22782	Added StringUtil::replaceAll()	2017-11-11 22:58:01 +00:00
Alexander Stillich	92aaff3b78	Fixed escaping @ in boost program options filter	2017-11-11 22:57:59 +00:00
scrawl	a7fd27f413	Merge pull request #1544 from rexelion/archerrangefix ... use fProjectileMaxSpeed for ranged weapons distance (fixes #4192)	2017-11-11 22:30:59 +00:00
scrawl	98b4f9c596	Merge pull request #1549 from akortunov/itemmodels ... Item models reworking	2017-11-11 22:12:07 +00:00
scrawl	ae9f79c192	Merge pull request #1550 from akortunov/trackingfix ... Do not track a nearest actor during combat and pursue	2017-11-11 22:10:33 +00:00
scrawl	dc016059c3	Disable Activate key when textinput is active (Bug #4151)	2017-11-11 22:00:18 +00:00
scrawl	3b9e1e8c1b	Make movement keys not function in text input mode	2017-11-11 22:00:09 +00:00
scrawl	b7eda61f7a	Fix overlapping widgets in trade window layout (Fixes #4205)	2017-11-11 21:59:21 +00:00
Andrei Kortunov	8c0dcd8b2b	Do not track a nearest actor during combat and pursue (bug #4179)	2017-11-11 19:46:59 +04:00
rexelion	f0649849b8	changed variable name to be more descriptive	2017-11-11 12:00:23 +00:00
Andrei Kortunov	9943bd4d74	AiWander fast forwarding improvements (bug #3638)	2017-11-11 15:31:06 +04:00