10419 commits

Author	SHA1	Message	Date
scrawl	9d07edda13	UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04	2015-01-09 20:53:43 +01:00
scrawl	ce2cbab402	Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow)	2015-01-09 20:08:52 +01:00
Marc Zinnschlag	4e7f7baf8b	Merge remote-tracking branch 'dteviot/Bug2076'	2015-01-09 13:57:21 +01:00
Marc Zinnschlag	e32402a040	handle moved references on load	2015-01-09 12:05:53 +01:00
dteviot	64cd1396ac	Fixed minor issues. ... 1. Renamed "hightRatio" to "heightRatio". 2. Replaced magic numbers with named constants.	2015-01-09 22:17:53 +13:00
dteviot	7fe2f86d06	Slaughter fish attacks when player only knee deep in water (Fixes #2076)	2015-01-09 21:40:53 +13:00
Marc Zinnschlag	d254bb0a34	Merge remote-tracking branch 'dteviot/FixLoadOrderReset'	2015-01-09 09:32:23 +01:00
scrawl	65ab31eae6	Remove now redundant Store::setUp implementation	2015-01-09 04:31:02 +01:00
scrawl	ddd6e682bc	Dialogue: add conflict resolution for overlapping keywords (Fixes #2245)	2015-01-09 04:19:38 +01:00
scrawl	c77660ba20	Remove some nonsense code	2015-01-09 01:59:38 +01:00
scrawl	2ddbe22da3	Fix for NPC store clearDynamic bug ... It was clearing the whole mShared vector, instead of only the dynamic part. Actually, that whole overload was pointless to begin with. All it does is making sure the Player record isn't cleared, but ESMStore::clearDynamic re-inserts the player record anyway after clearing.	2015-01-09 01:59:32 +01:00
Marc Zinnschlag	f8a3ec3ee3	Merge remote-tracking branch 'scrawl/cmdline-savegame'	2015-01-08 20:57:49 +01:00
scrawl	d31ae2b345	Fix mIds mapping for dynamic records being lost on save/reload	2015-01-08 16:27:13 +01:00
scrawl	928b9ee41b	Fix missing GUI mode update when showing soulgem dialog	2015-01-08 16:27:13 +01:00
scrawl	ef7e0070a6	Don't right-shift signed integers which is implementation-defined	2015-01-08 16:27:13 +01:00
dteviot	9d6efcecff	Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset ... Fixed Conflict: components/contentselector/model/contentmodel.cpp	2015-01-08 12:15:48 +13:00
Marc Zinnschlag	38a413a483	Merge remote-tracking branch 'scrawl/master'	2015-01-07 20:22:15 +01:00
scrawl	4684014a83	Use .omwsave extension for save game files	2015-01-07 15:06:39 +01:00
scrawl	13c5bd5cc2	Enchanting: fix skill-based cast cost bonus being applied twice	2015-01-07 04:41:12 +01:00
scrawl	ef1b0a191b	Revert "Enchanting: fix inverted self-enchant success chance" ... It wasn't inverted to begin with. The author of this commit is an idiot.	2015-01-07 03:48:16 +01:00
scrawl	4e92f6ab48	Add commandline option to load a save game on startup	2015-01-07 03:27:24 +01:00
scrawl	157438460b	Fix being able to activate objects when paralyzed	2015-01-07 02:34:29 +01:00
scrawl	dc5ed5b861	Remove weather particles underwater (Fixes #2010)	2015-01-07 02:34:29 +01:00
scrawl	d02e075bab	Add setting for exterior cell grid size (Fixes #1537)	2015-01-07 02:34:29 +01:00
scrawl	a17252eab3	Remove unused checkWaypoint function ... It was an almost exact copy of the checkPathCompleted function anyway.	2015-01-07 02:34:28 +01:00
scrawl	4d9100091d	Reduce default pathing arrival tolerance to 32 units (Fixes #1605)	2015-01-07 02:34:28 +01:00
scrawl	e19ab77d00	Store camera first person state in savegame (Fixes #2255)	2015-01-07 02:34:24 +01:00
scrawl	992b87ea44	Reset existing summons when the spell is re-casted (Fixes #2135)	2015-01-06 16:11:10 +01:00
scrawl	f267497c03	Allow separate summoned creature instances for each spell ID (Fixes #2194)	2015-01-06 16:11:05 +01:00
Marc Zinnschlag	31f6ccdf4d	Merge remote-tracking branch 'internecine/bug2031'	2015-01-06 09:43:59 +01:00
Internecine	e1fdcb608e	Fixed incorrect index	2015-01-06 15:00:24 +13:00
scrawl	464f8abb3f	List exterior cell names in tab completion (Fixes #2252)	2015-01-06 01:10:09 +01:00
scrawl	708dbc2518	Crime fix	2015-01-05 20:31:50 +01:00
scrawl	c343a5c803	stopCombat fix	2015-01-05 20:31:50 +01:00
scrawl	c1955ef7fa	Fix enchanting dialog effect labels showing a duration for constant effects	2015-01-05 18:57:08 +01:00
Marc Zinnschlag	ba7b74217b	added original cell column to reference table	2015-01-05 15:20:47 +01:00
Marc Zinnschlag	3b534326ff	forbid manual editing of the cell field in reference records	2015-01-05 15:04:11 +01:00
scrawl	5e7e40aac9	Fix being able to switch weapons while knocked out	2015-01-04 19:54:49 +01:00
scrawl	de12c96a46	Fix crash on exit if the window wasn't created (Fixes #2249)	2015-01-04 19:23:31 +01:00
scrawl	bc686c93b5	Potential fix for thrown weapons being regarded as broken	2015-01-04 19:20:30 +01:00
scrawl	398fe6e780	Thrown weapon fix (Fixes #2248)	2015-01-04 19:20:24 +01:00
scrawl	d56906acf7	Fix the creature position glitch	2015-01-03 19:10:15 +01:00
scrawl	6f747df713	Remove an unused constructor	2015-01-03 19:10:15 +01:00
scrawl	593ca6bd48	Fix for framerate-dependent maximum stepping distance (Bug #1638)	2015-01-03 19:10:15 +01:00
Marc Zinnschlag	9f6a2d00e8	Merge remote-tracking branch 'thoronador/fix-uninitialized-members'	2015-01-02 18:17:25 +01:00
Marc Zinnschlag	bdc28c0523	Merge remote-tracking branch 'maqifrnswa/feature1325'	2015-01-02 18:14:42 +01:00
Marc Zinnschlag	ec1df719fe	Merge remote-tracking branch 'mrcheko/master'	2015-01-02 18:08:47 +01:00
Scott Howard	f24c1845b6	remove pop-up message on load failure	2015-01-02 10:42:09 -05:00
mrcheko	a8621e6230	defaults are set to 1.0; remove contrast setting ... (can be changed in config though); disable gamma control for not Windows OSs	2015-01-02 16:49:22 +03:00
Scott Howard	dece4e2640	remove unneeded includes	2015-01-01 22:54:32 -05:00
Scott Howard	03b39435f8	place user settings window at same location as mouse pointer	2015-01-01 22:50:35 -05:00
Scott Howard	ce7cef924e	when loading a file fails, pop-up critical window and highlight error text	2015-01-01 22:27:08 -05:00
Thoronador	44e01d0eaa	remove redundant initialization statement ... See https://github.com/OpenMW/openmw/pull/423#discussion_r22403388	2015-01-02 02:23:10 +01:00
Thoronador	526fb1b37b	fix uninitialized value in BillboardObject	2015-01-02 00:45:50 +01:00
Thoronador	91ff536460	fix uninit, #2	2015-01-02 00:26:45 +01:00
Thoronador	17fb7aa598	uninitialized stuff	2015-01-01 23:18:30 +01:00
scrawl	97fc51ceb7	Merge commit 'pull/origin/422'	2015-01-01 23:03:38 +01:00
scrawl	326d0d3ebf	Add default values for fNPCHealthBarTime and fNPCHealthBarFade (Fixes #2243) ... These GMSTs are missing in unpatched versions of the game.	2015-01-01 22:55:43 +01:00
scrawl	92e4a0669c	Fix for AiWander state loading	2015-01-01 18:58:17 +01:00
scrawl	559ddbb480	Quick fix for Ai fast-forward crash in exteriors (Fixes #2241)	2015-01-01 18:18:46 +01:00
Marco Schulze	6cd5b78ca7	Fix missing include in apps/launcher/main.cpp	2015-01-01 14:15:05 -03:00
Internecine	a7a3ab0c78	Fixed instant negative dynamic stat changes being applied as positive	2015-01-01 21:26:09 +13:00
scrawl	dc1c52bda7	Add some todo comments	2015-01-01 03:38:54 +01:00
scrawl	e0d083f702	Add hand-to-hand combat mechanics for bipedal creatures ... You can now have a fistfight with vivec, if you so desire.	2015-01-01 03:38:54 +01:00
scrawl	70d3bfc6ed	Fix idle animation not restarting immediately for creatures	2015-01-01 03:38:54 +01:00
scrawl	01652bbcc5	Store original actor position in AiWander package (Fixes #2200)	2015-01-01 03:38:49 +01:00
scrawl	5d7eb11596	Fix lights being rendered on the map (broken by d55fe43fc9)	2014-12-31 21:04:13 +01:00
scrawl	99ae0f901b	Implement AiTravel fast-forward (Fixes #1125)	2014-12-31 20:42:29 +01:00
scrawl	a8ae0dec52	Implement AiWander fast-forward (Feature #1125)	2014-12-31 18:41:57 +01:00
scrawl	d26d5f6c26	Fix outdated bone locations when camera view is changed while paralyzed	2014-12-31 17:25:06 +01:00
scrawl	d1a29300f0	Handle bipedal creatures not using weapons (Fixes #2238)	2014-12-31 16:59:21 +01:00
mrcheko	60a74d5eb8	increase robustness for gamma to persist in the system; ... use GMST strings for gamma interface	2014-12-31 18:40:01 +03:00
scrawl	363d1f9207	Merge remote-tracking branch 'upstream/master'	2014-12-30 23:01:45 +01:00
mrcheko	04d95810d1	gamma/contrast system reworked	2014-12-30 18:33:11 +03:00
scrawl	9c693d078b	Fix equipment update removing ammunition (Fixes #2144)	2014-12-30 16:22:06 +01:00
scrawl	18fb3f831a	Make the maximum horizontal stepping distance independent of movement speed (Fixes #1638)	2014-12-30 15:46:33 +01:00
dteviot	a62e15d93d	Read profile files from LauncherSettings in load order.	2014-12-30 17:25:19 +13:00
scrawl	e2346d7c37	Store permanent magic effects in savegame (Fixes #1648)	2014-12-30 01:36:31 +01:00
scrawl	6c9875969a	Stop idle animations for non-biped creatures when attacking/moving ... The idle animation wouldn't be visible anyway, since these creatures don't have animation layers. However sounds tagged in the animation would still play.	2014-12-28 15:34:47 +01:00
scrawl	a58bc9f2f7	Remove sneaking effect on combat AI (Fixes #2237)	2014-12-28 14:45:20 +01:00
scrawl	1bd3ab8a2d	Fix torch animation playing when torch is hidden (Fixes #2236)	2014-12-28 14:17:53 +01:00
scrawl	377b79d5ba	Use SoundGen fallback for type Land only (Fixes #2228)	2014-12-28 02:39:54 +01:00
scrawl	de9d347018	Fix on touch area effect spells (Fixes #2233)	2014-12-28 01:51:12 +01:00
scrawl	25954a80f5	Fix recharging of items in player inventory	2014-12-28 01:06:49 +01:00
scrawl	0a2dd4c6cb	Fix unsafe use of BaseNode in Move script instruction	2014-12-27 17:20:37 +01:00
scrawl	a62fe38a1b	Fix unsafe use of BaseNode	2014-12-27 15:02:05 +01:00
scrawl	50e31877ab	Fix crash when northmarker has been disabled (Bug #2230)	2014-12-27 14:52:33 +01:00
Internecine	5f9540318a	Fixed incorrect indexes	2014-12-27 19:49:14 +13:00
Internecine	a87fe71ddf	Added a helper function to handle dynamic stat changes	2014-12-27 19:46:54 +13:00
scrawl	2f0793390f	Fix cut off text for some widgets in the stats window	2014-12-27 01:25:26 +01:00
Marc Zinnschlag	2fa0764c89	Merge remote-tracking branch 'swick/master'	2014-12-26 16:08:07 +01:00
Marc Zinnschlag	5f8b8b127c	Merge remote-tracking branch 'psi29a/clang_lintian'	2014-12-26 16:07:07 +01:00
Marc Zinnschlag	da722a5cf1	Merge remote-tracking branch 'miroslavr/master'	2014-12-26 16:05:20 +01:00
Sebastian Wick	764cd9ca16	disable "window border" setting in the ingame settings UI if fullscreen is enabled	2014-12-24 16:31:23 +01:00
scrawl	6f72989cb1	SpellModel, SortFilterItemModel: case insensitive sorting	2014-12-24 15:45:15 +01:00
scrawl	2e5e7370ba	Adjust default angle, FOV and viewport of character preview (Fixes #2220)	2014-12-24 15:45:15 +01:00
scrawl	9a1bde684f	Sort class list in select class dialog	2014-12-24 15:45:14 +01:00
scrawl	768c4a5757	Update crime response to pickpocket attempts (thanks Hrnchamd)	2014-12-24 15:45:14 +01:00
scrawl	b8fa73dfa9	Preserve record ordering in Store ... This fixes the default head/hair used for some races in the chargen UI.	2014-12-24 15:45:14 +01:00
scrawl	5d7dcafa53	Make local map widget size configurable	2014-12-24 15:45:14 +01:00
scrawl	a47de06492	Make local map resolution configurable and use lower default value ... This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.	2014-12-24 15:45:14 +01:00
scrawl	7f0d71f8f4	Swap use of iDispAttackMod/fDispAttacking (thanks Hrnchamd)	2014-12-24 15:45:14 +01:00
scrawl	59f21c6105	Use "hair" as filter for PRT_Hair parts (Fixes #2218)	2014-12-24 15:45:14 +01:00
scrawl	d55fe43fc9	Support animation groups for Light and Door objects (Fixes #2039)	2014-12-24 15:45:14 +01:00
scrawl	019cd96719	Stop AiPursue when target has invisibility or chameleon>=75	2014-12-24 15:45:14 +01:00
scrawl	e5de253169	Use maximum step size of 62 units for stepping down (Fixes #1809)	2014-12-24 15:45:14 +01:00
scrawl	edc128572d	Add MWMechanics::Actor class for temporary actor state, move AiState there	2014-12-24 15:45:14 +01:00
scrawl	42d63a4eb2	Fix position flicker after an animation ends	2014-12-24 15:45:14 +01:00
scrawl	8bc7eb5530	PlayGroup: Don't loop animations with no loop keys (Fixes #2223)	2014-12-24 15:45:13 +01:00
scrawl	9e5dfb6e98	Update crime system according to research wiki for more accurate attack responses	2014-12-24 15:45:13 +01:00
scrawl	2410d79410	Fix iFightAttack and iFightAttacking being swapped ... Looks like the research wiki page was incorrect, the higher value (iFightAttack) being for the victim makes more sense, is consistent with iDispAttackMod/fDispAttacking, and seems to be how the original game behaves as well.	2014-12-24 15:45:13 +01:00
scrawl	e73e975291	Fix player being able to activate objects when knocked out	2014-12-24 15:45:13 +01:00
scrawl	3912ee2b1d	Fix faction rank not being set on items in faction-owned containers	2014-12-24 15:45:13 +01:00
scrawl	0081a68376	Use fMagicStartIconBlink for spell effect indicator fading	2014-12-24 15:45:13 +01:00
scrawl	877e07823d	Fix incorrect sound for spell creation success	2014-12-24 15:45:13 +01:00
scrawl	fb542a64ec	Merchant items should be restocked instantly	2014-12-24 15:45:13 +01:00
scrawl	1bcc4430e0	Fix owner not getting set on restocked items	2014-12-24 15:45:13 +01:00
scrawl	9ed71765a9	Fix deleted containers showing in merchant inventories	2014-12-24 15:45:13 +01:00
scrawl	f3738e9a98	Say an "intruder" voice dialogue for trespassing crimes (Fixes #1082) ... Seems to be broken in the original engine, but according to the TES-CS help this is how the intruder voices should be used. There are legitimate entries for "intruder" in the game's files, so we might as well use them.	2014-12-24 15:45:13 +01:00
scrawl	37e11b7272	Adjust loading box size for large captions	2014-12-24 15:45:12 +01:00
scrawl	866fdfe8bd	Crime system improvements ... - If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0. - Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.	2014-12-24 15:45:12 +01:00
scrawl	307b84e9f6	Add enemy health bar fading and use relevant GMSTs	2014-12-24 15:45:12 +01:00
scrawl	1910327469	Implement disposition changes due to crimes	2014-12-24 15:45:12 +01:00
scrawl	cc9af9562b	Function_CreatureTargetted should return '2' for werewolfs ... This makes NPCs say the correct attack voice files when fighting a werewolf.	2014-12-24 15:45:12 +01:00
scrawl	efa9ff3a76	Fix incorrect implementation of iWerewolfBounty	2014-12-24 15:45:12 +01:00
scrawl	35d2bfabca	Adjust NPC response to pickpocket attempts (Fixes #2219)	2014-12-24 15:45:12 +01:00
scrawl	4aed5158cc	Support region names in cell dialogue filter (Fixes #2113)	2014-12-24 15:45:12 +01:00
scrawl	105f0f8716	Head tracking: don't look at dead actors	2014-12-24 15:45:12 +01:00
scrawl	8a210c49e9	Improve AI prioritising health potions	2014-12-24 15:45:12 +01:00
scrawl	a29abb85f1	Fix ItemView sizing bug	2014-12-24 15:45:12 +01:00
scrawl	f931ba2efc	Fix some static analysis issues (coverity)	2014-12-24 15:45:12 +01:00
scrawl	1b9209df4a	Allow blocking of hand-to-hand attacks	2014-12-24 15:45:11 +01:00
Sebastian Wick	e85df00158	change setting "borderless" to "window border" ... set window border on setting changes disable window border checkbox in the launcher if fullscreen is enabled	2014-12-24 15:09:50 +01:00
MiroslavR	3cc32b641a	Fix some memory leaks	2014-12-23 20:44:25 +01:00
Bret Curtis	45299abe99	make it C98 compat	2014-12-23 17:13:11 +01:00
Bret Curtis	dcfadeb51a	fix typo and annoying gcc/clang unused return values in crash catcher	2014-12-22 10:45:34 +01:00
Sebastian Wick	639fbfad0b	make borderless setting available to the UI	2014-12-22 02:44:20 +01:00
MiroslavR	c796589420	Allow adding multiple Attribute/Skill effects in spell making (Fixes #2224)	2014-12-22 01:54:24 +01:00
Alexander "Ace" Olofsson	462b41a3a8	Missing files, aka; Why you shouldn't stresscommit	2014-12-19 11:26:54 +01:00
Alexander "Ace" Olofsson	0af5c7b379	Starting to clean up some heavy includes	2014-12-19 09:23:16 +01:00
Marc Zinnschlag	057d0913d6	Merge branch 'scriptfixes'	2014-12-18 10:22:07 +01:00
Marc Zinnschlag	a6d30bc2e3	consider --script-warn when running with --script-all-dialogue	2014-12-18 10:20:15 +01:00
Marc Zinnschlag	899ae763e6	fixing a travis build problem	2014-12-17 09:33:40 +01:00
scrawl	c2771bc8ab	Head tracking fix	2014-12-17 02:15:40 +01:00
scrawl	31d28e727f	Implement leveled list script functions (Fixes #1546)	2014-12-17 01:24:22 +01:00
scrawl	d642512f71	Error message fix	2014-12-17 00:57:04 +01:00
scrawl	88c5e1991c	Fix being able to stand on top of actors (Fixes #1192)	2014-12-16 23:18:41 +01:00
scrawl	d962f0918d	Implement NPC head tracking (Fixes #1720)	2014-12-16 20:47:45 +01:00
scrawl	b9e5aa9db6	Movement controller: Don't allow stepping up other actors ... This seems to fix issues with NPCs inadvertently being placed on top of a small creature while fighting it. Note that jumping on top of actors is still possible (Bug #1192)	2014-12-16 20:44:42 +01:00
scrawl	0dc9401269	Fix GUI crash due to outdated spells list	2014-12-15 20:20:17 +01:00
scrawl	ec00c830e5	Fix missing armor rating label update	2014-12-15 19:19:08 +01:00
scrawl	e4127aa491	Use space in ItemView more efficiently	2014-12-15 19:04:53 +01:00
scrawl	c7e1c0b595	Fix weapon cycle getting stuck for same item IDs	2014-12-15 17:49:08 +01:00
scrawl	935cccf974	Implement weapon/spell cycling hotkeys (Fixes #1024)	2014-12-15 16:23:08 +01:00
scrawl	4d5adfb5dd	Fix being able to use enchantments of items that failed to equip (Fixes #2215)	2014-12-15 13:47:34 +01:00
scrawl	4e0d16da8c	Take Scale field in creature record into account (Fixes #2214)	2014-12-15 13:34:04 +01:00
scrawl	79237d16a7	Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu ... This should also improve window resizing performance, the widgets are now just resized instead of recreated.	2014-12-15 13:28:03 +01:00
scrawl	7abbca8be9	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-12-14 20:27:12 +01:00
scrawl	2b78e9795d	Implement Calm effect removing combat packages (Fixes #1985)	2014-12-14 19:35:34 +01:00
scrawl	4f3995a4d8	Fix werewolf AI being able to use items	2014-12-14 19:15:43 +01:00
scrawl	4acc25f59c	Use SoundGen with no creature field as fallback ... This fixes the adorable "thump" sounds in the Scrib's idle animation not playing.	2014-12-14 17:52:06 +01:00
scrawl	192626c6f5	SoundGen fix: use Original Creature field only if non-empty	2014-12-14 17:44:03 +01:00
MiroslavR	c5a604453e	Fix several book formatting issues (Fixes #2204)	2014-12-14 16:25:27 +01:00
scrawl	88a2e4c043	Graceful error handling for missing spells/factions (Fixes #1825, Bug #2176, Bug #2203)	2014-12-14 02:38:27 +01:00
Nik Dyonin	80c92789c2	Fix issue when killed NPC cannot be looted if it was in combat mode before killing.	2014-12-14 02:58:42 +03:00
Marc Zinnschlag	1f74d8cca5	Merge remote-tracking branch 'scrawl/scripttest'	2014-12-13 12:49:33 +01:00
scrawl	ba65c6cc7f	Add --script-all-dialogue switch to compile all dialogue scripts (Fixes #1659)	2014-12-13 02:51:18 +01:00
scrawl	2ebf328dec	Always print the failing dialogue script ... These aren't usually very long, so printing them shouldn't spam the console by too much.	2014-12-13 00:39:24 +01:00
scrawl	ed6face4aa	Disable activation scripts for actors in combat	2014-12-12 22:21:57 +01:00
scrawl	60aa209144	Implement drowning when knocked out underwater (Fixes #1228)	2014-12-12 17:42:56 +01:00
scrawl	d034a079e6	Allow equipping twohanded weapon and shield at the same time (Fixes #1785) ... The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.	2014-12-12 16:49:22 +01:00
scrawl	bc85bb32c2	Fix vampirism magic effect not applying immediately (Fixes #1984)	2014-12-12 02:39:59 +01:00
scrawl	03da21f088	Remove redundant GUI element showing during loading screens	2014-12-12 02:13:50 +01:00
scrawl	e69cf11029	Hide tooltips during loading screens	2014-12-12 02:09:15 +01:00
scrawl	cf5fc60e86	Make ToggleMenus affect tooltips (Fixes #1989)	2014-12-12 01:42:13 +01:00
scrawl	f42420bc19	Use the Original Creature field for SoundGen lookups	2014-12-12 01:24:35 +01:00
scrawl	2601b26217	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-12-11 22:44:58 +01:00
scrawl	7892ed35f3	PlaceItem, PlaceItemCell: Make sure references are placed above terrain (Bug #2078)	2014-12-11 22:25:53 +01:00
scrawl	886903d70e	Implement HitAttemptOnMe function (Bug #2078)	2014-12-11 22:25:41 +01:00
scrawl	5f00a3d5c3	Reset lastHitObject when it is retrieved rather than every frame ... This seems to be how vanilla MW does it.	2014-12-11 22:00:31 +01:00
scrawl	a355550cab	Add support for NPCs with missing head/hair models (Fixes #2078)	2014-12-11 21:43:31 +01:00
scrawl	be16f1d0a5	Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078)	2014-12-11 21:00:02 +01:00
scrawl	d955017079	Don't report script operation status via messageBox (Bug #1942)	2014-12-11 20:51:02 +01:00
Marc Zinnschlag	912dcdc418	Merge remote-tracking branch 'scrawl/ptrupdate'	2014-12-11 20:41:53 +01:00
Marc Zinnschlag	7759f9f8f9	Merge remote-tracking branch 'scrawl/launcher'	2014-12-11 20:40:20 +01:00
Marc Zinnschlag	19bd07648b	Merge remote-tracking branch 'scrawl/pathgrid'	2014-12-11 20:32:32 +01:00
scrawl	ed2aa5a233	Fix crash caused by dangling baseNode pointer	2014-12-11 20:32:05 +01:00
scrawl	7e8ca3fff1	Fix object movement between cells producing a stale Ptr within the script execution (Bug #1942)	2014-12-11 19:29:06 +01:00
scrawl	8ed376af5e	Launcher: fix changing active profile through the Play page	2014-12-11 15:59:43 +01:00
scrawl	3270f0e932	Change pathgrid workaround to check for interior cell name	2014-12-11 15:19:48 +01:00
scrawl	1937ace1b7	Launcher: fix bugs deleting profiles (Fixes #2188)	2014-12-10 21:52:30 +01:00
scrawl	33019b93b4	Fix bug setting current launcher profile on startup (Bug #2188)	2014-12-10 21:10:14 +01:00
scrawl	623783cd6a	Enchanting: fix cast cost for "on use" enchantments being set incorrectly	2014-12-10 18:05:11 +01:00
scrawl	619ea846b4	Enchanting: fixed case where no range types at all are allowed (e.g. a Constant Effect item with an effect that does not allow the Self range-type)	2014-12-10 17:55:48 +01:00
scrawl	74c345f790	Enchanting: fix being able to create On Touch / On Target constant effect enchantments (this combination makes no sense)	2014-12-10 17:40:59 +01:00
scrawl	ead6bf1601	Enchanting: cast the enchant points for the item to int (Fixes #2202)	2014-12-10 17:34:05 +01:00
scrawl	3c747195ae	Add fall damage for creatures (Fixes #2201)	2014-12-10 17:21:34 +01:00
scrawl	e0c6f84546	AiFollow: target has to be seen in order to start following (Fixes #1637)	2014-12-09 22:25:28 +01:00
Digmaster	95219a7936	Show currently selected input type for settings window	2014-12-09 14:48:34 -06:00
Digmaster	bb6ed06a4e	read gamecontrollerdb file location from settings file	2014-12-09 14:37:32 -06:00
Digmaster	a7a211860a	Fixed binding controls to A on joystick	2014-12-09 12:12:38 -06:00
Digmaster	ad54e09593	Inital value for joysticks is 0.5	2014-12-09 11:16:17 -06:00
scrawl	109a3f78a1	Adjust AiFollow distance for groups of multiple followers (Fixes #1637)	2014-12-09 16:06:04 +01:00
scrawl	3ad0189982	Take sound listener y rotation (roll) into account, though currently unused for actors	2014-12-09 12:07:22 +01:00
Marc Zinnschlag	0522da257c	Merge remote-tracking branch 'scrawl/master'	2014-12-09 11:07:26 +01:00
Digmaster	073a2f0674	Fixed issue with walking	2014-12-09 00:02:18 -06:00
Digmaster	c37881ead1	Joystick Support	2014-12-08 21:57:32 -06:00
scrawl	0fe7500f74	Work around pathgrid record limitation (Fixes #2195)	2014-12-09 00:13:56 +01:00
scrawl	855fe33c59	Add vanilla-compatible range limiting for playloopsound (Fixes #244, Fixes #1342)	2014-12-08 23:58:20 +01:00
scrawl	f6960debcb	Attach sound listener to the player head instead of camera	2014-12-08 23:26:09 +01:00
Marc Zinnschlag	0649373d2e	Merge branch 'report'	2014-12-08 19:01:38 +01:00
scrawl	cf85cbbc8e	Switch sound distance model to AL_INVERSE_DISTANCE	2014-12-08 17:43:56 +01:00
scrawl	fbed429b25	Use GMSTs for sound fading distance	2014-12-08 17:25:17 +01:00
Marc Zinnschlag	e6307a5151	move cursor in scripteditor to position of error	2014-12-08 12:29:23 +01:00
scrawl	9f90a1e44b	Remove script access to deleted references that have no content file ... In original MW these objects are permanently deleted and can not be accessed anymore.	2014-12-07 22:37:50 +01:00
Marc Zinnschlag	a64b741af2	store hints from operations in report model	2014-12-07 20:53:09 +01:00
Marc Zinnschlag	3a847732b4	abstracted message collection into a class	2014-12-07 18:57:47 +01:00
Marc Zinnschlag	209c5cdbe3	Merge remote-tracking branch 'scrawl/master'	2014-12-07 12:33:39 +01:00
scrawl	f49fde3d5d	Add support for undeleting references (Fixes #2193) ... Deleted references should be accessible via an explicit reference, and can be undeleted using "setdelete 0". Also the Resurrect function implicitely undeletes the given reference.	2014-12-06 21:08:18 +01:00
Marc Zinnschlag	9c4355e91c	Merge remote-tracking branch 'scrawl/master'	2014-12-06 20:55:35 +01:00
scrawl	2952a0e2aa	Make Resurrect function reset most of the runtime state (Fixes #2181)	2014-12-06 19:53:24 +01:00
scrawl	41542dedf7	Fix map insert return value mixup (Fixes #2192)	2014-12-06 17:24:05 +01:00
scrawl	9a1b7cbe52	Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row (Fixes #1986)	2014-12-06 16:50:09 +01:00
Marc Zinnschlag	6a67aba336	added double click with modifier actions in report table	2014-12-06 15:08:51 +01:00
Marc Zinnschlag	58f4cc882f	added remove action to report table context menu	2014-12-06 14:30:40 +01:00
Marc Zinnschlag	f2fc693325	added context menu to report table	2014-12-06 14:17:56 +01:00
Marc Zinnschlag	350b0cb93c	added hidden hint column to report model	2014-12-06 13:45:47 +01:00
Marc Zinnschlag	6c18a3b0b5	allow drags from report table	2014-12-06 13:19:43 +01:00
Marc Zinnschlag	7c59ea6296	added specialised report table	2014-12-06 13:01:55 +01:00
Marc Zinnschlag	9ae69447d3	Merge remote-tracking branch 'scrawl/master'	2014-12-06 11:19:47 +01:00
scrawl	416d549568	Fix animation glitch caused by knockdown ... If the player was knocked down while having no weapon, spell nor fists ready, the animation state would incorrectly shift to "weapon equipped" even though no weapon is equipped.	2014-12-05 22:02:18 +01:00
scrawl	e313ed3cef	Support animated container models	2014-12-05 20:58:33 +01:00
scrawl	65536f0857	Load initial particle system state from NIF files (Fixes #2178)	2014-12-05 18:00:30 +01:00
scrawl	a67e7c64ea	Optimize pathgrid store	2014-12-05 15:58:22 +01:00
scrawl	83dcf9ce4b	Overwrite existing records in IndexedStore (Fixes #2182)	2014-12-05 15:58:05 +01:00
cc9cii	ab693f1f64	Workaround file lock being lost if the same file is closed elsewhere in the program (see https://svn.boost.org/trac/boost/ticket/3582)	2014-12-05 07:50:03 +11:00
cc9cii	8d0cca6cfc	Merge remote-tracking branch 'remotes/upstream/master' into single-instance ... Conflicts: apps/opencs/editor.cpp	2014-12-05 07:38:33 +11:00
Marc Zinnschlag	f771b95a15	Merge remote-tracking branch 'cc9cii/master'	2014-12-04 20:04:19 +01:00
cc9cii	6731afc79c	Use float for setting skill use values. Should resolve bug #2183.	2014-12-05 03:59:16 +11:00
cc9cii	07f10a0140	Use append syntax compatible with older versions of boost.	2014-12-05 01:32:20 +11:00
cc9cii	e67cf96250	Allow only one instance of OpenCS. Only tested on windows x64.	2014-12-05 01:09:42 +11:00
Marc Zinnschlag	eb6e1576be	Merge remote-tracking branch 'scrawl/master'	2014-12-03 20:17:34 +01:00
scrawl	fee08f97ed	Fix crash in character preview for non-existing meshes (Fixes #2128)	2014-12-03 18:28:35 +01:00
scrawl	75b0da5dce	Don't updateBoneTree for non-skinned parts (Fixes #2124)	2014-12-03 18:28:35 +01:00
scrawl	14ae6d28b0	Fix being able to jump when overencumbered	2014-12-03 18:28:35 +01:00
scrawl	3519d23518	Race dialog: remove incorrect assumption about numeric index in head/hair record IDs	2014-12-03 18:28:35 +01:00
scrawl	7faa849cef	Fix fatigue recalculation using older value (oops)	2014-12-03 18:28:34 +01:00
scrawl	dd0cea21b0	Implement overwriting pathgrid records (Fixes #2175)	2014-12-03 18:28:34 +01:00
Marc Zinnschlag	e2efc4770d	Merge remote-tracking branch 'viadanna/fix/invisible-combat'	2014-12-03 15:34:02 +01:00
Marc Zinnschlag	f2d991505e	handle other Windows-specific path issues regarding OpenCS resources handling	2014-12-03 15:31:00 +01:00
Marc Zinnschlag	58b6e757e3	fixed another case folding problem regarding OpenCS resources handling	2014-12-03 15:24:37 +01:00
Marc Zinnschlag	e755f692cc	silenced some annoying warnings	2014-12-03 09:42:12 +01:00
Paulo Viadanna	bfa048e687	Fix #1734: AI will stop combat if target disappear	2014-12-02 17:38:25 -02:00
Marc Zinnschlag	406cf2b981	disable element visibility buttons that do not apply to the respective cell type	2014-12-02 11:17:39 +01:00
scrawl	fadbb5ad21	Add particle and sound fading for weather transitions (Fixes #2130)	2014-12-01 23:09:47 +01:00
scrawl	b9d0552166	Fix positionCell rotation argument when used on the player ... This fixes the player's initial orientation on the starting boat, to properly face Jiub.	2014-12-01 23:09:47 +01:00
scrawl	46d93f1b08	Crime update: NPCs can report crimes if they didn't see the crime, but were alerted by someone who saw it and did not report it themselves.	2014-12-01 23:09:46 +01:00
scrawl	507cbcfae3	Remove incorrect implementation of the iAlarm* GMSTs, not used by vanilla MW (Fixes #2064) ... According to Hrnchamd, these are unused. The real mechanics are not fully documented, but from a quick test only NPCs with an alarm value of 100 will report crimes.	2014-12-01 23:09:46 +01:00
scrawl	ed686ddd2f	Don't update nodes with an empty name from the skeleton source (Fixes #2125)	2014-12-01 23:09:46 +01:00
scrawl	a1226501fa	AiWander: move idle animation handling to non-delayed section (Fixes #2073)	2014-12-01 23:09:46 +01:00
scrawl	f9ae0d9d66	Fix dialogue goodbye link conflicting with choice links	2014-12-01 23:09:46 +01:00
scrawl	8103d25b09	Make ToggleMenus close open windows (Fixes #2045)	2014-12-01 23:09:46 +01:00
scrawl	c684c99a95	Combat AI: Don't attempt to cast spells when impossible to succeed (Fixes #2059)	2014-12-01 23:09:46 +01:00
scrawl	6960cac5eb	Disable third person zoom feature by default due to usability issues (Fixes #2129)	2014-12-01 23:09:46 +01:00
scrawl	61d1aa78ce	Move AiWander path finder to temporary storage (Fixes #2082)	2014-12-01 23:09:46 +01:00
Marc Zinnschlag	b7cf114d5d	Merge remote-tracking branch 'scrawl/delete'	2014-12-01 22:57:41 +01:00
Marc Zinnschlag	cbcd6a26d5	memory leak fix	2014-12-01 22:57:32 +01:00
scrawl	48d5789aeb	Use a separate flag for references deleted by a content file (Fixes #2018) ... The flag must be separate so as to not contaminate the user's savegame. Fixes the following use cases that were broken before: - Content file edits a reference that was already deleted by a previously loaded content file -> reference must stay deleted - Changed or new content file deletes a reference that is already present in the user's savegame -> reference must be deleted - Said content file is disabled again - reference must be undeleted	2014-12-01 22:16:45 +01:00
MiroslavR	6e1a11f322	Queue screen fade operations invoked by scripts	2014-12-01 19:13:04 +01:00
Marc Zinnschlag	acd63659c1	Merge remote-tracking branch 'scrawl/launcher'	2014-12-01 09:39:31 +01:00
cc9cii	3b5cd286f6	Do not destroy overlay if it was never created (e.g. due to an Ogre exception).	2014-12-01 14:09:22 +11:00
cc9cii	64e1594b41	Move the destruction of global resources, being used by multiple documents, to the editor.	2014-12-01 14:08:27 +11:00
cc9cii	44b11163d1	Do not delete physics objects if it was never created (e.g. preview window)	2014-12-01 10:07:02 +11:00
cc9cii	2d229c70cb	Another missed null shared_ptr conversion for gcc.	2014-12-01 09:41:03 +11:00
cc9cii	9fb4b1f499	Initialise null shared_ptr	2014-12-01 08:15:17 +11:00
scrawl	a4e32d23c6	Fix old profile content not being cleared correctly when saving content file selection (Fixes #2173)	2014-11-30 20:52:34 +01:00
cc9cii	2720e5ea9d	Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application.	2014-12-01 06:44:12 +11:00
Marc Zinnschlag	db17dbe324	don't store esm readers for non-base content files	2014-11-30 18:04:18 +01:00
Marc Zinnschlag	4a9d2038fa	load land for non-base content files immediately	2014-11-30 14:33:39 +01:00
Marc Zinnschlag	003675318d	Merge remote-tracking branch 'scrawl/master'	2014-11-29 20:54:04 +01:00
scrawl	5f5fcc2fef	Make PlayGroup use an indefinite number of loops (Fixes #2156)	2014-11-28 17:15:31 +01:00
scrawl	4fd3a994e9	Add model and script information to BetaComment	2014-11-28 16:27:18 +01:00
scrawl	ea8f617508	Add missing player control enabled checks (Fixes #2152)	2014-11-28 15:54:38 +01:00
scrawl	d7220cdc2f	Do not allow decrease below zero in modCurrentMagicka and modCurrentHealth (Fixes #2158)	2014-11-28 15:16:53 +01:00
scrawl	0a466ad643	Make recalculation of magicka less aggressive (Fixes #2155)	2014-11-28 14:45:35 +01:00
Marc Zinnschlag	dadc089ddb	Merge branch 'buttons'	2014-11-28 09:16:47 +01:00
Marc Zinnschlag	e177b66c1d	moved fog button from unpaged worldspace to worldspace	2014-11-28 09:16:39 +01:00
Marc Zinnschlag	e04ead2bd5	new element visibility button icons	2014-11-28 09:14:02 +01:00
MiroslavR	cb74c1c36e	Set health to 0 if it drops below 1 (Fixes #2163)	2014-11-27 20:44:41 +01:00
Marc Zinnschlag	50a489321f	updated run button	2014-11-27 09:27:29 +01:00
Marc Zinnschlag	d37ff8ec63	fixed missing tooltip update for toggle/mode-type buttons	2014-11-27 08:59:21 +01:00
Marc Zinnschlag	23624841e0	Merge remote-tracking branch 'cc9cii/editwidget-setrange'	2014-11-26 10:19:58 +01:00
cc9cii	936094ae95	Set range of spinbox types in dialogsubview.	2014-11-26 08:08:28 +11:00
Marc Zinnschlag	533bb3b0d5	Merge remote-tracking branch 'miroslavr/master'	2014-11-25 19:30:49 +01:00
scrawl	ff8bdd74ed	Fix strange bitflags handling	2014-11-25 15:54:55 +01:00
MiroslavR	238325455d	Erase effects that have expired (Fixes #2134)	2014-11-25 10:33:03 +01:00
scrawl	d36dfbe779	Apply the frame time cap to Ogre's ControllerManager (Fixes #2154) ... This fixes particle systems getting out of whack due to a particularly long frame time, e.g. after a loading screen.	2014-11-25 02:44:11 +01:00
cc9cii	69134e3ac2	Add icon to windows executable.	2014-11-24 12:48:36 +11:00
scrawl	ada4e37556	Fix race preview texture not being destroyed properly (Fixes #2098)	2014-11-24 01:02:18 +01:00
scrawl	c1e6b8608b	Always create a skeleton if there's an "ArrowBone" node (Fixes #2117)	2014-11-23 16:37:31 +01:00
scrawl	4bf5c89e6f	Merge branch 'master' of https://github.com/OpenMW/openmw into unshield ... Conflicts: apps/wizard/CMakeLists.txt	2014-11-23 13:45:46 +01:00
scrawl	abf49267ea	Unshield include fix	2014-11-23 13:44:03 +01:00
scrawl	a8a2b44b0f	Don't require libunshield on windows	2014-11-23 00:51:57 +01:00
Nikolay Kasyanov	a0c454b01c	Properly add libunshiled include dir (again, for wizard this time)	2014-11-22 22:53:01 +02:00
scrawl	414f7ea02c	Ignore mouse movements during video playback (Fixes #2139)	2014-11-22 12:59:31 +01:00
Marc Zinnschlag	c7933dd692	Merge remote-tracking branch 'cc9cii/master'	2014-11-22 11:28:01 +01:00
cc9cii	31fdf49616	Use Qt exit function rather than system one.	2014-11-22 06:59:23 +11:00
scrawl	1e06f69d9e	Remove the "browse to existing installation" button, now replaced by the wizard ... Clean up some debug spam	2014-11-20 22:39:34 +01:00
cc9cii	911839bb91	Simplify detecting whether a universal id represents a referenceable type.	2014-11-21 06:48:42 +11:00
scrawl	c6558fe487	Fix Ogre being initialised twice	2014-11-19 13:19:02 +01:00
cc9cii	ede1b97b46	Check the type of universal id before getting its id. Should resolve bug #2137	2014-11-19 18:10:29 +10:00
scrawl	4fa303d7c4	Merge branch 'master' into HEAD ... Conflicts: CMakeLists.txt apps/launcher/CMakeLists.txt	2014-11-18 17:43:51 +01:00
scrawl	3028141815	Set up ESMReader indices in OpenCS (fixes wrong terrain textures when multiple content files are loaded)	2014-11-18 11:47:46 +01:00
scrawl	21481e8c71	Fix bsatool help typo	2014-11-18 11:18:02 +01:00
Marc Zinnschlag	5eb9fd81e1	use placeholder icons in OpenCS when no proper icon is available	2014-11-13 12:09:10 +01:00
Marc Zinnschlag	a60e4c036f	Merge branch 'mode' ... Conflicts: apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/worldspacewidget.cpp apps/opencs/view/render/worldspacewidget.hpp	2014-11-13 11:12:20 +01:00
Marc Zinnschlag	b7f8f848a8	added edit modes for exteriors	2014-11-13 10:45:59 +01:00
cc9cii	b86148411b	Fix for issue #2051. Not perfect (can get into a lock in some situations) but usable.	2014-11-12 14:02:08 +11:00
Marc Zinnschlag	2acf446f18	added edit mode button to scene toolbar	2014-11-11 15:58:22 +01:00
scrawl	273a80e2c0	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-11-11 15:43:46 +01:00
Evgenii Babinets	fe385214e4	Added proper slow fall effect mechanics.	2014-11-10 02:42:44 -05:00
Marc Zinnschlag	b50fcd403b	renamed getElementMask to getVisibilityMask	2014-11-09 11:29:45 +01:00
Marc Zinnschlag	de3a26e21b	Merge remote-tracking branch 'miroslavr/master'	2014-11-08 11:00:19 +01:00
MiroslavR	b8d5a9486a	Make Restore/Damage Attribute/Skill effects continuous	2014-11-08 00:57:03 +01:00
Marc Zinnschlag	9e67a07ad4	allow externally supplied ModeButtons in SceneToolMode	2014-11-07 11:11:43 +01:00
Marc Zinnschlag	4dd645559d	added ModeButton specialisation of PushButton for use in SceneToolMode	2014-11-06 13:26:19 +01:00
scrawl	d5768af952	Fix INT_MIN trade exploit (Fixes #2096)	2014-11-06 03:51:18 +01:00
cc9cii	a3a0682138	Remove files no longer used, reverting to OEngine.	2014-11-06 11:16:17 +11:00
cc9cii	bf669a51c1	Merge branch 'master' into mouse-picking-physics	2014-11-06 09:46:48 +11:00
cc9cii	f051fb65ff	Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document.	2014-11-06 08:35:24 +11:00
scrawl	6b88f5f33e	Use Ogre::uint8, fixes a missing include for uint8_t	2014-11-05 20:58:49 +01:00
scrawl	61d4a6b344	Merge branch 'openmw-033'	2014-11-05 20:58:42 +01:00
scrawl	ba3d2be8e3	Add missing include (Fixes #2108)	2014-11-05 19:45:32 +01:00
Internecine	edc51ab768	Removed debug output	2014-11-05 15:26:13 +13:00
Internecine	6741fbe7a9	Fixes bug #2031	2014-11-05 15:22:44 +13:00
cc9cii	03abd69b4f	Include string header for gcc.	2014-11-05 07:20:20 +11:00
cc9cii	7d133d508d	Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager.	2014-11-05 07:10:14 +11:00
Internecine	9c5f156793	Fixes tooltip displaying 0 durations	2014-11-05 00:46:33 +13:00
cc9cii	37a050873c	Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time.	2014-11-04 21:46:35 +11:00
cc9cii	70b5d6857a	Add missing files.	2014-11-04 20:52:28 +11:00
cc9cii	0e70315f91	Experimental, compiles and runs but crashes in some exit scenarios.	2014-11-04 20:43:04 +11:00
Marc Zinnschlag	d48a2759f6	Merge remote-tracking branch 'cc9cii/mouse-picking'	2014-11-03 13:19:19 +01:00
Marc Zinnschlag	bf40a3bb5d	enhanced SceneToolBar tool handling (remove and insert at specific point)	2014-11-03 13:18:53 +01:00
cc9cii	bd6e54dde3	Add function to cancel drag by pressing ESC. Remove debug code.	2014-11-03 21:24:47 +11:00
cc9cii	092080c69c	Group the commands with begin/end macros.	2014-11-03 13:57:57 +11:00
cc9cii	bf5ba41223	Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once.	2014-11-03 12:46:31 +11:00
cc9cii	4556eb74fe	Fix saving position and rotation.	2014-11-03 10:07:21 +11:00
cc9cii	e3a000917c	Minor tidy up.	2014-11-03 10:04:24 +11:00
cc9cii	358cac2f0a	Fix deleting object physics again.	2014-11-03 10:03:54 +11:00
cc9cii	d9755f82c3	Position saving - work in progress.	2014-11-03 08:11:15 +11:00
cc9cii	85ef683319	Fix deleting physics object when scene node is cleared.	2014-11-03 08:10:28 +11:00
MiroslavR	140013820b	Fix invalidated iterator	2014-11-02 15:40:08 +01:00
MiroslavR	a4d0068e29	Make forcegreeting no-op for disabled references (Fixes #2093)	2014-11-02 15:36:13 +01:00
Marc Zinnschlag	29c9b6bd01	Merge remote-tracking branch 'scrawl/master'	2014-11-02 10:38:42 +01:00
cc9cii	3796240b19	Refactor duplicate code sections.	2014-11-02 18:13:25 +11:00
cc9cii	49d416353e	Remove a redundant list.	2014-11-02 17:56:28 +11:00
cc9cii	7f54dab6ef	Fix issue where objects were sometimes unresponsive after dragging.	2014-11-02 15:34:45 +11:00
cc9cii	e174428cc5	Minor tweaks.	2014-11-02 15:03:26 +11:00
cc9cii	1eed180a5c	Fix Gcc/MSVC differences with friend class. Invert camera derived direction.	2014-11-02 11:41:11 +11:00
cc9cii	a21958d007	Add option to move the mouse against the screen frame of reference.	2014-11-02 10:30:44 +11:00
cc9cii	89bb616cbc	Remove debugging code.	2014-11-02 08:33:32 +11:00
cc9cii	8b4651f055	Move mouse related functions and states out of WorldspaceWidget.	2014-11-02 08:22:27 +11:00
scrawl	17cb181f88	Use av_get_default_channel_layout for unknown channel layouts	2014-11-01 19:37:54 +01:00
scrawl	efa4d09c48	Fix crash when avcodec_decode_audio4 doesn't return a full frame (Fixes #2088)	2014-11-01 19:32:07 +01:00
cc9cii	998982b16a	Keep physics engines until physics code is moved out of OEngine.	2014-11-01 21:04:53 +11:00
Marc Zinnschlag	8b3d876534	Merge remote-tracking branch 'lgro/ffmpeg_decoder'	2014-11-01 10:57:21 +01:00
cc9cii	c6a2461fbd	Delay removing physics until the document is closed. Also other general cleanup.	2014-11-01 20:51:04 +11:00
cc9cii	1ee64c7087	Add missing files for multi-document support.	2014-11-01 19:12:22 +11:00
cc9cii	b328aa1fb9	Multiple document support.	2014-11-01 18:57:39 +11:00
cc9cii	057982b1f8	Fix Subview interface clutter by keeping a map of Scenewidgets.	2014-11-01 08:29:08 +11:00
cc9cii	e51d532795	Show drag movements of objects in multiple scene managers.	2014-11-01 07:39:58 +11:00
cc9cii	d6e67b248f	Fix deleting objects and scenewidgets.	2014-11-01 07:29:16 +11:00
Marc Zinnschlag	7785e3a0bc	fixed for potential crash during saved game loading	2014-10-31 17:59:55 +01:00
cc9cii	ade7f09203	Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.	2014-11-01 00:03:09 +11:00
cc9cii	ac7acb2c22	Disable more debug code.	2014-10-31 22:21:24 +11:00
cc9cii	4f685092fb	Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking	2014-10-31 22:05:24 +11:00
cc9cii	aa7b693a13	Remove debug settings and minor cleanup.	2014-10-31 22:04:10 +11:00
cc9cii	fbadaf55ee	Multiple SceneManagers per physics engine now working.	2014-10-31 21:50:57 +11:00
Marc Zinnschlag	ac58dd735b	do not crash on exceptions while adding startup scripts	2014-10-31 11:02:42 +01:00
Marc Zinnschlag	4fa0bf63c5	Merge remote-tracking branch 'scrawl/master'	2014-10-31 08:18:18 +01:00
scrawl	45f14f0704	Fix stolen faction-owned items not being confiscated	2014-10-31 00:25:37 +01:00
cc9cii	a2ac4c7650	Allow multiple scene managers per physics engine. Compiles but does not work properly.	2014-10-31 08:18:15 +11:00
Marc Zinnschlag	8ed3454774	Merge remote-tracking branch 'corristo/unshiled-include-fix'	2014-10-29 14:49:04 +01:00
cc9cii	0515159b74	Fix typo.	2014-10-29 23:38:19 +11:00
cc9cii	1741043f20	Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.	2014-10-29 23:02:38 +11:00
Nikolay Kasyanov	0dc08e2983	Properly add libunshiled include dir	2014-10-29 11:26:06 +02:00
Alexander "Ace" Olofsson	c1ce570e37	Use the enum value from Qt::KeyboardModifiers ... This fixes the windows build at least	2014-10-29 04:55:06 +01:00
cc9cii	792fbd119f	Resolve incorrect merge issues.	2014-10-29 10:43:55 +11:00
cc9cii	c990ed4335	Merge branch 'mouse-picking-state' into mouse-picking ... Conflicts: apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp	2014-10-29 09:33:48 +11:00
cc9cii	6ca88dc541	Merge branch 'master' into mouse-picking ... Conflicts: apps/opencs/model/settings/usersettings.cpp	2014-10-29 09:28:23 +11:00
cc9cii	8e2a0ea90a	Implemented moving objects around x-y plane.	2014-10-29 08:13:13 +11:00
scrawl	f7ba1dbfc8	Add error handling for getPcRank and similar defines (Fixes #2071)	2014-10-28 16:07:37 +01:00
cc9cii	68b7532383	Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.	2014-10-29 00:50:48 +11:00
scrawl	e48dc45ede	Fix creatures not being able to move with 0/0 encumbrance	2014-10-27 21:53:00 +01:00
scrawl	c194226d08	Increase maximum height for finding spawn points to 500 (Fixes #2056)	2014-10-27 21:52:59 +01:00
scrawl	aa02974d3b	Fix Journal instruction for non-existing journal indices (Fixes #2063)	2014-10-27 21:52:59 +01:00
cc9cii	5afaa0083f	Minimise false detection of grab & drag operation.	2014-10-28 06:42:33 +11:00
cc9cii	a01a921644	Experimental mouse event state machine for 3d editing, starting with drag & drop objects.	2014-10-28 06:01:19 +11:00
Marc Zinnschlag	e604fcf282	Merge branch 'double'	2014-10-27 09:56:52 +01:00
Marc Zinnschlag	6f4b753750	replaced regular function call from SubView to View with signal-slot-connection	2014-10-27 09:51:55 +01:00
Marc Zinnschlag	1aef9304e9	replaced the signal/slot user settings update with a regular function call	2014-10-27 09:44:18 +01:00
Marc Zinnschlag	b0a7b457f7	made double click actions in tables configurable	2014-10-27 09:32:02 +01:00
cc9cii	815e832dbb	Merge branch 'master' into mouse-picking-state	2014-10-27 18:57:42 +11:00
Marc Zinnschlag	275bf854ed	added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)	2014-10-27 08:57:18 +01:00
cc9cii	6c8320a638	More cleanup.	2014-10-27 12:09:20 +11:00
cc9cii	c2c33eac0f	Minor cleanup.	2014-10-27 08:26:01 +11:00
cc9cii	0b63ba5727	Move debug rendering code out of PhysicsSystem.	2014-10-27 08:08:33 +11:00
cc9cii	dd2c067e17	Cleanup for better legibility.	2014-10-27 06:50:51 +11:00
cc9cii	fb0f85c8db	Report terrain position on cursor position.	2014-10-26 21:15:47 +11:00
cc9cii	95683bc8c3	Add user interface for top level window status-bar setting (implementation already existed). For feature #854.	2014-10-26 15:04:52 +10:00
cc9cii	8b0dc88db8	Use the correct name for deleting objects.	2014-10-26 08:15:18 +11:00
cc9cii	b46df4034d	Cleanup bullet objects in the destructors.	2014-10-26 07:56:51 +11:00
scrawl	dab05471be	Reset crime when bounty is reset to 0 by a script (Fixes #2057)	2014-10-25 21:09:37 +02:00
scrawl	ac067564ea	Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware.	2014-10-25 20:50:41 +02:00
scrawl	4680bc6c93	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-10-25 19:59:23 +02:00
Marc Zinnschlag	aad13e6bff	close view when closing last sub-view unless this view is the last view	2014-10-25 18:13:56 +02:00
scrawl	55c9c0a266	Audio resampling fixes ... - Don't try to use float audio or extended channel layouts if the hardware does not support them - Add channel layout resampling support to ffmpeg_decoder	2014-10-25 17:17:57 +02:00
Marc Zinnschlag	a9f5632afd	extended double click functionality in tables	2014-10-25 16:27:36 +02:00
cc9cii	9337d6533a	Add terrain collision. Support visibility mask for objects and terrain.	2014-10-25 22:09:19 +11:00
Marc Zinnschlag	a87092d11b	Merge remote-tracking branch 'miroslavr/master'	2014-10-25 12:09:36 +02:00
Marc Zinnschlag	a4be214fb1	Merge remote-tracking branch 'scrawl/master'	2014-10-25 12:08:16 +02:00
cc9cii	cc0acec64c	Add settings to enable/disable debug rendering of mouse picking.	2014-10-25 21:02:40 +11:00
cc9cii	dd9208afeb	Merge remote-tracking branch 'upstream/master' into mouse-picking	2014-10-25 10:59:17 +01:00
cc9cii	e01795556f	Suppress some warnings for MSVC.	2014-10-25 10:37:57 +11:00
scrawl	dbe30e31b9	Make creature's model take priority over base_anim.nif (Fixes #2055)	2014-10-25 00:56:43 +02:00
scrawl	b39d69e98c	Videoplayer fixes, play/pause & seeking ... - Fix rindex overflow - Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size. - Add support for play/pause and seeking controls (not used by cutscenes in OpenMW) - Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back) The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer	2014-10-24 21:31:11 +02:00
MiroslavR	ed3a3f717f	Handle getdistance on objects inside a container (Fixes #2046)	2014-10-24 19:05:43 +02:00
MiroslavR	fa746b8e54	Do not display weight or value in tooltip for zero-weight items (Fixes #2047)	2014-10-24 19:05:43 +02:00
MiroslavR	925fa8d193	Reset ownership of items dropped via 'drop' instruction (Fixes #2053)	2014-10-24 19:04:47 +02:00
scrawl	e2bad395e5	Leak fix	2014-10-24 18:07:17 +02:00
cc9cii	54a6897df8	Use QString rather than std::to_string	2014-10-24 20:43:29 +10:00
cc9cii	e5dd8d06a0	Store object reference id to RigidBody instead of scene node handles.	2014-10-24 21:18:29 +11:00
cc9cii	cb53e714f7	Convert PhysicsSystem to a singleton.	2014-10-24 19:14:02 +10:00
cc9cii	98ff3e7307	No physics or mouse picking for object preview.	2014-10-24 07:57:29 +11:00
Marc Zinnschlag	19b380d0b4	Merge remote-tracking branch 'scrawl/master'	2014-10-23 20:07:40 +02:00
Marc Zinnschlag	6ff41c6a00	intercept shift/ctrl double-clicks in tables	2014-10-23 11:28:58 +02:00
cc9cii	2f26fc1188	Avoid Ogre exceptions and null pointers.	2014-10-23 20:14:01 +11:00
cc9cii	39cd89a9af	Make gcc happy.	2014-10-23 18:51:31 +11:00
cc9cii	4d86371ca3	Minor refactoring and cleanup.	2014-10-23 15:35:01 +11:00
cc9cii	cca6d0a024	Fixed issue with mouse picking accuracy.	2014-10-23 12:43:06 +11:00
scrawl	eb1c24ffe6	Refactor video player engine to get rid of MWSound dependencies ... - Split video player to separate source files. - Move video player engine sources to extern/ (repository will be set up on github soon). - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem). - Handle conversion of unsupported channel layouts via ffmpeg's swresample.	2014-10-22 22:33:32 +02:00
cc9cii	fdee3fd919	Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance.	2014-10-23 06:59:14 +11:00
Marc Zinnschlag	c1d867a213	Merge remote-tracking branch 'origin/master'	2014-10-22 09:48:30 +02:00
Marc Zinnschlag	8f0add75f5	Merge remote-tracking branch 'scrawl/master'	2014-10-22 09:42:28 +02:00
Marc Zinnschlag	94d5151273	Merge remote-tracking branch 'miroslavr/master'	2014-10-22 09:39:54 +02:00
scrawl	bcb2d714c0	Add TODO comments for future videoplayer enhancements	2014-10-21 23:46:04 +02:00
cc9cii	4b53b8658b	Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate.	2014-10-22 07:11:04 +11:00
scrawl	41df4289c6	Merge remote-tracking branch 'upstream/openmw-33' into HEAD ... Conflicts: apps/openmw/mwworld/store.hpp	2014-10-21 19:40:58 +02:00
Alexander "Ace" Olofsson	b5a57920b6	Fix compile error on Windows	2014-10-21 19:35:17 +02:00
scrawl	5711103322	Remove leftover comment	2014-10-21 17:51:59 +02:00
scrawl	202cfa879f	Implement frame drop support in the videoplayer (Fixes #1343)	2014-10-21 17:01:53 +02:00
scrawl	290aacd2a6	Fix videoplayer crash on quit ... The sound stream thread was trying to update the stream during/after destruction of the video state.	2014-10-21 17:01:53 +02:00
scrawl	8472695f89	Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." ... This reverts commit d77546b7dc. Conflicts: apps/openmw/mwrender/videoplayer.cpp	2014-10-21 17:01:53 +02:00
scrawl	de0e0fedff	Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." ... This reverts commit f5589b42ea. Conflicts: apps/openmw/mwrender/videoplayer.cpp	2014-10-21 17:01:53 +02:00
scrawl	681f3fa530	Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder." ... This reverts commit b40c1ff26c.	2014-10-21 17:01:52 +02:00
Marc Zinnschlag	5fdd264d07	Merge remote-tracking branch 'origin/master'	2014-10-21 12:38:35 +02:00
Marc Zinnschlag	843493e90a	fixed case-problem in OpenCS script compiler	2014-10-21 12:38:18 +02:00
scrawl	8b3755a770	Compile fix	2014-10-20 17:45:24 +02:00
scrawl	f2877c69d7	Fix old alchemy apparatus still showing in alchemy window after removal	2014-10-20 17:45:18 +02:00
scrawl	192069a181	Add automatic potion naming	2014-10-20 17:45:11 +02:00
scrawl	fd7c181e06	Fix alchemy producing potion IDs from content files	2014-10-20 17:45:06 +02:00
scrawl	9bb51fd9c2	Compile fix	2014-10-20 17:42:51 +02:00
scrawl	ace8e0175b	Fix old alchemy apparatus still showing in alchemy window after removal	2014-10-20 17:28:51 +02:00
scrawl	29ac97be7a	Add automatic potion naming	2014-10-20 17:28:51 +02:00
scrawl	7f06e3e7e3	Fix alchemy producing potion IDs from content files	2014-10-20 17:07:54 +02:00
MiroslavR	5a7dbb19f7	Code clarity	2014-10-20 01:10:08 +02:00
scrawl	4047e3c928	Properly handle DialInfo records that were marked as Deleted (Fixes #2035)	2014-10-19 17:46:28 +02:00
scrawl	b0f98687e6	Properly handle DialInfo records that were marked as Deleted (Fixes #2035)	2014-10-19 17:45:18 +02:00
Marc Zinnschlag	94ae222f0e	Merge branch 'settings'	2014-10-19 13:44:15 +02:00
Marc Zinnschlag	a5bbfff9e2	another layout correction	2014-10-19 13:43:40 +02:00
Marc Zinnschlag	5a1ce4943e	added advance 3D rendering user settings section	2014-10-19 13:41:56 +02:00
cc9cii	8bcd415cca	Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.	2014-10-19 07:25:54 +11:00
MiroslavR	ed6bdc0bde	Use all topics to search for keywords in dialogues (Fixes #2013) ... Move KeywordSearch to MWDialogue Move hypertext parsing functions to a new file	2014-10-18 20:07:40 +02:00
scrawl	deabc52c16	Treat "Root Bone" as the animation root if existing (Fixes #2019)	2014-10-17 23:29:59 +02:00
scrawl	415f67f859	Treat "Root Bone" as the animation root if existing (Fixes #2019)	2014-10-17 23:29:13 +02:00
scrawl	5892fd9e65	Fix NpcAnimation non-existing skeleton crash (Fixes #2028)	2014-10-17 23:07:01 +02:00
scrawl	8233f5894a	Fix NpcAnimation non-existing skeleton crash (Fixes #2028)	2014-10-17 23:04:36 +02:00
cc9cii	03a30c3f1d	Experimental, compiles but does not work.	2014-10-18 06:16:48 +11:00
scrawl	f117a75747	Force walk animation when flying (Fixes #2015)	2014-10-17 19:11:06 +02:00
scrawl	5f11ccc298	Show tooltip for non-affordable list items (Fixes #2025)	2014-10-17 19:02:31 +02:00
scrawl	2be65a89a7	Show tooltip for non-affordable list items (Fixes #2025)	2014-10-17 19:01:28 +02:00
Marc Zinnschlag	2106893563	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:47:31 +02:00
Marc Zinnschlag	49938182e8	silenced a compiler warning regarding null pointer dereferencing	2014-10-17 15:46:07 +02:00
Marc Zinnschlag	a3c894c1e2	Merge branch 'cellmarker'	2014-10-17 14:26:16 +02:00
Marc Zinnschlag	994159fafd	fixed broken iterator	2014-10-17 14:23:37 +02:00
Marc Zinnschlag	8a05c0e5c0	fixed overlay singleton	2014-10-17 14:23:27 +02:00
Marc Zinnschlag	ba46bcad40	Revert "Don't allow viewing non-existent cells from the regionmap." ... This reverts commit 7cdab41501.	2014-10-17 13:52:21 +02:00
Marc Zinnschlag	4b921c3876	user settings cleanup	2014-10-17 13:49:33 +02:00
Marc Zinnschlag	c97845d35d	better script compiler diagnostics	2014-10-17 10:59:25 +02:00
scrawl	c3ef39eb6f	Fix ItemWidget text cleanup (Fixes #2022)	2014-10-17 02:41:43 +02:00
Marc Zinnschlag	ed44f3ec7d	added tooltip support to user settings UI	2014-10-16 16:22:36 +02:00
scrawl	c4e81adb83	Fix settings window being too small for all tabs on some localizations	2014-10-16 15:49:01 +02:00
scrawl	e413bebe99	Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980)	2014-10-16 15:07:51 +02:00
Marc Zinnschlag	f4894deff1	removed special value text from spin boxes (broken feature, not used anyway)	2014-10-16 14:47:55 +02:00
Marc Zinnschlag	dddd20ba1e	added default values for display format settings	2014-10-16 14:31:13 +02:00
Marc Zinnschlag	799cd87b52	name convention and spelling fixes	2014-10-16 14:24:17 +02:00
Marc Zinnschlag	e27da6a0d4	removed settings file mixup	2014-10-16 13:59:34 +02:00
Marc Zinnschlag	c94c1adaf3	split off settings page label from internal section name	2014-10-16 13:48:07 +02:00
cc9cii	7cdab41501	Don't allow viewing non-existent cells from the regionmap.	2014-10-16 07:36:47 +11:00
cc9cii	094f046087	Convert OverlaySystem to a OpenCS style singleton.	2014-10-16 07:29:46 +11:00
scrawl	244db5cbfe	Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33	2014-10-15 17:22:53 +02:00
Marc Zinnschlag	984b586bb1	fix for implicit references	2014-10-15 16:27:03 +02:00
Marc Zinnschlag	8afdf0f46b	dagoth fix	2014-10-15 16:12:57 +02:00
scrawl	69bbbefc09	setDynamic workaround for broken endgame scripts (Fixes #2016)	2014-10-15 15:00:45 +02:00
Marc Zinnschlag	720ba2c0d8	split off settings label from internal settings name	2014-10-15 13:39:53 +02:00
Marc Zinnschlag	daf7cab416	refactored section handling	2014-10-15 12:38:17 +02:00
Marc Zinnschlag	219fbd427f	unclutter user settings declarations	2014-10-15 12:13:22 +02:00
Marc Zinnschlag	868fdfba51	reclaiming some unused space	2014-10-15 11:07:40 +02:00
Marc Zinnschlag	e20fa209cc	user settings UI layout improvements	2014-10-15 11:02:41 +02:00
cc9cii	aff6f6fdb2	Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.	2014-10-15 18:48:01 +11:00
cc9cii	1d0ac3b4df	Delete Ogre::OverlaySystem before Ogre::Root	2014-10-15 07:02:19 +11:00
Alexander "Ace" Olofsson	dc788512e2	Fix LNK2019 link error on Visual Studio 2010 builds ... For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures	2014-10-14 16:10:19 +02:00
cc9cii	8cebfc411b	Minor visual improvements.	2014-10-14 17:34:10 +11:00
cc9cii	994420aa57	Singleton wrapper for Ogre OverlaySystem.	2014-10-14 13:21:43 +11:00
cc9cii	57b337d368	Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.	2014-10-14 11:43:56 +11:00
Marc Zinnschlag	6beee95151	Merge remote-tracking branch 'terrorfisch/aistate'	2014-10-13 19:14:15 +02:00
Marc Zinnschlag	528dcf761d	Merge remote-tracking branch 'internecine/master'	2014-10-13 19:11:14 +02:00
Marc Zinnschlag	e23a32c44f	some cleanup	2014-10-13 15:26:47 +02:00
Marc Zinnschlag	8062faa51a	fixed member variable access in OpenCS script compiler (Fixes #2011)	2014-10-13 15:25:27 +02:00
Marc Zinnschlag	02acf60c0b	added tooltips for scopes in creator bar	2014-10-13 14:24:27 +02:00
cc9cii	961867e39f	Hide overlay if off screen.	2014-10-13 20:58:07 +11:00
cc9cii	313aed078e	Merge remote-tracking branch 'remotes/upstream/master' into QtOgre ... Conflicts: apps/opencs/CMakeLists.txt	2014-10-13 20:45:30 +11:00
Marc Zinnschlag	eb45793eab	Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'	2014-10-13 11:03:03 +02:00
Marc Zinnschlag	61731d3277	Merge remote-tracking branch 'miroslavr/master'	2014-10-13 10:57:04 +02:00
cc9cii	43838ccf01	Remove override (c++11)	2014-10-13 16:42:50 +11:00
cc9cii	e58e5c2bf5	Update overlays independently from multiple viewports.	2014-10-13 15:57:01 +11:00
Thoronador	46496a35a1	fix uninitialized pointer variable in CSVDoc::SubView class	2014-10-12 23:42:44 +02:00
Thoronador	4d62541b62	fix usage of numeric_limits static functions min() and max() ... Functions min() and max() of std::numeric_limits<T> are static and can therefore be accessed via class name and :: operator.	2014-10-12 23:28:16 +02:00
cc9cii	47c5bc9a19	Set bounding box on manual objects rather than creating meshes.	2014-10-13 07:42:43 +11:00
MiroslavR	8456741eaa	Fix blindness and create a separate fader for it	2014-10-12 19:06:40 +02:00
scrawl	9edcc332ec	Don't remove player's sounds when unloading a cell	2014-10-12 18:35:15 +02:00
scrawl	d51daf5875	Fix AI not using F_Always spells, for example "vampire touch"	2014-10-12 17:18:27 +02:00
scrawl	9323f96211	Move terrainstorage to opencs_units_noqt	2014-10-12 17:18:27 +02:00
scrawl	8cb09e89ed	Make spells cast by scripts always succeed (Fixes #1993)	2014-10-12 17:18:27 +02:00
Marc Zinnschlag	aefe8cd4ae	Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound' ... Conflicts: apps/openmw/mwworld/class.cpp	2014-10-12 14:06:08 +02:00
Lukasz Gromanowski	a6a3eca930	Fixes #1887: Equipped items do not emit sounds ... Corrected wrong return type of Class::getSound() method. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-12 13:38:41 +02:00
cc9cii	758ce0ed98	Various fixes as per feedback comments.	2014-10-12 21:15:50 +11:00
Lukasz Gromanowski	e1663de7cf	Fixes #1887: Equipped items do not emit sounds ... Added getSound() method to MWClass class and implementation into Light class. Also added additional bool parameter responsible for enabling/disabling of playing items sounds into NpcAnimation class constructor. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-12 11:40:14 +02:00
MiroslavR	ad253059b1	Hit indicator for absorb/damage health effect	2014-10-12 01:15:40 +02:00
MiroslavR	8dd95fd77e	Construct hit fader with correct texture right away to prevent mygui warning	2014-10-12 00:40:31 +02:00
MiroslavR	a5e972aeb5	Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode	2014-10-12 00:13:24 +02:00
Lukasz Gromanowski	b44ba84a80	Issue #1887: Equipped items do not emit sounds ... Use separate arrays for sound ids and object parts. Restored getting inventoryStore via getInventoryStore() call (removed mInv introduced in previous commit). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-11 23:20:40 +02:00
MiroslavR	2162a9e1b9	Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available	2014-10-11 23:09:20 +02:00
Lukasz Gromanowski	1a0c3dc6cf	Issue #1887: Equipped items do not emit sounds ... Removed unused mUnequipping and mFirstEquip member variables. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-11 22:33:11 +02:00
Lukasz Gromanowski	3b9cfba03c	Issue #1887: Equipped items do not emit sounds ... Sounds are played only when actors draw state is equal to MWMechanics::DrawState_Nothing Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-11 22:21:59 +02:00
MiroslavR	0ae604990e	Implement continuous damage indication (Fixes #1970)	2014-10-11 22:21:48 +02:00
MiroslavR	4dc613a04b	Merge branch 'master' of github.com:OpenMW/openmw	2014-10-11 22:03:47 +02:00
Lukasz Gromanowski	fa65c8981a	Issue #1887: Equipped items do not emit sounds ... Played sound items are based on parts not inserted items. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-11 21:05:12 +02:00
cc9cii	809b8c6d5b	Conflicts: ... apps/opencs/view/render/pagedworldspacewidget.cpp	2014-10-12 05:54:21 +11:00
Marc Zinnschlag	3fd10d2a82	Merge remote-tracking branch 'thoronador/fix-uninitialized-members'	2014-10-11 14:51:55 +02:00
Marc Zinnschlag	82b4148a62	Merge remote-tracking branch 'thoronador/fix-uninitialized-members'	2014-10-11 13:09:33 +02:00
Thoronador	f29a71b498	remove unused var. mSoftwareCursor in WindowManager	2014-10-11 12:54:15 +02:00
Nikolay Kasyanov	138e3032ce	Fix: initialize boolean field with boolean value, not NULL	2014-10-11 10:07:01 +04:00
Thoronador	8361019456	fix uninitialized (pointer) vars in more classes	2014-10-11 02:31:26 +02:00
Thoronador	13a0c5624c	fix uninitialized member variables in OcclusionQuery class	2014-10-11 01:35:12 +02:00
Thoronador	db38108801	fix uninitialized pointer variables in some classes	2014-10-11 01:20:33 +02:00
Thoronador	a5245d5a13	remove unused dummy variable	2014-10-11 00:56:57 +02:00
Thoronador	ab364c9440	fix some more uninitialized class member fields	2014-10-11 00:50:32 +02:00
Thoronador	51cd2bb5d9	remove unused/double variable from CSMWorld::Column class	2014-10-11 00:15:36 +02:00
Thoronador	a799353f60	fix uninitialized fields in CSMDoc::Operation class	2014-10-11 00:06:50 +02:00
Thoronador	deb6452e0d	fix uninitialized pointer fields in CS::Editor class	2014-10-10 23:57:10 +02:00
terrorfisch	c4badcea6e	removed warning	2014-10-10 23:51:29 +02:00
Thoronador	f0d3fc73d5	fix uninitialized pointer fields in GraphicsPage class	2014-10-10 23:47:27 +02:00
terrorfisch	c28dfc2fa4	Travis CI fix?	2014-10-10 23:34:58 +02:00
terrorfisch	4eb1668467	references now initialized when they are needed	2014-10-10 23:32:15 +02:00
terrorfisch	bbca942601	-improved trigonometric precision ... -cleanup	2014-10-10 23:31:01 +02:00
terrorfisch	5248917a6c	- changed namespace	2014-10-10 23:28:49 +02:00
Marc Zinnschlag	21b16f8425	Merge branch 'tables' ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/world/data.cpp apps/opencs/model/world/data.hpp	2014-10-10 16:11:54 +02:00
Marc Zinnschlag	23e969eae7	fixed pathgrid saving again (previous fix was incomplete)	2014-10-10 15:29:21 +02:00
Internecine	470d375177	Removed duplicate functions and moved pause check in weather.cpp	2014-10-10 23:29:51 +13:00
cc9cii	3e5027abbb	Incorporate terrain height to labels and camera.	2014-10-10 13:36:16 +11:00
cc9cii	bfd10a03c0	User configuration manager's resource directory.	2014-10-10 13:35:14 +11:00
cc9cii	406135ee96	Merge remote-tracking branch 'upstream/master' into terrain	2014-10-09 23:47:30 +01:00
terrorfisch	db1b93498d	Added comment.	2014-10-10 00:17:50 +02:00
terrorfisch	730abf6841	Moved all variables in temporary storage for AiCombat and some more for AiWander. ... +Buxfix for previous AiWander changes	2014-10-10 00:16:17 +02:00
MiroslavR	29f5cb46ac	Merge branch 'master' of github.com:OpenMW/openmw	2014-10-09 19:17:39 +02:00
Marc Zinnschlag	c85735abed	Merge remote-tracking branch 'scrawl/terrain'	2014-10-09 12:56:42 +02:00
Internecine	782e851eb1	Better fix, now allows for teleporting to change weather while still paused.	2014-10-09 19:41:51 +13:00
terrorfisch	cae948df96	removed unecessary PathFinders	2014-10-08 23:09:50 +02:00
terrorfisch	4c36c67fb8	Updated AiCombat: ... -moved everything except target to temporary storage -removed the Pathfinder since present in baseclass -cleaned some trigonometric mess	2014-10-08 23:00:36 +02:00
terrorfisch	4391c1fd00	Addded the parts of AiWander that I fully understand to the temporary storage. ... The rest should be done by someone who has a clearer overview over the class.	2014-10-08 22:11:45 +02:00
cc9cii	13f028e27b	Avoid out of range exceptions.	2014-10-09 07:01:18 +11:00
cc9cii	b3ef7a71e2	Different implementation of update overlay fix.	2014-10-09 05:56:44 +11:00
scrawl	8786fb639f	Implement terrain rendering in OpenCS (Fixes #1597)	2014-10-08 17:17:31 +02:00
cc9cii	5d8022bdc5	Update overlay upon control elements button signal.	2014-10-08 21:22:12 +11:00
terrorfisch	0871d45790	Draft how to move temporary package state to CharacterController. ... Example for a few values shown in AiWander.	2014-10-08 10:58:52 +02:00
cc9cii	e2560de05a	Don't use windows path separator.	2014-10-08 08:08:03 +11:00
cc9cii	4fd7537155	Use default sort until a more generic sort that uses numeric order can be implemented.	2014-10-08 07:59:21 +11:00
cc9cii	e1197e75bc	Handle change of names or regions to dynamically update the overlay.	2014-10-08 07:54:22 +11:00
sylar	70fd531722	None texturing filtering enable for android by default	2014-10-08 00:15:22 +04:00
sylar	f75721a217	Add none texture filtering .It is fixes a bug with black objects in shaders glsles	2014-10-07 23:30:31 +04:00
Marc Zinnschlag	744c56943a	Merge remote-tracking branch 'jordan-ayers/topic/misc-cleanup'	2014-10-07 18:03:25 +02:00
cc9cii	7836ee9ab6	Fixed crash exiting internal cells. Better starting camera position for external cells.	2014-10-07 21:18:32 +11:00
cc9cii	a161ad3cd5	Sort cell id column by numerical order.	2014-10-07 20:11:44 +11:00
cc9cii	0cccdfd114	Added description below the cell id (name if exists, or region)	2014-10-07 19:35:28 +11:00
Jordan Ayers	56db525a93	Document the return value of getEffectMultiplier.	2014-10-06 21:56:41 -05:00
cc9cii	7640875f9d	More cleanup.	2014-10-07 10:34:30 +11:00
cc9cii	f48f841d31	Add full path for Ogre Overlay headers (workaround for osx).	2014-10-07 06:40:28 +11:00
cc9cii	0197f7088f	Remove extra frame rendering after enabling/disabling the label.	2014-10-07 06:04:13 +11:00
MiroslavR	d1dc9951d4	Do not display werewolf overlay in third person	2014-10-06 20:24:53 +02:00
MiroslavR	0e19c3fdeb	Silence werewolves' footstep sounds when they are running with their claws sheathed	2014-10-06 18:48:22 +02:00
MiroslavR	4086bc4848	Do not spawn blood vfx on player if hit fader is enabled	2014-10-06 18:33:41 +02:00
MiroslavR	b6abfb0145	Do not display hit fader if the player wasn't damaged	2014-10-06 18:31:02 +02:00
MiroslavR	ff74d54e98	Merge branch 'master' of github.com:OpenMW/openmw	2014-10-06 18:24:41 +02:00
scrawl	8097d9801d	Fix HasSoulgem function to return number of soulgems	2014-10-06 14:56:49 +02:00
scrawl	9ab8d0a8e6	Hotfix for crash when deleting an actor	2014-10-06 14:56:49 +02:00
cc9cii	b3e09cce00	Remove mouse picking code.	2014-10-06 22:29:45 +11:00
cc9cii	972c789060	Add Ogre Overlay path to cmake.	2014-10-06 20:25:09 +11:00
cc9cii	cc6153eb8e	Removed temporary key bindings.	2014-10-06 14:21:44 +11:00
Internecine	3dee4c2b0e	Fixes #1706	2014-10-06 16:10:58 +13:00
cc9cii	6d687993b8	Remove C++11 stuff.	2014-10-06 14:08:35 +11:00
cc9cii	e38417e662	Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide. ... The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.	2014-10-06 13:55:36 +11:00
Jordan Ayers	aac2de270e	Cleanup: Don't call <environment obj>.get(). ... mEnvironment.get() is redundant. Switch the call to resemble the surrounding environment get() calls, instead.	2014-10-05 18:12:55 -05:00
Jordan Ayers	2f5721bf61	Fix typo in comments.	2014-10-05 18:12:33 -05:00
cc9cii	dbb2781817	Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.	2014-10-06 08:20:09 +11:00
scrawl	9cce3bc31b	Implement fDispositionMod according to research wiki	2014-10-05 23:03:30 +02:00
scrawl	39bc11681e	Fix broken onGround status when levitating	2014-10-05 22:59:24 +02:00
scrawl	829a7bfd1b	Fix being able to rest while water-walking (Fixes #1712)	2014-10-05 22:35:53 +02:00
scrawl	d9165593d9	Fix footstep sounds played during water-walking	2014-10-05 22:27:25 +02:00
scrawl	064f1964ba	More efficient water walking	2014-10-05 22:27:20 +02:00
MiroslavR	e1799cbcf4	Fix a typo in condition	2014-10-05 19:53:36 +02:00
scrawl	04614651fa	Fix recharging items not being updated for actor's initial inventory	2014-10-05 18:27:26 +02:00
MiroslavR	de2cb8926a	Feature #1697: Queue fade operations, implement hit fader & werewolf overlay	2014-10-05 17:53:50 +02:00
scrawl	d790506525	Fix projectiles colliding with dead actors (Fixes #1971)	2014-10-05 17:41:56 +02:00
scrawl	c4fa671381	Don't allow raising faction rank if the next rank has no name (Fixes #1975)	2014-10-05 16:47:55 +02:00
scrawl	fe4d74a6cb	Fix not being able to move with 0/0 encumbrance (Fixes #1979)	2014-10-05 15:52:33 +02:00
scrawl	5c3bc6563b	Fix divisions by zero in normalizedEncumbrance	2014-10-05 15:50:01 +02:00
scrawl	8dd410fe96	Teleport indirect followers as well when using a door (Fixes #1974)	2014-10-05 15:18:32 +02:00
Marc Zinnschlag	2d3ffc4483	fixed pathgrid saving	2014-10-05 15:12:12 +02:00
scrawl	ff11745429	Fix magic projectile sound disappearing after multiple save/load cycles	2014-10-05 14:47:23 +02:00
cc9cii	85d93807c5	Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.	2014-10-05 19:25:37 +11:00
Jordan Ayers	663647bee8	Simplify getEffectMultiplier. ... Both return cases were same, except for some overflow conditions.	2014-10-04 15:28:58 -05:00
Lukasz Gromanowski	bcb38c3eba	Issue #1887: Equipped items do not emit sounds ... Added handling of autoEquip and unequipAll cases. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-04 22:27:23 +02:00
scrawl	20777c1b2e	Optimize physics shape scaling on cell load	2014-10-04 20:37:35 +02:00
scrawl	db6b04d127	Use the footstep volume slider for jump landing sounds (Fixes #1968)	2014-10-04 19:50:38 +02:00
scrawl	95378aa6ac	Fix crash when a magic projectile has no sound defined (Fixes #1967)	2014-10-04 18:37:35 +02:00
Lukasz Gromanowski	e566e4abf2	Issue #1887: Equipped items do not emit sounds ... Added playing of sounds for equipped items (at this moment only for lights). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-04 16:47:29 +02:00
Marc Zinnschlag	be3b229a5f	fixed pathgrid loading	2014-10-04 15:36:52 +02:00
Lukasz Gromanowski	6a89b67cb1	Revert "Issue #1887: Equipped items do not emit sounds" ... This reverts commit 566211e753.	2014-10-04 13:34:36 +02:00
Marc Zinnschlag	cd7cc4bec9	Merge remote-tracking branch 'miroslavr/master'	2014-10-04 09:46:29 +02:00
Lukasz Gromanowski	566211e753	Issue #1887: Equipped items do not emit sounds ... Added playing of sounds for equipped items (at this moment only for lights). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-03 22:39:05 +02:00
MiroslavR	95be7ea738	Revert spelling change to preserve consistency, fix a typo	2014-10-03 22:38:06 +02:00
MiroslavR	4829b1f9cc	Support "right" alignment in books	2014-10-03 22:30:46 +02:00
cc9cii	c9e054cdd7	Merge remote-tracking branch 'remotes/upstream/master' into QtOgre ... This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing changes made to 3aea1bf5f9.	2014-10-04 06:20:10 +10:00
cc9cii	3aea1bf5f9	CMake changes for using Ogre Overlay.	2014-10-04 05:48:56 +10:00
MiroslavR	a13039ad1f	Allow alignment for images in books	2014-10-03 21:36:45 +02:00
MiroslavR	3287d0b6ef	Fix line breaks around IMG tags.	2014-10-03 21:08:52 +02:00
MiroslavR	c5e85ebddc	Merge branch 'master' of github.com:OpenMW/openmw	2014-10-03 21:02:15 +02:00
scrawl	cecc64752e	Increase maximum height for finding spawn points (Fixes #1633, Fixes #1881)	2014-10-03 18:51:18 +02:00
scrawl	d4ac5c0b57	Use a raycast to find spawn point if convexSweepTest doesn't find one (Fixes #1623, Fixes #1679)	2014-10-03 18:49:41 +02:00
scrawl	6fc53e73ad	Don't run AI for knocked-out actors (Fixes #1854)	2014-10-03 15:58:14 +02:00
Marc Zinnschlag	9fd82212b3	Merge remote-tracking branch 'cc9cii/opencs-settings'	2014-10-03 13:11:05 +02:00
scrawl	81a9dc0655	Hotfix for not being able to scroll the world map	2014-10-02 22:44:06 +02:00
cc9cii	115841d31d	Do not save window size on exit.	2014-10-03 05:59:24 +10:00
scrawl	083bcaf483	Fix journal quest logs not being marked finished when there are multiple quest IDs in the log	2014-10-02 19:26:37 +02:00
scrawl	8dc20712de	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-10-02 18:22:39 +02:00
scrawl	58672c6bb5	Fix for crash in main menu when reflections are enabled	2014-10-02 18:12:49 +02:00
Marc Zinnschlag	a166034e12	Merge remote-tracking branch 'jordan-ayers/topic/disease-cleanup'	2014-10-02 17:19:32 +02:00
Marc Zinnschlag	f64964d5dd	Merge remote-tracking branch 'scrawl/master'	2014-10-02 17:04:10 +02:00
scrawl	7d36a202a8	Implement cell loading threshold (Fixes #1874) ... The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border. Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.	2014-10-02 16:50:10 +02:00
scrawl	861cc26aa6	Don't sell racial spells (Fixes #1961)	2014-10-02 16:50:05 +02:00
Marc Zinnschlag	f4c9897bbd	Merge branch 'master' into tables	2014-10-02 15:49:36 +02:00
Marc Zinnschlag	00073694c6	added pathgrid subview	2014-10-02 15:16:19 +02:00
scrawl	cc63f7f051	Fix broken idle camera	2014-10-02 14:23:13 +02:00
scrawl	afbd2de511	Fix broken alchemy magnitude/duration	2014-10-02 13:55:42 +02:00
scrawl	7e10818bdf	Fix uninitialized flags for custom-made spells	2014-10-02 13:55:42 +02:00
scrawl	0bd9f30c67	Remove comment for old MyGUI version	2014-10-02 13:55:42 +02:00
Marc Zinnschlag	d64127106b	load and save pathgrid records	2014-10-02 12:30:15 +02:00
Marc Zinnschlag	ce52735df6	Merge remote-tracking branch 'cc9cii/Bug-No-1750'	2014-10-02 08:43:59 +02:00
Jordan Ayers	3bc91c66e6	Disease Check: Shorten the resistance calculations.	2014-10-01 19:29:03 -05:00
Jordan Ayers	a9a0930b85	Disease check: Reuse corprus check from spells.hpp.	2014-10-01 19:26:25 -05:00
scrawl	1c51694aa9	Don't update physics and animation for actors outside the AI processing distance	2014-10-02 00:27:04 +02:00
scrawl	88da7f5157	Adjust border skin for loading bar and message boxes to match vanilla MW	2014-10-02 00:27:03 +02:00
scrawl	85f5754bb6	Apply third person camera distance to the camera node instead of only the camera itself (Fixes #1705)	2014-10-02 00:26:57 +02:00
cc9cii	517a797a3e	Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.	2014-10-02 07:00:15 +10:00
scrawl	f9b6cc468d	Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action (Fixes #1960)	2014-10-01 17:54:18 +02:00
scrawl	46adf6344a	Adjust third person camera height and default distance to match vanilla MW	2014-10-01 17:45:20 +02:00
cc9cii	5ffb740120	Fix silly mistake (thanks scrawl for picking that up)	2014-10-01 07:19:15 +10:00
scrawl	ee8b85aa2c	Fix priority bug in AiSequence::stack (Fixes #1959)	2014-09-30 22:57:38 +02:00
scrawl	795dfdb557	Fix size_t underflow for journals with 1 page (Fixes #1958)	2014-09-30 18:14:25 +02:00
scrawl	c010c28337	Implement ToggleWorld instruction	2014-09-30 15:54:09 +02:00
Marc Zinnschlag	850a40d4e2	fixed resources table drag source problem	2014-09-30 13:15:15 +02:00
cc9cii	a9745cce1e	Suppress some compiler warnings.	2014-09-30 21:02:31 +10:00
Marc Zinnschlag	ff530a2e19	added missing magic effect table columns	2014-09-30 12:33:48 +02:00
cc9cii	dee090355f	Changes to compile on Ubuntu 14.04.	2014-09-30 19:23:19 +10:00
cc9cii	687b62dfd3	Revert some changes (mostly iostream adds)	2014-09-30 18:46:26 +10:00
Jordan Ayers	da9d858201	Add 'const' to a spell helper function.	2014-09-29 20:59:10 -05:00
cc9cii	312b7cd571	Merge branch 'master' into QtOGre ... Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp components/nif/niffile.hpp libs/openengine/bullet/physic.hpp	2014-09-30 10:52:04 +10:00
scrawl	3e153d0a9b	Optimize actor physics: Use only one convexSweepTest for stepping down and checking onGround status, instead of 2	2014-09-29 22:30:21 +02:00
scrawl	b345c50a86	Run stepSimulation before moving actors ... Shouldn't make too much of a difference, but a nice side effect is seeing the convexSweepTest calls for actor movements in the profiler results.	2014-09-29 14:55:31 +02:00
scrawl	7f18f85a1d	Forgot const	2014-09-29 12:04:19 +02:00
cc9cii	7675df60ba	Fix far clip distance (again), workaround for broken settings minimum value.	2014-09-29 08:17:51 +10:00
cc9cii	54c77cf875	Silence clang warnings.	2014-09-29 06:39:44 +10:00
cc9cii	f0c739b763	Apply camera setting changes immediately. Remove current value check for shader setting changes.	2014-09-29 06:27:54 +10:00
scrawl	bdab3fa321	Bullet optimization: Don't update AABBs of static objects every frame	2014-09-28 18:02:57 +02:00
scrawl	ff0b4e0583	Add debug window (F10), displays Bullet's profiler output	2014-09-28 18:02:49 +02:00
scrawl	7c52d05f85	Disable topics list visually when in a choice	2014-09-28 14:00:15 +02:00
scrawl	e9ed0211c9	Attempt to fix Clang warnings	2014-09-28 12:44:47 +02:00
scrawl	58571f7ac2	Revert "Transfer item ownership to the buyer if item wasn't stolen" ... Fixes #1953. This reverts commit 5d77c5e8ca.	2014-09-28 12:18:46 +02:00
cc9cii	6e8977348a	Check the FSAA setting of windows rather than system value.	2014-09-28 19:43:26 +10:00
cc9cii	303b0ee8c6	Update scenewidget when antialiasing settings change.	2014-09-28 15:43:33 +10:00
cc9cii	8a0ff17c22	Update SceneWidget when relevant user settings change.	2014-09-28 14:08:14 +10:00
cc9cii	9902e08773	Apply sh::Factory settings immediately.	2014-09-28 11:05:27 +10:00
cc9cii	a25cffc242	Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.	2014-09-28 10:17:54 +10:00
scrawl	02dec787fd	Cache GMSTs in getDerivedDisposition	2014-09-27 22:44:20 +02:00
scrawl	ea956b537c	Don't search for fFatigueReturnBase and fFatigueReturnMult every frame	2014-09-27 22:37:53 +02:00
MiroslavR	508113f271	Resolve merge conflict	2014-09-27 17:50:17 +02:00
MiroslavR	1c4e52a0e5	Book formatter: Fix an excessive line break case	2014-09-27 17:35:57 +02:00
cc9cii	d790b8edfa	Revert old fix.	2014-09-27 23:39:22 +10:00
cc9cii	a2d043f43a	Re-check unknown record id after loading.	2014-09-27 23:36:27 +10:00
MiroslavR	cb5f661596	Book formatter: Support FONT closing tag, minor code cleanup	2014-09-27 13:31:59 +02:00
Marc Zinnschlag	e47f9c7268	added first batch of magic effect columns (re-using existing columns)	2014-09-27 12:51:46 +02:00
Marc Zinnschlag	aa89370db6	make sure magic effects added by expansions are available	2014-09-27 12:38:42 +02:00
Marc Zinnschlag	25a1112627	add magic effect records for newly created games	2014-09-27 12:26:25 +02:00
cc9cii	810ba61909	While loading overwrite records with the same id. Should resolve bug #1750.	2014-09-27 17:46:48 +10:00
scrawl	e868a48a63	Don't trigger OnPcHitMe for friendly hits (Fixes #1950) ... Don't consider actors as followers if they are also in combat with the follow target	2014-09-26 22:08:07 +02:00
scrawl	7252cb63a6	Fix cppcheck issues	2014-09-26 17:48:14 +02:00
scrawl	790e0150b1	Fix global map markers being duplicated when cell is visited again	2014-09-26 16:51:48 +02:00
scrawl	18be152ab1	Allow dragging map even when a marker is hovered	2014-09-26 14:27:52 +02:00
scrawl	603e558fb7	Fix broken getCollidingPc / getCollidingActor (cppcheck)	2014-09-26 14:16:46 +02:00
scrawl	97df7c9b22	Get rid of markers.png and use original MW texture, cleanup	2014-09-26 13:40:10 +02:00
Marc Zinnschlag	23fd314294	added magic effects table	2014-09-26 13:12:17 +02:00
Marc Zinnschlag	c321f2c252	load and save magic effect records	2014-09-26 13:05:51 +02:00
scrawl	4f0fc79ea4	Change global map cell size from 24 to 18 and make it configurable	2014-09-26 12:47:33 +02:00
cc9cii	8e71f092c5	Comment out setMinimum which is broken.	2014-09-26 12:36:55 +10:00
cc9cii	a1c0ec2feb	Repair collateral damage from a purging session gone out of control.	2014-09-26 11:26:33 +10:00
cc9cii	111a35bc38	More strip back.	2014-09-26 07:16:34 +10:00
scrawl	0bc840aadd	Add NumericEditBox widget	2014-09-25 21:04:51 +02:00
scrawl	f56711f443	Fix crash caused by teleportation spells (Fixes #1904)	2014-09-25 18:14:04 +02:00
scrawl	8ad2b95208	Revert "AiFollow: return from execute() if target is not player" ... This reverts commit 061c7813f6. Fixes #1898.	2014-09-25 17:57:10 +02:00
scrawl	40ce5add59	Don't report crime for attacking an NPC that is already in combat with another NPC (Fixes #1908, Fixes #1821)	2014-09-25 17:33:26 +02:00
scrawl	6b65502557	Add properties for new widget classes to MyGUI plugin	2014-09-25 16:25:08 +02:00
scrawl	2066097202	Fix incorrect reading of global map state in some cases when the map size changed (Fixes #1946)	2014-09-25 15:28:02 +02:00
scrawl	40587f984d	Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd ... Correct barter formula (removed erroneous clamping)	2014-09-25 13:02:42 +02:00
Marc Zinnschlag	33cd04b37d	added missing sound gen table columns	2014-09-25 11:40:45 +02:00
cc9cii	d5c8ff7d73	More removal.	2014-09-25 18:15:34 +10:00
cc9cii	127f9bb30d	Fix reverting to wrong version.	2014-09-25 09:16:10 +10:00
cc9cii	61bab6b1f1	Sanitised version. Some settings are only accessible via manually editing the config file.	2014-09-25 08:15:07 +10:00
scrawl	1afcc7adb5	Add imported font colors from openmw.cfg to MyGUI plugin	2014-09-25 00:04:38 +02:00
scrawl	62ab35881e	Don't advance skills in werewolf mode (thanks Hrnchamd)	2014-09-25 00:03:55 +02:00
scrawl	088d01d727	Minor cleanup	2014-09-24 23:50:28 +02:00
cc9cii	31fb160376	More cleanup.	2014-09-25 06:59:04 +10:00
cc9cii	66852d5392	Code cleanup and revert incorrect settings.	2014-09-24 22:41:49 +10:00
scrawl	0f99a959eb	Update barter offer for all items when another item is added (Fixes #1935)	2014-09-24 12:21:19 +02:00
scrawl	a7c0e07d78	Add missing World cleanup for mLevitationEnabled	2014-09-24 12:21:19 +02:00
scrawl	5d77c5e8ca	Transfer item ownership to the buyer if item wasn't stolen (Fixes #1933)	2014-09-24 12:21:19 +02:00
scrawl	45b4304237	Store levitation/teleport enabled state in savegames (Fixes #1923)	2014-09-24 12:21:19 +02:00
cc9cii	fdf375fb4d	Reusing subviews implemented.	2014-09-24 13:49:19 +10:00
cc9cii	3f9b73812b	Minor fixes and workarounds.	2014-09-24 11:55:22 +10:00
cc9cii	970f3609c9	Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.	2014-09-24 09:33:19 +10:00
cc9cii	67503c93b2	Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.	2014-09-23 22:33:49 +10:00
Marc Zinnschlag	175d4f3d44	Merge remote-tracking branch 'ragora/playdeathlevelupmusic'	2014-09-23 13:30:50 +02:00
Marc Zinnschlag	56858c98b1	Merge remote-tracking branch 'miroslavr/master'	2014-09-23 13:23:00 +02:00
Marc Zinnschlag	7ab4881661	added sound gen table	2014-09-23 13:21:54 +02:00
cc9cii	d41230a0c5	Tweak the look of the recordfilterbox. Keep titlebar if floating.	2014-09-23 20:51:14 +10:00
Marc Zinnschlag	02247fe712	load and save sound gen records	2014-09-23 12:20:02 +02:00
Ragora	06e683d378	Added code to play music on level up and on death	2014-09-23 04:58:19 -04:00
cc9cii	ffae816aab	Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.	2014-09-23 17:01:08 +10:00
cc9cii	62406d5322	Use reasonable values for the spinbox.	2014-09-23 07:28:55 +10:00
MiroslavR	22c71cec18	Check for text size	2014-09-22 23:17:44 +02:00
cc9cii	437fb774c5	Re-implemented subview minimum size setting.	2014-09-23 07:16:07 +10:00
cc9cii	c8ae8f4a6d	Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.	2014-09-23 06:30:41 +10:00
MiroslavR	608e1518a5	Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2	2014-09-22 21:47:21 +02:00
MiroslavR	f87d7c3fce	Book formatter: Do not insert last page if it's empty, code cleanup	2014-09-22 21:25:41 +02:00
MiroslavR	4b1df64fba	Book parser: Fix comparison between signed and unsigned integer expressions	2014-09-22 16:28:17 +02:00
cc9cii	c4f11785ec	Added a window size change easter egg.	2014-09-22 21:12:26 +10:00
cc9cii	48f96df29d	Fixed checkboxes saving invalid values.	2014-09-22 18:50:48 +10:00
Marc Zinnschlag	aa7fc8ee47	fix for potential script problem during saved game loading	2014-09-22 10:12:07 +02:00
Marc Zinnschlag	5c8ef842b6	Merge branch 'edit'	2014-09-22 09:54:44 +02:00
Marc Zinnschlag	51151bc43e	minor fix	2014-09-22 09:53:07 +02:00
cc9cii	fc8d6da6a2	Added more shader settings.	2014-09-22 16:24:06 +10:00
cc9cii	71a3880884	Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.	2014-09-22 12:19:18 +10:00
cc9cii	02f8f54192	Fixed checkbox behaviour. Added some shader settings.	2014-09-22 07:50:35 +10:00
MiroslavR	51cd2678ae	Book formatter: Fix last block of text not displaying	2014-09-21 22:25:54 +02:00
Lukasz Gromanowski	c72369fafe	Simplified casting when comparing to AV_NOPTS_VALUE. ... AV_NOPTS_VALUE is casted to int64_t when compared with pts, so with libavc >= 56.1 it should be no-op because in that version it's already signed int. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-09-21 20:11:03 +02:00
MiroslavR	c362ec0f95	Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup	2014-09-21 19:47:52 +02:00
Marc Zinnschlag	3cd717cd47	Merge remote-tracking branch 'lgro/videoplayer'	2014-09-21 19:04:15 +02:00
Lukasz Gromanowski	b40c1ff26c	Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder. ... Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1; Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-09-21 16:23:05 +02:00
Lukasz Gromanowski	7ad6a94523	Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder. ... Added ifdefs because changes in API were introduced in libavc 56.1 and this code doesn't compile with older versions (ie. on Ubuntu, or Debian) Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-09-21 16:13:54 +02:00
Lukasz Gromanowski	f5589b42ea	Fix for compiler warnings and deprecated functions usage in videoplayer. ... Added ifdefs because changes in API were introduced in libavc 56.1 and this code doesn't compile with older versions (ie. on Ubuntu, or Debian). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-09-21 16:09:16 +02:00
cc9cii	17a74da650	Cleaned up comments and dead code.	2014-09-21 21:10:18 +10:00
Lukasz Gromanowski	d77546b7dc	Fix for compiler warnings and deprecated functions usage in videoplayer. ... Deprecated functions were: - AVCodecContext::get_buffer - AVCodecContext::release_buffer Changed to: AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1 before call to avcodec_open2(). release_buffer usage was removed. Also changed places when some fileds were compared to AV_NOPTS_VALUE - it's signed, so removed unsigned int casting, or changed casting to signed int. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-09-21 12:58:11 +02:00
cc9cii	dbd1ab05d3	Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.	2014-09-21 20:55:52 +10:00
Marc Zinnschlag	e4b6f135b6	catch exceptions from adding local scripts	2014-09-21 12:43:19 +02:00
Marc Zinnschlag	89beecad8c	Merge remote-tracking branch 'scrawl/master'	2014-09-21 12:24:53 +02:00
scrawl	fb26c2c2de	Fix autocalculated NPCs not having health/magicka/fatigue set correctly (Fixes #1943)	2014-09-21 11:39:17 +02:00
scrawl	b1e74e2a85	Remove support for Ogre 1.8 versions	2014-09-21 10:41:13 +02:00
Lukasz Gromanowski	6987dd768a	Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-09-21 09:52:31 +02:00
scrawl	3ac04060c1	Fix NPCs being able to practice Block skill	2014-09-20 16:17:09 +02:00
Marc Zinnschlag	cf5c5cbce7	Merge remote-tracking branch 'corristo/osx-openmw-launch-fix'	2014-09-20 14:13:42 +02:00
Marc Zinnschlag	9d316a8745	Merge branch 'records'	2014-09-20 13:59:45 +02:00
scrawl	023d7072f9	Don't play battle music for enemies out of AI processing range	2014-09-20 13:55:57 +02:00
scrawl	d3554084ad	Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file	2014-09-20 13:50:23 +02:00
Marc Zinnschlag	8499ceb35d	set default value for topic when cloning info records	2014-09-20 13:30:36 +02:00
scrawl	f5868f7ae1	Fix layout problems in generate class result dialog	2014-09-20 13:07:38 +02:00
Marc Zinnschlag	8ce87803c4	set default value for cell when cloning references	2014-09-20 12:54:25 +02:00
Marc Zinnschlag	b39cdb7645	fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)	2014-09-20 12:48:51 +02:00
Marc Zinnschlag	90ad3f332a	extending refnum functionality to cloning (and also enable cloning of references to a different cell)	2014-09-20 12:37:25 +02:00
Nikolay Kasyanov	9f7a8462d8	Fix build & OpenCS game runner code on OS X	2014-09-20 13:42:11 +04:00
scrawl	e42cb8020e	Change all skins to get font colors from fallback settings (Fixes #704)	2014-09-20 10:40:09 +02:00
Marc Zinnschlag	7733df239e	made CloneCommand a subclass of CreateCommand	2014-09-20 10:36:43 +02:00
scrawl	25e96b8c7b	InteractiveMessageBox: Define a maximum width for the message text	2014-09-20 08:57:16 +02:00
MiroslavR	84d27d55e2	Remove redundant includes	2014-09-20 00:51:46 +02:00
MiroslavR	4f89c3e77a	Rework book formatter (Fixes #1148)	2014-09-20 00:11:04 +02:00
Marc Zinnschlag	65ddf7acfe	Merge remote-tracking branch 'scrawl/master'	2014-09-19 15:59:59 +02:00
Marc Zinnschlag	bc1eaa035d	Merge remote-tracking branch 'scrawl/fontcolors'	2014-09-19 15:59:10 +02:00
Marc Zinnschlag	2a48c377a8	Merge remote-tracking branch 'miroslavr/master'	2014-09-19 15:55:24 +02:00
scrawl	9c0649c11d	Add basic framework to retrieve font colors from fallback settings (Feature #704)	2014-09-19 11:53:35 +02:00
scrawl	cbc242d857	Move item count text to ItemWidget	2014-09-19 09:29:00 +02:00
scrawl	b145d183ae	Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration (Fixes #1922)	2014-09-19 09:11:21 +02:00
scrawl	ab9d9c7001	Add magic effect flags from ESM files to esmtool	2014-09-19 08:09:40 +02:00
scrawl	8a3a3baed4	Tweak AiEscort maximum distances	2014-09-19 05:47:45 +02:00
scrawl	b6c6bfe943	Merge cell names when merging cells (Fixes #1929)	2014-09-19 05:02:54 +02:00
cc9cii	5dfcd2ed01	Removed standard window size combobox. Rearranged widgets.	2014-09-19 08:29:06 +10:00
scrawl	b39fe85a51	Implement fPCbaseMagickaMult and fNPCbaseMagickaMult	2014-09-18 14:56:43 +02:00
cc9cii	52354b14fc	Fixed compilation issue on linux. Updated shader mode selection logic (thanks scrawl). Cleaned up a little but needs more once things are settled.	2014-09-18 22:17:37 +10:00
Marc Zinnschlag	3add4bdf35	rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)	2014-09-18 13:41:29 +02:00
Marc Zinnschlag	6fbffdb98f	fixed reference creator error handling	2014-09-18 12:39:29 +02:00
Marc Zinnschlag	e93ab383ea	set refnum and increment refnum counter when creating a new reference	2014-09-18 12:25:17 +02:00
Marc Zinnschlag	33243c8c16	move code for storing old value from ModifyCommand constructor to redo function (allows use of the command on records that haven't been created at the time of construction)	2014-09-18 11:37:23 +02:00
Marc Zinnschlag	144f6ca79a	Merge remote-tracking branch 'scrawl/master'	2014-09-18 09:22:33 +02:00
cc9cii	575780ec0d	Display format settings working.	2014-09-18 17:13:53 +10:00
cc9cii	d9b0c81299	Show status bar setting working (feature #854). Turns out signals were not needed, may need to clean up later.	2014-09-18 16:05:32 +10:00
Stanislav	313bdf4e78	fix	2014-09-18 10:25:33 +06:00
scrawl	c05874e1ff	Reset CreatureLevList spawning flag if levelled list returned no creature	2014-09-18 06:06:20 +02:00
scrawl	c19f89976e	Add missing Hit voice dialogue for friendly hits	2014-09-18 05:13:17 +02:00
scrawl	54dac1460c	Run global scripts after running local scripts ... Turns out to be a compatibility problem with Calvus Horatius contract scripts. The local script needs to be run first, otherwise the cleanup when he quits as result of negative profit does not work properly.	2014-09-18 04:33:49 +02:00
scrawl	08499ea51f	Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit	2014-09-18 04:26:12 +02:00
cc9cii	86636bd960	Mouse events to disabled objects implemented via a signal filter.	2014-09-18 12:23:41 +10:00
scrawl	ac97a0f99d	Fix dialogue choices being displayed in incorrect order	2014-09-18 04:10:17 +02:00
scrawl	be7839873a	Don't trigger dynamic stats recalculation when setting up actor initial stats (Fixes #1927) ... This caused the magicka value set in the CS to be ignored completely, so flame atronachs were spawning with 50 magicka instead of 105.	2014-09-18 03:47:45 +02:00
scrawl	447e93bdb4	Use SpellCast animation for creatures that have it (flame atronach)	2014-09-18 03:24:47 +02:00
scrawl	07cd647e75	Fix broken AI for creatures with OnTarget spells (Bug #1927)	2014-09-18 03:19:13 +02:00
cc9cii	62d2811285	Window size improvements. Added promoted widgets but seems to be require signal filters for disabled widgets to receive mouse events.	2014-09-18 07:52:54 +10:00
scrawl	09042ba6d9	Use object name instead of ID when available for tooltips	2014-09-17 13:03:12 +02:00
U-NSFW-50TH\cc9c	ca80a2b856	Merge remote-tracking branch 'upstream/master' into opencs-settings	2014-09-17 21:00:22 +10:00
scrawl	2eaceb71ba	Reject AiTravel destinations further than 7168 units away, as in vanilla MW (Fixes #1911)	2014-09-17 12:39:10 +02:00
Marc Zinnschlag	41275b0af3	Merge remote-tracking branch 'cc9cii/Bug-No-1869'	2014-09-17 09:20:59 +02:00
Marc Zinnschlag	b9973c4515	Merge remote-tracking branch 'scrawl/master'	2014-09-17 09:18:36 +02:00
cc9cii	9dc4af69c6	Got window size to work correctly. Started to incorporate parts of previous settings implementation where possible.	2014-09-17 17:13:21 +10:00
scrawl	441073b475	Remove ancient comment	2014-09-17 07:02:19 +02:00
scrawl	3ce3f31452	Adjust turning animation speed multiplier based on turning speed	2014-09-17 07:02:19 +02:00
scrawl	6debd21ec6	Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep	2014-09-17 07:02:19 +02:00
scrawl	269c200c8f	Fix jump velocity mechanics (Fixes #1708)	2014-09-17 07:02:19 +02:00
scrawl	b6a89c7845	Fix idlestorm animation conflict with torch animation	2014-09-17 07:02:19 +02:00
scrawl	4c285151a3	Fix incorrect movement animation for some creatures (Fixes #1924)	2014-09-17 07:02:10 +02:00
Stanislav	ebb223b2d3	Feature #1226: fixes	2014-09-17 09:03:02 +06:00
cc9cii	cb15750e40	Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.	2014-09-17 06:29:11 +10:00
cc9cii	e3da37567b	Cleaned up and got some signals going.	2014-09-17 06:11:41 +10:00
Marc Zinnschlag	70275350de	rewrote command generation in GenericCreator	2014-09-16 13:28:11 +02:00