mirror/openmw-tes3mp

mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 12:45:33 +00:00

Author	SHA1	Message	Date
scrawl	ee2b81763e	Savegame: Store AiSettings and summoned creatures CreatureStats state is now completely stored (Closes #1174) Also play VFX_Summon_Start and VFX_Summon_End visual effects.	2014-06-15 21:19:37 +02:00
scrawl	a0f9a6718f	Disable fProjectileThrownStoreChance when shooting at player (Fixes #1490 )	2014-06-15 16:11:22 +02:00
scrawl	fd59a4a79e	Fix some doxygen typos	2014-06-15 16:11:22 +02:00
scrawl	77388fe2ce	Implement BetaComment instruction (dumps reference info)	2014-06-15 16:11:16 +02:00
scrawl	326c747508	Don't run scripts when in pause menu (Fixes #1495 )	2014-06-15 14:18:16 +02:00
scrawl	9e6d21d95b	Clear message boxes in windowmanager cleanup (Fixes #1496 )	2014-06-15 14:18:16 +02:00
scrawl	e288437885	Disable all other animations on death (Fixes #1483 )	2014-06-15 14:18:16 +02:00
scrawl	1adb81abd0	Sort using ciLess, not ciEqual	2014-06-15 14:18:16 +02:00
scrawl	88f8f25ffa	Don't allow scripted dialogue with dead actors (Fixes #1493 )	2014-06-15 14:18:16 +02:00
scrawl	8d8015ce18	Remove a squareroot in pathfinding	2014-06-15 14:18:16 +02:00
scrawl	afbd5162ee	Move AiWander arrival check to time-critical section	2014-06-15 14:18:16 +02:00
scrawl	7afd2ca614	Consider moved references in CellStore::listRefs	2014-06-15 14:18:16 +02:00
scrawl	31a4e10c6f	Fix incorrect trigger of change flag for static doors	2014-06-15 14:18:16 +02:00
scrawl	395f98e476	Fix triggering changed flag for all references when cell is visited The InsertFunctor for cells was calling localRotateObject() for all references which set the mChanged flag in RefData to true. Also clean up RefData interface slightly.	2014-06-15 14:18:16 +02:00
scrawl	b20f8cc04f	Don't clear AiSequence if there are no saved packages (eg for old savegames)	2014-06-15 14:18:16 +02:00
Marc Zinnschlag	01c90a3434	Merge remote-tracking branch 'mrcheko/master'	2014-06-15 14:12:38 +02:00
mrcheko	a6ee4272aa	fix bug when you were able to kill somebody from large distance without being spotted	2014-06-15 00:14:18 +04:00
mrcheko	6da061fd96	fix http://bugs.openmw.org/issues/1340 Did I understand right that guards trigger combat after refusing pay gold/go to jail via script?	2014-06-14 23:36:57 +04:00
Alexander "Ace" Olofsson	c24e08dff6	Use Ogre::Math::PI	2014-06-14 14:43:24 +02:00
Alexander "Ace" Olofsson	6ea29812ac	Another way of getting M_PI	2014-06-14 13:54:01 +02:00
Alexander "Ace" Olofsson	dc2fefffc7	Fix missing M_PI define on Windows	2014-06-14 13:29:55 +02:00
scrawl	832f1a4857	Fix merge mistake	2014-06-14 02:31:01 +02:00
scrawl	0637cde267	Bug #1417 : Make sure to reset all position/rotation fields when placing items	2014-06-13 23:40:49 +02:00
scrawl	ad3a78706e	Bug #1417 : Use fmod to wrap local rotations (more efficient and robust)	2014-06-13 23:40:35 +02:00
scrawl	54d8606b78	Fix logging fatal exceptions to cerr, and log them to openmw.log	2014-06-13 22:04:20 +02:00
mrcheko	9d40f2e196	Merge remote-tracking branch 'origin/master'	2014-06-13 23:23:25 +04:00
mrcheko	c4e5872620	fix bug http://bugs.openmw.org/issues/1470	2014-06-13 23:22:00 +04:00
scrawl	3334078d4d	Add first person meshes to refraction render (Fixes #1481 )	2014-06-13 21:14:17 +02:00
scrawl	fe5bbfce3c	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwmechanics/aicombat.cpp	2014-06-13 19:31:33 +02:00
scrawl	8114f48469	Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame.	2014-06-13 19:06:09 +02:00
mrcheko	fc6366fb27	Merge remote-tracking branch 'upstream/master' Equipping_Weapon check isn't needed cause there won't be WeapType_None in that case Conflicts: apps/openmw/mwmechanics/character.cpp	2014-06-13 14:12:41 +04:00
scrawl	e458cf1df2	Savegame: Store death counter (Fixes #1477 )	2014-06-13 02:26:53 +02:00
scrawl	797134aa51	Handle activation scripts in AiActivate (Fixes #1478 )	2014-06-13 02:26:52 +02:00
scrawl	a54ac579a5	Savegame: Store AiSequence	2014-06-13 02:26:52 +02:00
scrawl	be6f1fe4fe	Fix a sign error	2014-06-13 02:26:52 +02:00
scrawl	91ed5183c8	Show base item value in tooltip, not real value (Fixes #1469 )	2014-06-13 02:26:52 +02:00
scrawl	604d5ac000	Fix console reference label not resetting when loading save	2014-06-13 02:26:52 +02:00
mrcheko	df7213185f	warning fixes	2014-06-12 23:42:33 +04:00
Marc Zinnschlag	2eebb0bf73	Merge remote-tracking branch 'scrawl/master'	2014-06-12 12:54:39 +02:00
Marc Zinnschlag	82eb13c070	Merge remote-tracking branch 'cc9cii/master'	2014-06-12 12:46:04 +02:00
cc9cii	37f0c253f6	For compiling with MSVC 2012	2014-06-12 07:04:57 +10:00
scrawl	68d6b6b2f3	Cell merge fix (reference context position was not saved correctly)	2014-06-11 21:56:10 +02:00
scrawl	41ab7329a8	Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202 Note: breaks compatibility with input.xml, so the filename was changed.	2014-06-11 19:47:42 +02:00
scrawl	013916fca3	Fix for broken physics in exteriors (Fixes #1446 ) The wrong function was being used to check the distance between old and new positions. It took the length of the vectors into account, which makes no sense for positions. The issue was only observed in exteriors, since most interiors are relatively close to the origin.	2014-06-11 19:01:23 +02:00
scrawl	d970cc06d7	Don't play the same music track twice in a row (Fixes #746 )	2014-06-11 18:11:16 +02:00
scrawl	d60df66811	Change openmw.log to boost ofstream to fix unicode path on windows (see https://github.com/OpenMW/openmw/pull/108 )	2014-06-11 16:56:41 +02:00
scrawl	73be457805	Merge ESM::Cell fields by subrecord Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord. Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (oldcell = cell;)	2014-06-11 16:13:33 +02:00
Marc Zinnschlag	c23e9e03fd	Merge branch 'refs'	2014-06-11 11:44:43 +02:00
Marc Zinnschlag	7d1ecea20c	added extended versions of revert and delete	2014-06-11 11:43:38 +02:00
Marc Zinnschlag	2faeceacfa	Merge remote-tracking branch 'scrawl/master' Conflicts: apps/openmw/main.cpp	2014-06-11 08:51:18 +02:00
scrawl	0f31e31088	Allow opening journal during dialogue (Fixes #1460 )	2014-06-11 03:08:22 +02:00
scrawl	14a9f0ebf8	Handle Quadratic and Linear attenuation independently (Fixes #1456 )	2014-06-11 02:24:17 +02:00
Emanuel Guevel	a41339da1e	Write logs in log directory The crash.log file was created in the working directory, requiring users that had installed the game to run it with augmented privileges to be able to create the file.	2014-06-10 23:46:49 +02:00
mrcheko	d6d9df6cec	split getStartTime	2014-06-11 00:20:46 +04:00
scrawl	07d20c212b	Fix crash activating quick key 1	2014-06-10 21:34:47 +02:00
scrawl	10758d6297	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwinput/inputmanagerimp.cpp	2014-06-10 19:32:49 +02:00
scrawl	7b5482f25b	Fix character selection caption when there is no character in settings.cfg	2014-06-10 19:01:18 +02:00
scrawl	5a955279bb	Fix main menu background showing when resizing window during load	2014-06-10 18:49:42 +02:00
scrawl	3788fb042e	Implement MenuTest script instruction (Fixes #1454 )	2014-06-10 18:49:42 +02:00
scrawl	6ba112619a	Fix dropped items ending up inaccessible when standing in objects with no collision (Fixes #1441 )	2014-06-10 18:49:42 +02:00
scrawl	2dd54dbcfc	Implement ClearInfoActor script instruction (Fixes #1422 )	2014-06-10 18:49:41 +02:00
scrawl	a90245147b	Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor (Fixes #1423 )	2014-06-10 18:46:16 +02:00
scrawl	1ed3f092c1	Implement text replacement for journal topic responses (Fixes #1429 )	2014-06-10 15:42:50 +02:00
scrawl	3bf599248e	CMake cleanup: Remove distribution-specific install stuff (unused)	2014-06-10 15:03:27 +02:00
scrawl	4119038f1d	Remove an old workaround (Fixes #1458 )	2014-06-10 14:46:44 +02:00
mrcheko	979128b2c5	Combat music; some minor combat fixes	2014-06-10 14:20:29 +04:00
scrawl	65d5311037	Revert "Don't try to show exceptions in a message box if SDL was not initialized" According to SDL docs, "This function may be called at any time, even before SDL_Init()". Also fixes an issue where message boxes weren't working due to SDL_Quit already having been called by ~Engine. This reverts commit `39eea24dc3`. Conflicts: apps/openmw/main.cpp	2014-06-10 04:10:34 +02:00
scrawl	c0c1db4490	Don't list non-usable items in QuickKeysMenu selection (Fixes #1427 )	2014-06-10 03:28:21 +02:00
scrawl	271aac3fcc	Savegame dialog: Grey out buttons if no save is selected	2014-06-10 02:47:02 +02:00
scrawl	311acfa8ff	Add delete button to save load menu (Fixes #1453 )	2014-06-10 02:27:38 +02:00
scrawl	881ae33b74	Don't allow Creatures with no movement abilities to move (Fixes #1457 )	2014-06-10 02:15:09 +02:00
scrawl	e0d6670ac4	Move video skip detection to WindowManager Fixes a bug where skipping using Esc would not work if a mouse button had been pressed previously	2014-06-10 01:57:54 +02:00
scrawl	7721e54191	Use descriptive names for save files and character folders (Fixes #1449 )	2014-06-10 00:22:00 +02:00
scrawl	e796fa2313	Add another french morrowind font workaround (Fixes #1447 )	2014-06-09 22:18:53 +02:00
mrcheko	698cbba6ef	old bug + comment fix	2014-06-09 23:02:06 +04:00
mrcheko	08e8dab067	merge openmw master	2014-06-09 22:37:49 +04:00
scrawl	1bab74a98d	Fix punishment for stealing 0 value items (Fixes #1435 )	2014-06-09 03:42:29 +02:00
scrawl	5488fe1ab3	Change npc training skills to prefer skills with lowest ID if skill values are the same (Fixes #1445 )	2014-06-09 03:40:14 +02:00
scrawl	a3752da79f	Store Always Run control state in settings	2014-06-08 19:50:39 +02:00
mrcheko	67abc60264	aiming to moving target in ranged combat ai 1) Taking into account target move vector and speed. However aiming is not ideal, since attack strength can't be controlled directly. I did achieve almost 100% accuracy updating it everyframe but then thought it would be unfair, cause AI should mimic human targetting. 2) Also added in this commit func to measure real attack durations for weapon.	2014-06-08 20:59:26 +04:00
Marc Zinnschlag	48468b7d0c	some dialogue subview cleanup and start of command dispatching refactoring	2014-06-08 14:10:08 +02:00
Marc Zinnschlag	b717e3fcb8	Merge remote-tracking branch 'filkry/bug1196jumpdialog'	2014-06-08 11:25:34 +02:00
scrawl	d2dca27067	Correct wrong assertions (Fixes #1425 )	2014-06-08 11:25:10 +02:00
scrawl	b9dadff5a3	Recognize DELE subrecords at the end of the record (Fixes #1414 )	2014-06-08 11:22:37 +02:00
scrawl	823ccb1b3d	Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386 )	2014-06-08 11:22:37 +02:00
scrawl	69855097ca	Fix an always true condition (Bug #1355 )	2014-06-08 11:22:37 +02:00
scrawl	b470596206	Handle failed savegame file operations (Fixes #1413 )	2014-06-08 11:22:37 +02:00
scrawl	2ec324c80b	Consider all splash screens in the Splash folder (Fixes #1416 )	2014-06-08 11:22:37 +02:00
scrawl	927ae00454	Fix code that stopped animation immediately after starting it, due to thinking it has completed (Fixes #1370 )	2014-06-08 11:22:37 +02:00
slothlife	51c45796b1	Fix physics to not trigger Bullet assert in Debug When physics attempts to move by a very small amount, precision losses caused Bullet to trigger an assert in debug from normalizing a zero length vector.	2014-06-07 19:26:12 -05:00
Fil Krynicki	cd693b6d37	Fixed mouse closing containers, and injection/gui test order Called setEnabled on channels now effects whether those channels notify listeners, rather than whether they register changes to their controls. This was making channels get stuck on "1" when the GUI was activated. Also ensured GUI activity can invalidate player controls even if that activity is closing the GUI, by re-ordering a check. And fixed a comment.	2014-06-07 20:08:29 -04:00
Marc Zinnschlag	7ede6573eb	removed more hardcoded column numbers	2014-06-07 14:39:34 +02:00
Marc Zinnschlag	302e2f8e9a	fixed some proxy model problems related to column numbers	2014-06-07 14:32:12 +02:00
Marc Zinnschlag	e4a37ef709	removed some hardcoded column numbers	2014-06-07 13:06:19 +02:00
Marc Zinnschlag	85fca19fd9	replaced selection model in CommandDispatcher with a slightly slower but more robust implementation	2014-06-07 13:02:45 +02:00
Fil Krynicki	1d3a220d94	Added A_Use command to player controls.	2014-06-06 22:35:16 -04:00
Fil Krynicki	97caa1f8a4	Alternative fix strategy by checking for binding state	2014-06-06 22:25:23 -04:00
Marc Zinnschlag	f6ae967ba0	simplified Data constructor	2014-06-06 20:47:31 +02:00
Marc Zinnschlag	0668019c86	Merge remote-tracking branch 'scrawl/master'	2014-06-06 19:09:24 +02:00
scrawl	58d963d6e6	Fix warning	2014-06-06 18:43:30 +02:00
scrawl	b68a8e38cd	Remove unused map	2014-06-06 15:24:06 +02:00
scrawl	54a5dba3f5	Don't reserve Pauldron parts for robes (Fixes #1396 )	2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn	01283f531e	Fix for Bug #1409	2014-06-06 15:13:25 +02:00
scrawl	9627146bf4	Another fix for trade exploit (hopefully the last: Fixes #1408 )	2014-06-06 15:08:44 +02:00
Marc Zinnschlag	c6557e1ade	some UniversalId cleanup and enhancements	2014-06-06 14:25:06 +02:00
scrawl	f3cece8dec	Fix alchemy allowing same item ID in different slots (Fixes #1407 )	2014-06-06 14:12:50 +02:00
Marc Zinnschlag	3e0c6ec732	some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have	2014-06-06 13:09:17 +02:00
Marc Zinnschlag	83d5f2aaeb	factored out command creation from table view into a separate class	2014-06-06 12:43:21 +02:00
scrawl	40d6c8abf7	Remove horizontal messagebox layout, not used in vanilla (Fixes #1402 )	2014-06-06 02:24:51 +02:00
scrawl	d442853b3e	Allow opposite gender's parts as fallback (Fixes #1404 )	2014-06-06 01:30:23 +02:00
scrawl	c36decb855	Fix being able to place items on top of actors (Fixes #1403 )	2014-06-06 00:43:24 +02:00
scrawl	3d103f3785	Don't block hits when in hand-to-hand combat (shield not visible)	2014-06-05 22:27:46 +02:00
scrawl	0063b63ae4	Don't use armor mitigation for fall damage	2014-06-05 22:23:57 +02:00
scrawl	6db936bb3a	Refactor item icon code into ItemWidget (Fixes #1391 ) - Removed duplicate code - Fixed missing magic backgrounds during item drag&drop - Change background texture used for HUD icons	2014-06-05 22:13:18 +02:00
scrawl	f53e86cad9	Fix AiCombat being incorrectly added to player (Fixes #1356 )	2014-06-05 21:51:57 +02:00
scrawl	1173957e56	Fix item weight displaying as 1e+3 for Stendarr's Hammer	2014-06-05 18:15:48 +02:00
scrawl	17f8b49db6	Add missing padding for item tooltip magic effects	2014-06-05 17:51:15 +02:00
scrawl	d2e98c4de1	Fix forced switch to third person on death not always working For instance, when dying from fall damage	2014-06-05 17:21:02 +02:00
scrawl	b6e52ae8ab	Fix crash when loading a savegame after dying (Fixes #1389 )	2014-06-05 17:01:22 +02:00
scrawl	4e235516c3	Work around missing character in french morrowind font (Bug #1390 )	2014-06-05 16:16:16 +02:00
scrawl	85c9871178	Use question mark for not found glyphs in the font	2014-06-05 16:15:47 +02:00
scrawl	cefa20bfb9	Fix not reacting to quit request while video is playing	2014-06-05 15:52:02 +02:00
scrawl	c0f1449004	Cycle with equipped items if all slots are occupied (Fixes #1395 )	2014-06-05 14:54:07 +02:00
Marc Zinnschlag	1b9b275f30	fix for bug #1369	2014-06-05 13:40:37 +02:00
Marc Zinnschlag	a28a2bc2fe	simplified feature management for record tables	2014-06-05 10:28:10 +02:00
Marc Zinnschlag	c4e7386770	Revert "added changed reference tracking for cells" This reverts commit `f4334da42e`.	2014-06-04 21:12:23 +02:00
Marc Zinnschlag	5313862a46	Merge remote-tracking branch 'scrawl/master'	2014-06-04 15:14:29 +02:00
scrawl	00775035af	Add missing hasItemHealth for lockpicks/probes (Fixes #1385 )	2014-06-04 01:03:12 +02:00
scrawl	d7f3cd75ac	Rewrite journal GUI topic list to use MWList	2014-06-03 16:04:18 +02:00
scrawl	17b15a6f4f	Fix overlapping text in SpellWindow when the window is too small	2014-06-03 01:12:31 +02:00
scrawl	d777739425	Fix a crash on exit when projectiles were active	2014-06-03 00:44:32 +02:00
scrawl	bbc5b125ab	Rewrite journal GUI quest index - Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should. - Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly. - Fixes a bug where the quest index would not be updated when opened.	2014-06-03 00:28:33 +02:00
slothlife	281d3b4c95	Fix for dereferencing past end of mGuiModes.	2014-06-02 17:21:13 -05:00
scrawl	577ed3943b	Show wallpaper when loading a savegame	2014-06-02 23:26:43 +02:00
scrawl	d2ad2e0f31	Re-enable collision when an actor is resurrected	2014-06-02 20:45:25 +02:00
scrawl	996e49c534	Change CharacterManager to use list instead of vector Solves a crash when deleting all savegames of a character due to mCurrent being invalidated	2014-06-02 20:24:35 +02:00
scrawl	68afac6a19	Fix large size_t being truncated to int	2014-06-02 19:47:39 +02:00
Marc Zinnschlag	f130f8535c	Merge remote-tracking branch 'slothlife/cmake-fixes'	2014-06-02 19:08:15 +02:00
scrawl	8b33c087e0	Properly handle exceptions when saving the game Add message boxes when an exception occurs while loading or saving the game	2014-06-02 14:46:41 +02:00
Emanuel Guevel	929aae6869	Silence a clang warning warning: pointer is initialized by a temporary array, which will be destroyed at the end of the full-expression [-Waddress-of-array-temporary]	2014-06-02 10:30:44 +02:00
slothlife	20dabaead9	Fix CMake scripts to link static dependencies Added FindDirectX scripts from Ogre so that FindOgre.cmake doesn't fail silently to find the libraries correctly. Modified top-level CMakelists.txt: - Correctly set include dirs, preprocessor definitions, and add libraries for static Ogre plugins. - Correctly set preprocessor definitions for static MyGUI. Modified launcher, openmw, and opencs to link the static Ogre plugins. Fixed FindSDL2.cmake to set a variable that contains only the SDL2 library, so that the launcher doesn't incorrectly link against SDL2main. Fixed FindMyGUI.cmake to correctly look for static variants. Fixed FindOgre.cmake to set variables for DirectX plugins correctly.	2014-06-02 02:51:04 -05:00
scrawl	f6f6b5604a	Fix loading a savegame when some of its content files were disabled Fixes #1380	2014-06-01 23:11:38 +02:00
Marc Zinnschlag	538aa6607e	Merge remote-tracking branch 'scrawl/master'	2014-06-01 10:25:53 +02:00
Fil Krynicki	bbb7ceab43	Merge branch 'master' into bug1196jumpdialog Conflicts: apps/openmw/mwinput/inputmanagerimp.cpp	2014-05-31 19:58:21 -04:00
Fil Krynicki	cd131e7f86	1196/1217 fix Fixes an issue where inputs could be processed by both GUI and gameplay systems. An enabled/disable has been added to OIS channels, and OpenMW now disables player gameplay hotkeys when a GUI element has focus. GUI hotkeys are left enabled.	2014-05-31 19:51:21 -04:00
scrawl	dcc0e2d105	When dialogue goodbye is forced, allow using either the red link or the goodbye button Fixes #1373	2014-06-01 00:21:55 +02:00
scrawl	0f1b39bca4	Fix trade exploit Using the Max Sale button it was possible to "invert" the buying/selling state.	2014-05-31 18:28:00 +02:00
scrawl	865486604f	Make trade disposition changes temporary again, as in vanilla	2014-05-31 13:57:07 +02:00
scrawl	a1bdf20958	Make trade balance label editable	2014-05-31 13:53:36 +02:00
scrawl	de7fcf0beb	Fix unhandled edge case in TradeItemModel with items that are able to stack, but are not currently stacked (e.g. after repairing a damaged item) Fixes #1368	2014-05-31 13:45:47 +02:00
scrawl	16ac6e7aac	Merge DialInfo objects by subrecord instead of overwriting the object Fixes #1360	2014-05-31 13:01:11 +02:00
Rohit Nirmal	4f4a37896e	Check if player's CellStore is non-NULL before configuring fog. This prevents an assertion fail in getCell() when changing the view distance while in the main menu.	2014-05-30 22:37:13 -05:00
Fil Krynicki	6cc6172779	Update in response to comments. It turns out I was erroneous about problem (1) in my original commit message. I thought that in an edge case the OpenMWGUI could both handle the same event on the frame the GUI was closed. My test for this was broken. So after brainstorming many possible unsatisfactory solutions to this event handling, it's luckily not necessary!	2014-05-30 15:12:57 -04:00
scrawl	8761aa5795	Loop main menu video when it's finished playing	2014-05-30 14:28:04 +02:00
scrawl	ac77b07e29	Small fix for menu background	2014-05-30 14:28:04 +02:00
Marc Zinnschlag	f5e587f566	Merge remote-tracking branch 'puppykevin/master'	2014-05-30 11:42:19 +02:00
Marc Zinnschlag	be7f344eca	Merge branch 'refs' Conflicts: apps/opencs/model/doc/savingstate.cpp components/esm/cellref.hpp	2014-05-30 10:38:38 +02:00
Marc Zinnschlag	4778c27548	silenced two warnings	2014-05-30 10:18:05 +02:00
Marc Zinnschlag	be88168e91	Merge remote-tracking branch 'scrawl/master'	2014-05-30 10:07:18 +02:00
scrawl	b81c7d05c6	Remove CG shaders from settings window (not fully supported on non-nvidia cards, amd profiles have an instruction limit making them useless) Can still be used by editing the config file, however.	2014-05-29 23:16:36 +02:00
Marc Zinnschlag	2f56b11530	Merge remote-tracking branch 'digmaster/master'	2014-05-29 18:57:16 +02:00
scrawl	6a882e1e8d	Don't show hidden factions in StatsWindow (e.g. Nerevarine)	2014-05-29 18:09:04 +02:00
Marc Zinnschlag	ae50632774	implemented cell and reference saving int OpenCS	2014-05-29 18:08:40 +02:00
scrawl	3b3b53d665	Support animated main menus (menu_background.bik) Closes #1362	2014-05-29 17:24:25 +02:00
scrawl	a6788cfb0e	Support lights that do not have a model (Fixes #1361 )	2014-05-29 16:44:50 +02:00
scrawl	95b3026c7e	Fix cells being listed twice in console autocompletion when using --skip-menu=0 and loading a game	2014-05-29 16:34:05 +02:00
Digmaster	03d7137655	Fixes issue with pressing f1 in QuickKey menu, removed transparency in GoodBye button	2014-05-29 06:19:25 -04:00
Digmaster	a5cfa8a049	Removes add behavior when pressing escape while waiting.	2014-05-29 01:52:41 -04:00
scrawl	c6a4506ac2	Make console error prefix slightly less technical (see https://bugs.openmw.org/issues/1194#note-2 )	2014-05-28 22:35:36 +02:00
Kevin Poitra	8516b837ff	Revert "Started implementing sound time tracking so we can have NPCs' mouths move as they talk." This reverts commit `b897080156`.	2014-05-28 15:04:35 -05:00
scrawl	41a04b9c65	Slightly adjust menu button position	2014-05-28 21:50:08 +02:00
scrawl	e9ab7c85c6	Fix exception when there are spaces in INI-imported color settings	2014-05-28 21:29:09 +02:00
Kevin Poitra	3f00f00426	Remove some debug code.	2014-05-28 14:20:04 -05:00
scrawl	18e24a2007	Fix old savegames causing the save list to not fill properly (Error in framelistener: Object '$dynamic0' not found) Fixes #1357	2014-05-28 21:08:20 +02:00
Kevin Poitra	16a6edbd0e	Fix a possible crash due to a null pointer.	2014-05-28 12:58:45 -05:00
Marc Zinnschlag	f112c78858	Merge remote-tracking branch 'scrawl/master'	2014-05-28 19:47:36 +02:00
Kevin Poitra	251df73407	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-05-28 12:29:40 -05:00
Kevin Poitra	b897080156	Started implementing sound time tracking so we can have NPCs' mouths move as they talk.	2014-05-28 12:26:35 -05:00
scrawl	e68600eda2	Make Activate instruction work properly even when onActivate was not called in the same frame. There are two major differences to the old implementation: - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low. - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action. Fixes #1166 and #1346.	2014-05-28 19:23:50 +02:00
scrawl	42ea43c3d1	Fix container scripts not getting removed properly on cell change Broken by `f99eda1a54`	2014-05-28 18:45:07 +02:00
Marc Zinnschlag	bb011f278e	Merge remote-tracking branch 'cc9cii/master'	2014-05-28 14:45:57 +02:00
scrawl	56ff399f30	Say attack voiced dialogue after the target is set up Required for the CreatureTargetted filter to function properly	2014-05-28 13:59:31 +02:00
cc9cii	bbe77d656a	Minor fixes from static analysis.	2014-05-28 21:15:50 +10:00
Arthur Moore	9be219beba	Fixes Bug #1348 "Evidence Chest unlocking when arrested."	2014-05-27 22:09:37 -04:00
Marc Zinnschlag	be39395ce7	Merge remote-tracking branch 'scrawl/master'	2014-05-27 21:09:24 +02:00
Digmaster	033f1850f9	Fixed crass on character creation, allowed some character creation windows to be Esc-able	2014-05-27 14:30:26 -04:00
Digmaster	060a50f94a	Fixed issue with QuickKeyMenu and ItemSelectionDialog	2014-05-27 13:50:24 -04:00
Fil Krynicki	91f4967614	Fix for bug 1196. This bug would cause the player to jump when jump was assigned to Space and they closed a dialog with Space. I tested vanilla MW for behaviour and found that Jump was the only basic input which MW does not allow when closing dialogs (i.e. if Space is assigned to move forward, MW will move you forward after closing the dialog). There were two reasons for the bug: 1) OpenMW GUI does not consume UI events 2) Jump occurs so long as key is down (not only on first key down) To minimally fix the bug, I made it so that keypress events can be consumed by the GUI and not passed along to the player control input manager (1). However, if the player holds space, they will still jump (as the subsequent key held events will be captured and cause a jump). Unfortunately, there is no idiomatic way that I could find in the OpenMW input manager to perform events only on key down. Instead, I introduced a variable which tracks whether the jump key has been pressed for the first time within the current frame (2). Note: I was initially concerned that limiting the jump event to KeyDown and not Key Hold would cause issues with swimming, levitating, or variable height jumping. However, after a bunch of testing in vanilla MW and exploration of the OpenMW codebase I could find nothing suggesting the need to capture the jump key being held.	2014-05-27 13:12:27 -04:00
scrawl	0b45a9e6b2	Fix case folding for faction reaction from ESX records	2014-05-27 19:02:48 +02:00
scrawl	2b15b85af1	Fix position adjustment not working properly for rotated objects	2014-05-27 17:58:18 +02:00
scrawl	2fe86f2b85	Consider hit normal for item drop test (Fixes #995 )	2014-05-27 17:39:04 +02:00
scrawl	f476aa4ade	Remove MyGUI color codes when copying to system clipboard	2014-05-27 17:07:14 +02:00
scrawl	49a6579d3a	Fixed esmtool	2014-05-27 15:37:04 +02:00
scrawl	3e2eed9269	Implement getFactionReaction function Strange bug when using value != 0 for the garbage argument?	2014-05-27 15:23:22 +02:00
scrawl	e266c39c5d	Implement modFactionReaction instruction (Closes #1347 )	2014-05-27 14:54:29 +02:00
Marc Zinnschlag	27c795483b	Merge remote-tracking branch 'ace/win-build-fix'	2014-05-27 14:32:20 +02:00
scrawl	578adb4ef6	PcJoinFaction and friends: make sure the given faction exists	2014-05-27 13:54:25 +02:00
Alexander "Ace" Olofsson	d3357cc279	The MSVC linker is really pedantic with this. Functions compiled as taking a class can't be linked with functions giving a struct, because of the name mangling I'm guessing... unresolved external symbol "protected: void __thiscall MWWorld::LiveCellRefBase::loadImp(class ESM::ObjectState const &)" (?loadImp@LiveCellRefBase@MWWorld@@IAEXABVObjectState@ESM@@@Z)	2014-05-27 13:27:18 +02:00
Marc Zinnschlag	1665822224	Merge remote-tracking branch 'puppykevin/master'	2014-05-27 12:42:48 +02:00
Marc Zinnschlag	e0ba9a4bf2	added reference collection stage to saving operation (preparation for cell saving)	2014-05-27 12:39:26 +02:00
Digmaster	2b3b11d848	Give access to the main menu when at a choice in dialogue	2014-05-27 05:33:25 -04:00
Digmaster	ee7b5fa5c2	Fixed crash when Esc-ing out of Save "are you sure" dialog.	2014-05-27 04:38:13 -04:00
Digmaster	e0356cf89d	Added support to close modal windows with Esc	2014-05-27 03:00:31 -04:00
Kevin Poitra	beba58268c	Fix a typo within the launcher. Fixes bug #1058 .	2014-05-27 01:47:57 -05:00
Marc Zinnschlag	9e21da9636	Merge remote-tracking branch 'scrawl/master'	2014-05-27 08:34:54 +02:00
Digmaster	e0d55116a4	Dims and disabled Goodbye button in dialogs when unavailable.	2014-05-27 00:30:37 -04:00
Digmaster	79d0ed64d9	Undo some changes I made in the past that shouldn't exist	2014-05-26 23:31:40 -04:00
Digmaster	1ca921d6e2	Merge remote-tracking branch 'upstream/master'	2014-05-26 23:26:23 -04:00
Digmaster	e3e51324a4	Esc button exits all non-modal GUI windows	2014-05-26 23:13:37 -04:00
scrawl	cf68f6da96	Fix ESX dependencies not being checked except for the first one	2014-05-27 00:06:34 +02:00
scrawl	4caa8c5cca	Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations)	2014-05-26 20:52:38 +02:00
scrawl	5660f283dd	Fix actor models incorrectly being rotated on X/Y axes	2014-05-26 20:52:38 +02:00
scrawl	0966755a0c	Store death animation index in CreatureStats	2014-05-26 20:52:32 +02:00
Marc Zinnschlag	3937cfcd8b	Merge remote-tracking branch 'scrawl/master'	2014-05-26 19:02:13 +02:00
scrawl	3cd835e61a	Fix bsa file loading not being case insensitive (Fixes #1178 )	2014-05-26 17:34:36 +02:00
scrawl	f629307f60	Fix frame delay for sound listener position (Fixes #1180 )	2014-05-26 16:43:19 +02:00
scrawl	bfd91c0681	Fix potential NpcStats overwriting issue	2014-05-26 12:31:08 +02:00
Marc Zinnschlag	4aab4bae65	minor cleanup and silenced a warning	2014-05-26 10:14:24 +02:00
Marc Zinnschlag	f0d0a31a19	Merge remote-tracking branch 'mrcheko/master'	2014-05-26 10:08:40 +02:00
Thomas	7697b9e868	Ensures nothing bad will happen if we try to lock a door that never had a lock level	2014-05-26 01:48:24 -04:00
Thomas	b3ffd5b868	Fix for bug Bug #1098	2014-05-26 01:42:11 -04:00
mrcheko	8fa7fcdbee	fix bug http://bugs.openmw.org/issues/1335 (1304 as well) though fish detects if actor is swimming, but in MW it attacks even if the player is knee-deep in water	2014-05-25 21:03:37 +04:00
scrawl	10d835a55c	Some more missing isInCell checks	2014-05-25 15:07:35 +02:00
scrawl	f3ba31de2d	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwscript/cellextensions.cpp	2014-05-25 14:58:47 +02:00
scrawl	039398c8ae	Basic RefData and CellRef change tracking Wrapped item charge handling in getItemHealth function	2014-05-25 14:30:07 +02:00
Marc Zinnschlag	130af28fa5	Merge remote-tracking branch 'cc9cii/master' Conflicts: apps/openmw/mwrender/videoplayer.cpp	2014-05-25 12:07:09 +02:00
Marc Zinnschlag	ff15601a4c	Merge branch 'openmw-30'	2014-05-25 11:55:25 +02:00
mrcheko	c62187bd55	fix bug at http://bugs.openmw.org/issues/1155 Though it still can happen sometimes but not in such stupid manner.	2014-05-25 13:31:46 +04:00
cc9cii	d2794165ba	Disable binkaudio sound for FFmpeg libavocdec versions below 54.55.xxx (Windows x64) and 54.10.xxx (Windows 32bit). Later versions are all allowed, but due to sample formats there will be no sound and this message will be shown on the console "Sound Error: Unsupported sample format: fltp"	2014-05-25 18:56:50 +10:00
mrcheko	559c772906	Merge remote-tracking branch 'upstream/master'	2014-05-25 10:21:54 +04:00
cc9cii	4f94a31b54	Fix crash starting a new game.	2014-05-25 07:50:19 +10:00
mrcheko	56881cb7c9	fix bugs in aisequence::execute	2014-05-24 23:05:30 +04:00
scrawl	a05c8fd3ce	Make applyEnchantment return the record ID instead of modifying Ptr	2014-05-24 14:58:48 +02:00
scrawl	1d8da95756	Warning fix	2014-05-24 14:47:51 +02:00
scrawl	08cf58204f	Merge branch 'master' of github.com:scrawl/openmw	2014-05-23 16:45:28 +02:00
scrawl	f09c8ddc9e	Remove a pointless assert	2014-05-23 16:44:51 +02:00
scrawl	a7d525245c	Fix missing include	2014-05-23 16:07:02 +02:00
Scott Howard	c9011f707f	missing #include <iostream> in mwiniimporter missing #include <iostream> in mwiniimporter/main.cpp	2014-05-23 08:41:49 -04:00
cc9cii	367acd9676	Enable video but without sound.	2014-05-23 21:55:47 +10:00
cc9cii	3718847ffc	Disable video for Windows until the crash issues are fixed.	2014-05-23 21:07:01 +10:00
Marc Zinnschlag	f4334da42e	added changed reference tracking for cells	2014-05-23 09:32:34 +02:00
scrawl	b47b2b84f3	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwdialogue/filter.cpp apps/openmw/mwgui/waitdialog.cpp	2014-05-23 08:39:48 +02:00
Marc Zinnschlag	6ac700a501	Merge remote-tracking branch 'potatoesmaster/getClass'	2014-05-23 08:00:52 +02:00
Marc Zinnschlag	244eb11651	Merge remote-tracking branch 'greye/widechar'	2014-05-23 07:48:26 +02:00
scrawl	a2f156be8e	Prevent magic bolts from colliding with their caster	2014-05-22 23:34:32 +02:00
scrawl	df8e095c83	Small cleanup	2014-05-22 23:27:54 +02:00
Emanuel Guevel	1e4a854433	Remove static method MWWorld::Class::get(&Ptr) It was just adding a level of indirection to Ptr.getClass(). All the call were replaced by that instead. The number of lines changed is important, but the change itself is trivial, so everything should be fine. :)	2014-05-22 20:50:00 +02:00
Emanuel Guevel	20cfdd4b43	Move LiveCellRefBase ctor where it belongs to	2014-05-22 20:50:00 +02:00
scrawl	cba50c7338	Optimize ManualRef: look up correct Store instead of searching	2014-05-22 15:46:35 +02:00
scrawl	4b5f02f644	Remove useless throwing of exception	2014-05-22 15:29:36 +02:00
greye	663d5c314e	be more verbose on change reasons	2014-05-22 16:35:57 +04:00
greye	8f9091550e	require boost::locale only on Windows	2014-05-22 15:42:47 +04:00
scrawl	3380e1e1c5	Fix ShouldAttack filter This makes NPCs exit dialogue properly when they should attack as a result of taunting actions.	2014-05-22 12:20:25 +02:00
scrawl	c6c254d279	Do not trigger levelup if rest was interrupted	2014-05-22 11:08:36 +02:00
scrawl	18bba6bcec	Fix layout glitch when autosaving	2014-05-22 11:03:45 +02:00
greye	cb598f0455	the same for data-local entry	2014-05-22 01:13:27 +04:00
greye	28b59f4008	process paths as UTF-8 in launcher	2014-05-22 01:08:03 +04:00
scrawl	cf07d2ab93	Fix swapped position of Save and Load menu buttons	2014-05-21 16:38:50 +02:00
scrawl	f812746010	Auto-select first save in load dialog	2014-05-21 16:36:55 +02:00
scrawl	3a7e2f8bb5	Allow invoking Journal instruction with non-existing index This is used by the MG_EscortScholar1 quest.	2014-05-21 14:18:14 +02:00
greye	8b94e31062	try to set relative path to resources	2014-05-21 15:39:58 +04:00
scrawl	2f6d400c62	Merge branch 'master' of https://github.com/OpenMW/openmw into newgame	2014-05-21 10:41:03 +02:00
scrawl	b39b572c5a	Moved mStartupScript to World, so that it is executed for a New game	2014-05-21 09:25:45 +02:00
scrawl	9fe505c8fa	Only run --script-run commands when bypassing the menu Running them while no game is started yet is dangerous, and also leaves bits and pieces of state (e.g. in LocalScripts for scripted items added to inventory) that will not get cleaned up properly when a game is loaded (since when no game was previously running, no cleanup is performed). As a result, dangling MWWorld::Ptrs were left in LocalScripts.	2014-05-20 18:35:17 +02:00
scrawl	abd6b6ab33	Fix not returning to main menu on failed loads when using quickload	2014-05-20 17:11:26 +02:00
scrawl	7ab98f0c6f	Clear choices when dialogue starts This is usually not needed, because it is not possible to exit dialogue while in a choice. However you can still exit dialogue by loading a different savegame.	2014-05-20 16:57:38 +02:00
greye	b728a919a2	write dependency on boost::locale to CMake files	2014-05-20 12:59:58 +04:00
scrawl	220ab86eca	Simplify new game movie player	2014-05-20 10:07:08 +02:00
Marc Zinnschlag	e0b6bf6aeb	implemented reference record deleting	2014-05-20 09:28:18 +02:00
Marc Zinnschlag	d8440e1fdc	implemented reference record merging	2014-05-20 09:02:22 +02:00
greye	9dbe3f21d9	keep non-const signature for argv after conversion	2014-05-20 10:42:21 +04:00
greye	130349e0cd	open files in binary mode when necessary	2014-05-20 08:14:29 +04:00
Marc Zinnschlag	58afa58549	Merge remote-tracking branch 'mrcheko/master'	2014-05-19 22:07:32 +02:00
mrcheko	638df221a6	memory leak fix	2014-05-19 23:29:35 +04:00
greye	20527e0bd4	use boost::filesystem instead of boost::iostreams	2014-05-19 16:56:41 +04:00
scrawl	6bd0bbb8df	Do not load (0,0) on new game	2014-05-19 14:09:16 +02:00
greye	db16bb8983	fix OpenCS saving to Unicode path destination	2014-05-19 15:52:19 +04:00
greye	9c6224c74d	fix saving to Unicode path destination	2014-05-19 15:43:25 +04:00
scrawl	6f03694d50	Fixes #1334 : Only unequip item if the sell/drag action is actually successful	2014-05-19 08:03:55 +02:00
Marc Zinnschlag	7c149e98e0	Merge branch 'openmw-30'	2014-05-18 22:38:52 +02:00
Marc Zinnschlag	37f1a49352	Merge remote-tracking branch 'mrcheko/master'	2014-05-18 22:36:40 +02:00
mrcheko	fa14df62b7	fix crash on disappeared target	2014-05-18 23:15:22 +04:00
Marc Zinnschlag	aa05acd26e	Merge remote-tracking branch 'scrawl/master'	2014-05-18 18:50:18 +02:00
Marc Zinnschlag	56c4367c1a	Merge remote-tracking branch 'mrcheko/master'	2014-05-18 18:42:23 +02:00
mrcheko	e1249f6a31	actor handle and id confusing fix	2014-05-18 20:13:46 +04:00
scrawl	a87b64d2da	Fix some ancient code	2014-05-18 16:34:58 +02:00
scrawl	1677fcf324	Dialogue merging	2014-05-18 15:25:16 +02:00
mrcheko	66307dd889	travis fix #3 :(	2014-05-18 16:10:14 +04:00
mrcheko	74697f8116	travis fix #2	2014-05-18 15:41:15 +04:00
scrawl	5b76c0893a	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: components/esm/inventorystate.hpp	2014-05-18 12:55:43 +02:00
greye	e02b04536f	fix most vexing parse issue	2014-05-18 14:55:05 +04:00
greye	a22ec223d8	open fstreams from boost::filesystem::path, vol.1	2014-05-18 14:55:05 +04:00
greye	18b3cfebdb	fix importer crash on empty lines (thanks to Ace)	2014-05-18 14:55:05 +04:00
greye	b4950509bc	use converted widechars in ini importer	2014-05-18 14:55:05 +04:00
greye	cd990a665a	create QString from utf-8 when expected	2014-05-18 14:55:05 +04:00
scrawl	a872c9f83a	Feature #1323 : handle restocking levelled items	2014-05-18 12:53:21 +02:00
mrcheko	69c1eb28c5	travis compile fix	2014-05-18 14:39:04 +04:00
scrawl	90ec19c3ac	Remove unneeded MWScrollView	2014-05-18 10:30:03 +02:00
scrawl	150b920ef1	Fix long journal entries not being displayed	2014-05-18 10:14:03 +02:00
scrawl	5fc2b1a41b	Allow setting a journal index even if there's no related journal entry This is used by the MV_SlaveMule quest.	2014-05-18 07:39:16 +02:00
scrawl	e1458453f3	Fix "unknown info ID" exceptions when a dialogue response is from the Info Refusal group Could be observed in TG_OverduePayments quest when talking to Trasteve about Dwemer Artifacts. Info Refusal responses are not specific to any particular topic, so they should not be added to the journal. Trying to do so anyway will cause "unknown id" exceptions because MWDialogue::Entry expects the infoId to be from the Dialogue for the supplied topic.	2014-05-18 06:52:15 +02:00
cc9cii	12dc5cf4ea	Bug #1303 - resolves the bug by tweaking the slope constant (the value 49 was selected to mimic vanilla behaviour for a low level character exploring Seyda Neen). The feature to vary the climbable angle based on acrobatics is still to be implemented.	2014-05-18 12:05:08 +10:00
mrcheko	aa5647b45e	merge master, resolve conflicts	2014-05-17 19:20:57 +04:00
cc9cii	8971db8962	SceneWidget windowHandle fix for Windows.	2014-05-17 23:53:33 +10:00
scrawl	b4ed828e21	Feature #1323 : Implement restocking items (does not handle levelled lists yet)	2014-05-17 14:30:31 +02:00
Marc Zinnschlag	f7c89015f9	Merge remote-tracking branch 'scrawl/master'	2014-05-17 11:50:31 +02:00
scrawl	ae66d28c87	Feature #32 : Implement respawn for containers, creatures and NPCs	2014-05-17 09:09:00 +02:00
scrawl	92c5bb56e0	Un-reverted actorId for AiPursue	2014-05-17 05:34:54 +02:00
scrawl	e266aff561	Savegame: store projectiles	2014-05-17 05:24:32 +02:00
scrawl	9adb990143	Fix potentially unsafe use of MWWorld::Ptr	2014-05-17 02:52:24 +02:00
scrawl	e5a21aca53	Refactor projectiles to no longer use MW-objects	2014-05-16 13:33:30 +02:00
scrawl	18852c09d0	Manually re-added AiCombat portion of actorid changes. This is the only one that really matters, and will not suffer from the infinite recursion because it's not included in AiSequence::fill.	2014-05-16 12:28:23 +02:00
scrawl	36d9ae17cc	Revert "Change all AI packages (except AiActivate) to use ActorIds" Causes potential infinite loops (AiSequence::fill -> AiPackage() -> getCreatureStats -> ensureCustomData -> ..) This reverts commit `2e9985c1a3`.	2014-05-16 12:11:34 +02:00
scrawl	028e00c98f	Add missing status report for some toggle commands	2014-05-16 09:21:28 +02:00
scrawl	868e38a07c	Fix Assault crimes being reported when striking in self-defense Last missing fix for Bug #1134.	2014-05-16 08:32:00 +02:00
scrawl	940a434479	Use ItemModel for moving items from a container to the world Fixes owner not resetting when moving an item from a corpse to the world.	2014-05-16 03:19:38 +02:00
scrawl	d70306382e	Don't create the player object until the game starts Fixes a crash introduced in `e591d23` when using --skip-menu=0.	2014-05-16 00:58:12 +02:00
mrcheko	5be37f04ef	Feature 1314: make npc fight creatures	2014-05-16 00:03:48 +04:00
scrawl	b3735981d6	Remove unused file_finder	2014-05-15 21:36:24 +02:00
Marc Zinnschlag	3b2ba4f6cd	Merge remote-tracking branch 'scrawl/master'	2014-05-15 14:25:36 +02:00
scrawl	0bc33fa86a	Revert "AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)" Apparently not working for AiCombat due to its higher getPriority(). What should we do here? This reverts commit `a6e1d7ffd6`.	2014-05-15 10:14:47 +02:00
scrawl	b16d444f0f	Fix never clearing graveyard. Oops	2014-05-15 10:05:35 +02:00
scrawl	6de7e16550	Fix searchPtrViaActorId not skipping over deleted references Fixes an issue when an actor has moved cell: searchPtrViaActorId would randomly return the deleted Ptr from the old cell.	2014-05-15 09:57:09 +02:00
scrawl	b6a7aee42e	Fix player not being allowed to use his own items	2014-05-15 09:54:10 +02:00
scrawl	eb40032bde	Fix item owner not resetting when dragging an item from a corpse to the player avatar	2014-05-15 09:54:10 +02:00
scrawl	bac4d875df	Fix a potential exploit that made it possible to reset the owner of any item	2014-05-15 09:54:10 +02:00
scrawl	a6e1d7ffd6	AiCombat: Removed obsolete door back-off code (now handled in AiAvoidDoor)	2014-05-15 09:54:10 +02:00
scrawl	2e9985c1a3	Change all AI packages (except AiActivate) to use ActorIds More robust in case the target changes cell or there are multiple targets with the same RefId	2014-05-15 09:54:10 +02:00
scrawl	2f13a17a39	Add some more safety checks to spellcasting	2014-05-15 09:54:10 +02:00
scrawl	f2c193ce3d	Fix searching the player's actorId	2014-05-15 09:54:10 +02:00
scrawl	a609dc5674	Fix exception when getting hit by a trap	2014-05-15 09:54:10 +02:00
scrawl	a76e391ad0	Savegame: store door movement state (Closes #747 )	2014-05-15 09:54:10 +02:00
scrawl	37b9d2fb0c	Fix a wrong use of reference that causes potential crash	2014-05-15 09:54:10 +02:00
scrawl	471bbd0021	Savegame: store levelled creature state and move to actorIds (Closes #1332)	2014-05-15 09:54:04 +02:00
Marc Zinnschlag	d08869a25d	Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' Conflicts: apps/openmw/mwrender/localmap.cpp	2014-05-15 08:13:15 +02:00
slothlife	f33559fead	Fixes for MSVC warnings, less overall changes Kept some fixes from the first round of review. Found out that several targets weren't being built with the same basic warnings disabled. Disabled a few warnings for external libraries specifically, rather than applying them to all targets.	2014-05-14 20:12:52 -05:00
scrawl	9b67fcc4d7	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-05-14 23:54:25 +02:00
scrawl	9052cc4a57	Savegame: store ActiveSpells	2014-05-14 23:54:15 +02:00
Marc Zinnschlag	2116f16289	Merge remote-tracking branch 'digmaster/master'	2014-05-14 21:16:24 +02:00
Thomas	d2aada95b4	Fixed AiPursue by fixing underlying issue is Pathto()	2014-05-14 14:11:34 -04:00
Thomas	2425d2c2ab	Added stuck mitigation for AiAvoidDoor	2014-05-14 13:38:10 -04:00
Marc Zinnschlag	c2ea92b93a	Merge remote-tracking branch 'sirherrbatka/Feature#1274'	2014-05-14 14:41:04 +02:00
Marek Kochanowicz	3439900239	ignore all drops that will not create usefull filter	2014-05-14 11:56:23 +02:00
Thomas	993ef1be43	Actor avoiding door asks all surrounding actors to do the same.	2014-05-14 04:05:18 -04:00
scrawl	1141c1f3f2	Change projectiles to use actorIds	2014-05-14 09:48:16 +02:00
scrawl	61187c2fef	Savegame: store actorIds	2014-05-14 09:47:49 +02:00
Thomas	cbcf0f6039	Changed AiEScort to use new PathTo function	2014-05-14 01:44:11 -04:00
scrawl	dfacf8c044	Change ActiveSpells to use ActorId	2014-05-14 07:14:08 +02:00
scrawl	67e942e733	Bug #869 : Some fixes to the previous fix	2014-05-14 07:13:12 +02:00
slothlife	c160a04ede	Revert "Fixes for warnings when building with MSVC" This reverts commit `46eb20b98c`.	2014-05-14 00:03:30 -05:00
scrawl	7697ab37e0	Fixes #1129 : Change summoned creatures to use ActorId Gracefully handles summoned creatures that are left behind in inactive cells.	2014-05-14 06:37:31 +02:00
Thomas	7cd4c93fa4	Changed getNearbyDoor to use MWWorld::Ptr	2014-05-13 23:46:00 -04:00
scrawl	99b4bc721b	Don't attempt to inflict spells on dead actors	2014-05-14 05:37:53 +02:00
scrawl	6c7b3074f5	Fix self-defense for creatures when attacked with a spell	2014-05-14 05:31:19 +02:00
Thomas	58bf7624be	Made code a bit more efficient	2014-05-13 21:52:05 -04:00
scrawl	3cdbcf3c28	Merge branch 'actorid' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwmechanics/creaturestats.cpp	2014-05-14 02:35:05 +02:00
Thomas	203ef580cf	Fixed moving activatable object being incorrectly activated.	2014-05-13 20:32:29 -04:00
scrawl	365ca6c7e1	Fixes #1331 : Manually disable movement state for dead actors. For dead actors, refreshCurrentAnims is no longer called, so we need to disable the movement state manually.	2014-05-13 21:47:45 +02:00
Thomas	6d540c4e07	Removed merging error	2014-05-13 14:24:48 -04:00
Thomas	680890c846	Clarification on some documentation points	2014-05-13 14:21:59 -04:00
Thomas	d6d4d9f75d	Removed destructor documentation	2014-05-13 14:08:08 -04:00
Thomas	ee36ace00b	Undid some code clean up changes, and changed how some includes work	2014-05-13 13:43:50 -04:00
Thomas	598221a8e7	Forgot some files	2014-05-13 13:07:27 -04:00
scrawl	e591d23880	Fixes #894 : Make sure the player's CharacterController is updated when the player is rebuilt. Necessary if the race is changed while we are still in a GUI (e.g. in the review dialog), and an update normally wouldn't occur.	2014-05-13 19:01:02 +02:00
Thomas	9dbe53c722	Merge remote-tracking branch 'upstream/master'	2014-05-13 04:11:07 -04:00
Thomas	2db3c89a9e	Ensures destination is far enough to care about getting stuck	2014-05-13 04:09:21 -04:00
Marc Zinnschlag	6c8e4b27d3	Merge remote-tracking branch 'scrawl/master'	2014-05-13 10:00:18 +02:00
Thomas	cbfa282f8d	Changed implementations of aifollow/pursue/activate slightly, added ability for NPCs to go through unlocked doors (They even try locked ones), and step back from opening doors (Although it still needs some work) Notes - When the door hits them while it's about to finish closing they will try to walk through the door. - Considerably more works is needed in making the NPC work out troublesome areas where they get stuck	2014-05-13 03:58:32 -04:00
Thomas	2c74ea381e	Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue	2014-05-12 21:05:32 -04:00
scrawl	386604bc9d	Fixes #869 : Added methods to control external and internal collision modes separately When an actor dies, we should only disable external collisions, i.e. prevent other actors from colliding with the dead body. The dead actor, however, should still have gravity and collision applied. Also moved disableCollision to when the death animation finishes, not as soon as the actor's health is 0.	2014-05-13 01:43:52 +02:00
mrcheko	725f6cac5e	AiPursue infinite package updating bug resolved	2014-05-13 00:05:30 +04:00
scrawl	6cc691115b	Savegame: store most of CreatureStats	2014-05-12 21:37:36 +02:00
Thomas	645d174a96	Merge remote-tracking branch 'upstream/master' Conflicts: apps/openmw/mwmechanics/aisequence.hpp	2014-05-12 14:49:08 -04:00
mrcheko	e4fe78937a	Merge remote-tracking branch 'upstream/master'	2014-05-12 22:06:26 +04:00
Marc Zinnschlag	3c5fe28857	Merge branch 'config'	2014-05-12 10:33:10 +02:00
Marc Zinnschlag	8279d307c4	text encoding configuration (was using hardcoded settings before)	2014-05-12 10:32:57 +02:00
scrawl	117b812fb1	Fix invisibility not breaking on certain actions	2014-05-12 02:20:56 +02:00
scrawl	b0fbea9d57	Removed a wrong assertion. Max drowning time is defined by GMST.	2014-05-11 21:03:27 +02:00
scrawl	2bc2684a66	Fixes #275 : force updating exterior cell maps even if already in cache	2014-05-11 18:01:47 +02:00
scrawl	54a893994a	Also update local map when paused, to make it update properly when teleporting via GUI/console	2014-05-11 18:01:47 +02:00
scrawl	7428511ea0	Bug #772 : Do not show door markers for disabled doors	2014-05-11 18:01:47 +02:00
scrawl	961c4d4dc4	Fixes #772 : Give scripts a chance to run before updating map, so that disabled objects are not visible	2014-05-11 18:01:47 +02:00
scrawl	ac8abd3398	assert -> exception to gracefully handle corrupted savegames	2014-05-11 18:01:47 +02:00
Marc Zinnschlag	368c868623	Merge remote-tracking branch 'scrawl/master'	2014-05-11 11:10:51 +02:00
Marc Zinnschlag	a85c73cf35	Merge remote-tracking branch 'filkry/bug1047dialoglinks'	2014-05-11 11:07:23 +02:00
scrawl	c39a0368cf	Bug #618 : Make local map textures static in an attempt to fix the disappearing maps with D3D. Also removed problematic DISCARDABLE flag for fog of war textures.	2014-05-11 02:40:15 +02:00
scrawl	c98bea2a88	Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip	2014-05-11 02:27:43 +02:00
scrawl	a4a9794417	Savegame: store fog of war (Closes #1177 )	2014-05-11 02:07:58 +02:00
scrawl	7b46e9f914	Get rid of no longer needed widget names	2014-05-11 01:05:49 +02:00
scrawl	041319c43e	Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes	2014-05-11 00:32:22 +02:00
scrawl	07d9845aa0	Fix a bug in ESMStore code that checks for duplicate record insertions	2014-05-11 00:10:28 +02:00
Fil Krynicki	eb5ef270ba	Bug 1047 update - defaults and edge case Handles edge case where it was possible to highlight adjacent sub-terms without whitespace between them. Also makes ignoring words not prefixed by whitespace the assumed behaviour.	2014-05-10 17:47:21 -04:00
scrawl	dab4db87ff	Fix a bug in marker placement for interior maps	2014-05-10 23:47:00 +02:00
Fil Krynicki	9095a45ba7	Bug 1047 Fix Dialog links can no longer be highlighted if they appear in the middle of the word. This is achieved by confirming that the character before a match is not alphabetic, so that words following hyphens can still potentially match.	2014-05-10 17:05:15 -04:00
scrawl	b358cf2423	Fix a potential crash when loading script locals from savegame	2014-05-10 21:31:49 +02:00
scrawl	9fb5cef287	Oops, committed debug code	2014-05-10 21:31:49 +02:00
Marc Zinnschlag	8f5acf4741	Merge branch 'openmw-30'	2014-05-10 17:49:02 +02:00
Marc Zinnschlag	5b5bf6f37e	removed a redundant (and unsufficiently configured) copy of ConfigurationManager	2014-05-10 17:46:10 +02:00
Marc Zinnschlag	804bf523ba	removed two unused files	2014-05-10 17:35:11 +02:00
Marc Zinnschlag	5b9e90744e	Merge branch 'load'	2014-05-10 13:49:25 +02:00
Marc Zinnschlag	6fdbd4d3f9	minor adjustment to UniversalId	2014-05-10 13:49:19 +02:00
Marc Zinnschlag	96ca9500ca	generate error messages when encounting non-critical problems during load	2014-05-10 13:47:22 +02:00
Marc Zinnschlag	79d59153c1	improved layout of loading window	2014-05-10 13:29:28 +02:00
Marc Zinnschlag	95d24492de	display load error messages in loading window	2014-05-10 13:18:40 +02:00
Marc Zinnschlag	aadaf7827d	added load error log	2014-05-10 12:04:36 +02:00
Marc Zinnschlag	31b8dad4e0	Merge remote-tracking branch 'scrawl/master'	2014-05-10 10:52:47 +02:00
Marc Zinnschlag	2009cf9ad7	Merge remote-tracking branch 'scrawl/master' into openmw-30	2014-05-10 10:48:40 +02:00
scrawl	242e19a136	Fix crash when exiting OpenMW while dialogue/journal is opened and mouse cursor on a topic (Fixes #1300)	2014-05-10 01:37:34 +02:00
scrawl	5163358478	Fix a crash when exiting OpenMW while the mouse cursor is over a local map marker	2014-05-10 01:14:12 +02:00
scrawl	d86585b153	Fix clearing of local map markers destroyWidget changes the child count, so the for loop is flawed.	2014-05-10 01:07:40 +02:00
scrawl	1444cd9051	Fix AiCombat exception when actor has a lockpick/probe equipped. Don't make NPCs autoEquip lockpicks/probes, since they can't use them.	2014-05-10 00:37:36 +02:00
scrawl	136813a882	Bug #1319 : Fix references not coming from a content file incorrectly overwriting each other	2014-05-10 00:01:30 +02:00
scrawl	e7a004824c	Fix a search that should have been find	2014-05-09 23:58:24 +02:00
scrawl	872d9be1b4	Fix potential issue with dialogue globals Make sure they are updated throughout the conversation	2014-05-09 19:19:21 +02:00
scrawl	731bc9c275	Fix broken isClass check and renamed variable for clarity	2014-05-09 18:45:49 +02:00
slothlife	46eb20b98c	Fixes for warnings when building with MSVC Most warnings are innocuous (wrong type-specifier for forward declarations, conversion of literals into unsigned integers, warnings about methods optimized out), but I believe actual bugs were revealed in vartypedelegate.cpp and combat.cpp.	2014-05-09 08:32:52 -05:00
cc9cii	cf23721f1b	Windows debug build crash fix.	2014-05-09 20:43:24 +10:00
scrawl	312dc84fa4	Fix a bug where the player's inventory could be opened as a container If an NPC uses AiActivate on the player (i.e. to activate dialogue) precisely in the frame where the player just died, the player's inventory would be opened as a container instead.	2014-05-08 20:40:45 +02:00
Marc Zinnschlag	cf90da6cd8	minor fix	2014-05-08 15:23:29 +02:00
Marc Zinnschlag	6eff5ecaad	Merge branch 'operations' into load Conflicts: apps/opencs/main.cpp apps/opencs/model/doc/document.cpp	2014-05-08 13:17:24 +02:00
Marc Zinnschlag	205306ee3d	changed message passing format from QString to a UniversalId/std::string pair	2014-05-08 12:42:29 +02:00
graffy76	0e7d40de6a	Merge branch 'master' of https://github.com/OpenMW/openmw upstream merge	2014-05-07 22:00:08 -05:00
graffy76	cd7983adb5	Decoupled setting definitions from the Setting class. QSettings implementation is now fully responsible for managing user settings.	2014-05-07 21:59:26 -05:00
Marc Zinnschlag	21142711f0	Merge remote-tracking branch 'graffy76/master'	2014-05-07 10:35:11 +02:00
graffy76	e47e3de3d2	Removed unneeded includes, cleaned up code, added comments	2014-05-06 21:58:50 -05:00
graffy76	8fb96e1be3	Removed error code for missing opencs.ini files.	2014-05-06 19:22:45 -05:00
mrcheko	01810f24b0	A* misses 1st closest node fix	2014-05-06 23:29:39 +04:00
Marc Zinnschlag	729e079b0b	Merge remote-tracking branch 'scrawl/master'	2014-05-06 20:18:19 +02:00
scrawl	1c8c26072d	Crime and self defense fixes - NPCs should still shout messages such as "thief" even if they did not report the crime - Fixed self defense for NPCs (they no longer attack the player when they were attacked by a non-player actor) - Fixed self defense for creatures (Fixes #1203)	2014-05-06 19:15:43 +02:00
scrawl	d2beb814e7	Remove superfluous attack phrases (already done by startCombat)	2014-05-06 18:05:53 +02:00
graffy76	a17cb1f389	Fixed opencs.ini formatting	2014-05-06 07:37:52 -05:00
Marc Zinnschlag	a30d816982	fixed a mixup in CSMTools::Tools constructor/destructor	2014-05-06 11:44:20 +02:00
Marc Zinnschlag	492620c8cf	handle exceptions thrown during loading and report them to the user	2014-05-06 09:39:39 +02:00
scrawl	dd9117809d	Say an attack phrase when combat starts Move combat start to a helper method Added some todo comments	2014-05-06 00:13:31 +02:00
scrawl	d4492b56db	Added header file missing from CMakeLists	2014-05-05 23:52:09 +02:00
scrawl	536fc5e192	Fix autosaves	2014-05-05 22:38:08 +02:00
graffy76	5cba828cc9	Removed unneeded code from setting manager. Moved some code to user settings	2014-05-05 06:26:00 -05:00
graffy76	74fa115d20	fixed check for missing ini files	2014-05-05 06:07:41 -05:00
graffy76	475214ab62	Implmented QSettings for loading / saving file definitions. Also renamed opencs.cfg to opencs.ini to follow Ini format standards	2014-05-05 05:56:03 -05:00
Jeffrey Haines	d4812c3af9	fixed placement of else statement	2014-05-04 17:54:33 -04:00
Jeffrey Haines	78f76842a6	Added else statement Its still dodgy though	2014-05-04 16:56:30 -04:00
Jeffrey Haines	7d5dab214c	#58 - Sneak Skill: functional sneaking Removed sneak checking from individual actor update. Added sneak checking to Actors::update()	2014-05-04 16:20:09 -04:00
Jeffrey Haines	a65e8393bb	Merged files	2014-05-04 11:33:27 -04:00
Marc Zinnschlag	df97a1b57f	Merge remote-tracking branch 'sirherrbatka/Feature#1274'	2014-05-04 17:11:43 +02:00
mrcheko	f596b698d9	fixes to slow-down at jump startup and infinite air intertia growth	2014-05-04 18:15:07 +04:00
Marek Kochanowicz	f51f826dad	fixed compilation	2014-05-04 15:13:03 +02:00
Jeffrey Haines	a469444e53	Player can't detect self	2014-05-04 08:05:32 -04:00
Marc Zinnschlag	7f78c29bb5	Merge remote-tracking branch 'sirherrbatka/Feature#1274' Conflicts: apps/opencs/view/world/table.cpp	2014-05-04 14:03:56 +02:00
Marek Kochanowicz	4a502226e6	added flag to distingiush widgets	2014-05-04 12:41:06 +02:00
Marc Zinnschlag	e43913e7c2	Merge remote-tracking branch 'graffy76/master'	2014-05-04 12:17:44 +02:00
Thomas	dbf06d8c8b	Merge remote-tracking branch 'upstream/master' Conflicts: apps/openmw/mwmechanics/aipursue.hpp apps/openmw/mwmechanics/aisequence.hpp	2014-05-04 02:06:43 -04:00
graffy76	3f737bbb44	implemented QDial into RangeView class	2014-05-03 22:02:16 -05:00
graffy76	4f876574c1	Implemented slider widget in rangeView class	2014-05-03 21:50:08 -05:00
graffy76	0a3ab3dcd1	Commented out "proxy selection test" demo page in user settings	2014-05-03 19:48:04 -05:00
graffy76	35d1502308	Merge branch 'master' of https://github.com/OpenMW/openmw merge	2014-05-03 19:16:42 -05:00
graffy76	1c26741c56	Implemented rangeview with spinbox as only control. Simplified setting class constructor.	2014-05-03 18:58:43 -05:00
graffy76	bc6197c552	Added custom spin box class	2014-05-03 18:57:34 -05:00
Thoronador	be89654eef	remove audiere_decoder + mpgsnd_decoder from CMake file for openmw	2014-05-03 22:05:21 +02:00
Thoronador	620a8ccaf3	remove Audiere and MPG123+Sndfile decoder sources	2014-05-03 21:49:57 +02:00
Marek Kochanowicz	00b21449a2	replaced type_cell with type_scene	2014-05-03 19:47:13 +02:00
Jeffrey Haines	e1e23447f2	Removed initial check form setSneak It wasn’t needed.	2014-05-03 13:16:07 -04:00
Jeffrey Haines	05e326bdc3	Added update sneak to actors Intends to check the state of a players sneak by asking the question if each npc can see the player.	2014-05-03 12:48:07 -04:00
scrawl	658c37a299	AiPursue: If we reached the path end, that does not mean we reached the target. Rebuild the path if the target has moved in the meantime. Fixes guards in pursuit activating the dialogue too early. Also tweaked the activation distance.	2014-05-03 17:17:00 +02:00
Marc Zinnschlag	e9c2f24faa	intercept close button clicks in loading window	2014-05-03 17:14:17 +02:00
Marc Zinnschlag	3fdd72f204	added cancel button to loading window	2014-05-03 16:44:50 +02:00
Marc Zinnschlag	6bc5869222	record loading progress bar	2014-05-03 15:33:35 +02:00
Marc Zinnschlag	6692d2dc72	split up load function in a start and continue part	2014-05-03 15:05:02 +02:00
Marc Zinnschlag	0b309d9ef4	Merge branch 'master' into load Conflicts: apps/opencs/view/doc/viewmanager.cpp	2014-05-03 14:36:06 +02:00
Marek Kochanowicz	5e99381019	Drag and drop works.	2014-05-03 14:00:30 +02:00
Marc Zinnschlag	e0e2ad8316	content file loading progress bar	2014-05-03 13:01:29 +02:00
scrawl	7bddfc0025	Fix some spelling mistakes.	2014-05-03 12:23:22 +02:00
scrawl	122e606e30	Crime: improvement to arrest on sight for large bounties iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).	2014-05-03 12:17:44 +02:00
Marc Zinnschlag	e09218f164	moved load code from Document to Loader class	2014-05-03 12:07:05 +02:00
scrawl	7331a64e34	Restore fix for Bug #875 (commit `602be9bbe7`, was broken by `43757efdc4`)	2014-05-03 11:33:20 +02:00
scrawl	1b074e5524	Call setAttacked even if the attack missed. Unsuccessful hits should also evoke a response.	2014-05-02 22:38:39 +02:00
scrawl	df1694c27b	Console autocompletion: List candidates when repeatedly pressing tab (bash-style)	2014-05-02 22:19:02 +02:00
scrawl	92467ba6bc	Fix sunlight for interiors	2014-05-02 21:20:27 +02:00
Marek Kochanowicz	7f1df878f6	make getDropType static and public.	2014-05-02 20:28:28 +02:00
scrawl	8560b43464	Move to esm component	2014-05-02 12:48:07 +02:00
scrawl	f8cc328b5e	Slightly prettier backdrop when loading game from main menu.	2014-05-02 12:48:01 +02:00
scrawl	6381b1e938	Fixes #1309 : Do not allow saving while dialogs are opened, just like vanilla This limitation could be removed post-1.0 by serializing the state of open windows.	2014-05-02 11:20:43 +02:00
scrawl	17bb8d7f9a	Fixes #1252 : Add item/magic keybindings to savegame	2014-05-01 21:16:32 +02:00
Marek Kochanowicz	c2b070f097	trying to do it right.	2014-05-01 19:17:33 +02:00
Marek Kochanowicz	ea1aaef8ca	replace paged with unpaged (and vice versa)	2014-05-01 18:25:28 +02:00
scrawl	fc7e79027a	Fixes #1144 : Don't refreshCurrentAnims when adding already dead actors	2014-05-01 16:55:16 +02:00
scrawl	64a30ad182	Fix another leak	2014-05-01 16:55:16 +02:00
scrawl	6f7fbc867f	Fix several leaks	2014-05-01 16:55:15 +02:00
scrawl	f99eda1a54	Fixes #1302 : Do not attempt to set OnPcAdd before the script has been added	2014-05-01 16:55:15 +02:00
scrawl	5415ca6a63	Fix exception when shift+click on empty space in save dialog	2014-05-01 16:55:15 +02:00
Marek Kochanowicz	d00dbf47d5	working on worldspace drops	2014-05-01 15:09:47 +02:00
Marc Zinnschlag	ab94e70724	more cleanup of document setup	2014-05-01 13:04:48 +02:00
Marek Kochanowicz	57131332f4	fixing minor issues	2014-05-01 12:34:54 +02:00
Marc Zinnschlag	6a809064df	Merge remote-tracking branch 'mrcheko/master'	2014-05-01 10:07:43 +02:00
mrcheko	9e79fb5b87	fix to broken aiwander logic	2014-05-01 11:41:25 +04:00
Marc Zinnschlag	634311c86c	Merge remote-tracking branch 'mrcheko/master'	2014-04-30 22:45:26 +02:00
mrcheko	e8f7d12c01	uninit bool and invalid iterator bugs fixes	2014-04-30 23:57:19 +04:00
Marek Kochanowicz	9e01a54d72	minor correction	2014-04-30 15:17:20 +02:00
Marek Kochanowicz	6aaa15b2e8	paged worldspace drop	2014-04-30 15:03:46 +02:00
Marek Kochanowicz	19dac9dc86	that would be it	2014-04-30 14:27:11 +02:00
Jeffrey Haines	5c9c467b26	Improved sneak.	2014-04-30 08:06:36 -04:00
Jeffrey Haines	14ebd8b110	Fixed logic in commit crime	2014-04-30 07:44:29 -04:00
Marek Kochanowicz	4d79f00e28	enable dragging on the region map cells	2014-04-30 13:32:54 +02:00
Thomas	10a5bb9464	Made code a bit more standardized and added a good bit of documentation.	2014-04-29 23:40:59 -04:00
Marek Kochanowicz	eeb18b533e	moved editlock to the dragrecordtable	2014-04-29 21:41:57 +02:00
Marc Zinnschlag	0c2843b0f7	some missing cleanup	2014-04-29 19:56:33 +02:00
Marek Kochanowicz	d376efe30b	handle dragging not-existing records	2014-04-29 19:34:06 +02:00
Marc Zinnschlag	9a1b5dc1c6	a bit of cleanup	2014-04-29 15:32:00 +02:00
Marc Zinnschlag	f6a876bc3d	added actor ID	2014-04-29 15:27:49 +02:00
cc9cii	7d990abd37	OpenCS changes to allow compilation with MSVC 11.0.	2014-04-29 22:46:55 +10:00
Marc Zinnschlag	8dc6ad5059	moved new flag from setupData function to Document constructor	2014-04-29 14:27:44 +02:00
Marc Zinnschlag	5f1d2f72f6	added basic loading GUI	2014-04-29 14:17:25 +02:00
Marc Zinnschlag	2906ade531	string fix	2014-04-29 13:16:58 +02:00
Marc Zinnschlag	4eeed4e2c7	Merge remote-tracking branch 'scrawl/return'	2014-04-29 12:27:27 +02:00
Marek Kochanowicz	18fc8acc71	able to drag existing cells from the regionmap	2014-04-29 12:27:26 +02:00
Marek Kochanowicz	853abb65c3	added new, later common, base for the regionmap and the table	2014-04-29 11:44:21 +02:00
scrawl	28ef236f0e	Don't allow setting a new return position if there already is one and we haven't reached it yet	2014-04-29 11:17:07 +02:00
Marc Zinnschlag	8fea2cfa2a	Merge remote-tracking branch 'mrcheko/master'	2014-04-29 10:03:29 +02:00
scrawl	1fd7a07b5e	Merge branch 'master' of https://github.com/OpenMW/openmw into return Conflicts: apps/openmw/mwmechanics/aisequence.cpp apps/openmw/mwmechanics/aiwander.cpp	2014-04-29 09:14:13 +02:00
scrawl	9b36a13821	Feature #1289 : NPCs return to default position Make stationary NPCs return to their previous position once combat/crime AI finishes.	2014-04-29 09:09:51 +02:00
scrawl	3780503275	Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar	2014-04-29 07:07:03 +02:00
Marc Zinnschlag	3013c34d9b	Merge remote-tracking branch 'scrawl/master'	2014-04-28 21:46:05 +02:00
scrawl	7a0aeeaa38	Allow to delete savegames (shift + click)	2014-04-28 20:57:45 +02:00
scrawl	7f37f2c2be	Fixes #1187 : Make GetDistance handle actors in remote cells gracefully	2014-04-28 19:23:25 +02:00
Marc Zinnschlag	2e7b4e798e	Merge remote-tracking branch 'digmaster/master'	2014-04-28 19:22:54 +02:00
scrawl	a35f7c73ae	Fixes #1286 (Dialogue topic list clips with window frame) The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size. Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.	2014-04-28 18:40:29 +02:00
scrawl	518a32c19d	Fixes #1195 : Make NPCs equip torches in interiors under certain conditions	2014-04-28 18:33:42 +02:00
Thomas	885228ec02	Merge remote-tracking branch 'upstream/master' Conflicts: apps/openmw/mwmechanics/actors.cpp	2014-04-28 12:27:57 -04:00
Lars Söderberg	04e5b9c72c	Right aligned version/revision I've always felt that having the version/revision text at the bottom center in the main menu was a bit out of place. A more common place for this kind of thing is in one of the corners. I chose bottom right. Aditionally I right aligned it and changed the v and r in version and revision to capital letters. Comments?	2014-04-28 16:23:07 +02:00
scrawl	84961d7843	Fixes #1254 : PcRank should return first rank if not in the faction	2014-04-28 15:31:18 +02:00
scrawl	b2119441b9	Fix bug in PcRank / PcNextRank It was using the first faction instead of the actor's faction.	2014-04-28 15:26:40 +02:00
Marc Zinnschlag	421679b319	Merge remote-tracking branch 'scrawl/master'	2014-04-28 15:13:09 +02:00
scrawl	7e4a0c2478	Removed asserts	2014-04-28 15:00:52 +02:00
mrcheko	35c1724d39	unblock vertical aiming for combatants	2014-04-28 16:34:49 +04:00
scrawl	0796815da0	Ignore dead actors in getActorsFollowing/Fighting Prevents dead enemies from disallowing resting near them	2014-04-28 11:44:56 +02:00
scrawl	27a05027f4	Fixes #1172 : Added basic loading/saving progress bar The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.	2014-04-28 11:29:57 +02:00
Marc Zinnschlag	0b2371a05d	Merge remote-tracking branch 'thoronador/fix-minor-stuff'	2014-04-28 10:59:34 +02:00
Marc Zinnschlag	af322a9f77	Merge remote-tracking branch 'scrawl/master'	2014-04-28 10:48:57 +02:00
scrawl	1da99d9fc7	Remove unused variable	2014-04-28 10:26:24 +02:00
scrawl	b89463db09	Fix #1207 : Remember previous choice in class creation dialog	2014-04-28 09:12:03 +02:00
scrawl	1da19585dc	Remove some unneeded includes	2014-04-28 07:49:08 +02:00
Thomas	dc54bd5a5f	Merge remote-tracking branch 'upstream/master'	2014-04-27 20:56:45 -04:00
Thomas	c2127845af	Added onKnockdown command	2014-04-27 20:54:22 -04:00
Thoronador	f69d61976e	minor performance improvements in other apps subdirectories	2014-04-27 23:25:02 +02:00
mrcheko	22cdb166f2	warning fix, vars renaming	2014-04-27 22:38:04 +04:00
Thoronador	1b8c975d5b	minor performance improvements in apps/openmw Checking for emptiness using size() might be inefficient, because it can take linear time, while empty() is guaranteed to take only constant time. For non-primitive types, postfix ++ operators are inefficient compared to prefix ++ operators, because post-increment usually involves keeping a copy of the previous value around.	2014-04-27 19:10:23 +02:00
Marc Zinnschlag	ca097e146b	Merge remote-tracking branch 'jeffreyhaines/master'	2014-04-27 17:35:10 +02:00
Jeffrey Haines	edbc319c42	fixed logic. \|\|	2014-04-27 10:05:34 -04:00
Jeffrey Haines	52bb7c3f69	fixed logic. !	2014-04-27 09:55:38 -04:00
Jeffrey Haines	7599b26d30	Fixed: creatures won't witness crimes and potential crash.	2014-04-27 09:37:43 -04:00
Jeffrey Haines	0409e18a0e	revert	2014-04-27 09:35:49 -04:00
Jeffrey Haines	b9bd4bc126	broken	2014-04-27 09:34:59 -04:00
Jeffrey Haines	ce106d3bec	Revert "NPCs detect crime exclusively" This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72. Conflicts: apps/openmw/mwmechanics/mechanicsmanagerimp.cpp	2014-04-27 09:34:33 -04:00
mrcheko	82121e0401	some checks reworked	2014-04-27 16:59:21 +04:00
scrawl	e42855d522	Minor fix for spell icon	2014-04-27 12:54:18 +02:00
mrcheko	6a3dddfb9a	merge master	2014-04-27 13:49:31 +04:00
Marc Zinnschlag	85dbf393d2	Merge remote-tracking branch 'graffy76/master'	2014-04-27 11:44:15 +02:00
scrawl	3eb1e4e117	Fixes #1241 : Removed disposition-based combat conditions The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate. The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack. Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack. Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).	2014-04-27 09:43:54 +02:00
scrawl	dac0b7090a	Get rid of bigbars.png and smallbars.png Changed loading bar colour to match vanilla	2014-04-27 09:43:48 +02:00
scrawl	3161647809	Fix for not being able to pick up scrolls during combat This is the behaviour I observed in vanilla morrowind.	2014-04-27 09:15:37 +02:00
scrawl	d92f95f5bf	Fix a stacking issue	2014-04-27 06:08:15 +02:00
scrawl	93b76a603b	Fixes #1100 : Looting a corpse is no longer considered stealing	2014-04-27 06:08:08 +02:00
graffy76	985af15a12	removed qdebug references	2014-04-26 21:43:59 -05:00
graffy76	0d711e51b0	Converted SettingType enums to indicate widget type.	2014-04-26 21:32:36 -05:00
scrawl	e8210c92c6	Fixes #1240 : Don't hardcode drowning time	2014-04-27 04:27:26 +02:00
graffy76	b94466dbb4	Merge branch 'master' of https://github.com/OpenMW/openmw merge	2014-04-26 21:24:02 -05:00
cc9cii	1fb2c8d87b	NPC turning is less hacky but still not perfect. NPC's should walk away after a period of non-action by the player (vanilla behaviour) - not yet implemented.	2014-04-27 07:38:31 +10:00
Thomas	c2b692e124	getActorsFollowing/Fighting no longer returns dead actors	2014-04-26 17:21:53 -04:00
mrcheko	dbe1307de0	code refining + minor fixes	2014-04-26 22:21:20 +04:00
Marc Zinnschlag	5e7cd806c4	Merge remote-tracking branch 'scrawl/master'	2014-04-26 18:05:04 +02:00
scrawl	04964595ef	Fixes #1270 , Fixes #1201 : Update active weapon/spell icons every frame	2014-04-26 16:44:20 +02:00
graffy76	ab33e78b67	Added RangeView class files	2014-04-26 09:40:58 -05:00
scrawl	d5dd864404	Fixes #1236 : Disable all controls while playing movie	2014-04-26 14:33:45 +02:00
scrawl	30666f2cce	Fixes #1297 : Store global map markers in savegame	2014-04-26 13:42:32 +02:00
Marc Zinnschlag	ddb0496dca	replaced return value of removeDocument with a signal	2014-04-26 13:11:27 +02:00
scrawl	f921f2e7db	Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last. This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.	2014-04-26 12:04:37 +02:00
scrawl	ef39b0f6ab	Fixes #1291 : Faction rank saving issue A value of 0 is the first rank, -1 means not a member	2014-04-26 11:41:44 +02:00
scrawl	45d2a00717	Fixes #1293 : Allow interpolation type 0 in case of 0 keys	2014-04-26 11:36:27 +02:00
scrawl	b13b25dd1b	Fixes #1295 : Support partial matches in Cell filter	2014-04-26 11:03:17 +02:00
scrawl	6eca5ac4bb	Fixes #1296 : Streamlined cellChanged detection	2014-04-26 07:46:19 +02:00
scrawl	cd1b4218e7	Fix dynamically placed objects being discarded when loading game	2014-04-26 05:01:26 +02:00
scrawl	f05606657c	Correctly insert pasted text at cursor position	2014-04-26 05:01:26 +02:00
scrawl	91e50585ff	AiWander: make sure to walk, not run	2014-04-26 05:01:26 +02:00
scrawl	5b011e43a7	Fix a crash after loading game	2014-04-26 05:01:26 +02:00
mrcheko	f3626adc86	remake of z-moving in combat for flying/swimming enemies	2014-04-26 00:20:55 +04:00
Marc Zinnschlag	42b332775a	removed some debug statements	2014-04-25 15:30:46 +02:00
Marc Zinnschlag	c63d6437c0	Merge remote-tracking branch 'jeffreyhaines/master' Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp	2014-04-25 15:29:23 +02:00
Marc Zinnschlag	837fd2a4c6	Merge remote-tracking branch 'graffy76/master'	2014-04-25 15:11:19 +02:00
graffy76	2e06414b43	Fixed broken delegate display modes (Display Format settings). Moved UserSetting update functions to DataDisplayDelegate.	2014-04-25 07:16:40 -05:00
Marc Zinnschlag	1f6ed584c2	Merge remote-tracking branch 'digmaster/master' Conflicts: apps/openmw/mwstate/statemanagerimp.cpp	2014-04-25 08:39:40 +02:00
Jeffrey Haines	4a4c08946c	Checks the state of the passed sneak variable	2014-04-24 23:02:11 -04:00
Thomas	f3272c941f	Fix for bug #1080 , can't read/repair/make potions/use soul gems/rest/sleep while in combat. The radius for being in combat with the player is fAlarmDistance, which looked like the only pertinent thing.	2014-04-24 22:47:45 -04:00
Jeffrey Haines	42b879a9a5	Reworked the accusation of actors	2014-04-24 22:41:05 -04:00
Jeffrey Haines	c3e08916da	Sneak: Added support for state checking I need advice one what I should do in order to pass mActors over to the player. Particularly line 139 in player.cpp	2014-04-24 20:40:17 -04:00
graffy76	3f2ae950f5	Disabled view resize for open views when user setting changes. Fixed new view size issue to match existing user settings.	2014-04-24 12:50:10 -05:00
Marc Zinnschlag	dbb192f084	moved loading to a separate thread	2014-04-24 15:09:25 +02:00
Marc Zinnschlag	9db9ad410d	fixed checks for allowing load/save and some general cleanup	2014-04-24 10:14:17 +02:00
Marc Zinnschlag	760c8c7214	removed a redundant include	2014-04-24 09:56:51 +02:00
Marc Zinnschlag	42b3233bda	removed a redundant check	2014-04-24 09:54:47 +02:00
Thomas	5b681e2199	Moved quickload to statemanager for consistency's sake, as well as make autosave only occur on sleep, not wait.	2014-04-24 03:14:47 -04:00
Thomas	05b21c92af	Moved quick save into statemanager class. Kept loader as is as it's rather specalized.	2014-04-24 03:06:36 -04:00
Thomas	6a8bf71c4c	Moved autosave to before you rest, not after it.	2014-04-23 23:33:57 -04:00
Thomas	a598060071	Added autosave on rest, as well as an option in the settings menu	2014-04-23 23:12:30 -04:00
Thomas	682c395488	Apparently a normal save must exist for some reason, calling for a character to be made doesn't cause the signature to be created, and I don't know how to force create the signature (It's kinda driving me nuts)	2014-04-23 21:39:25 -04:00
Thomas	49620968b9	Disallowed quicksave/load in character creation	2014-04-23 21:21:11 -04:00
Thomas	e873135da7	Missed a debug message	2014-04-23 21:04:52 -04:00
Thomas	f90810223a	Added quicksave and quickload	2014-04-23 21:02:09 -04:00
graffy76	ce56669339	Fixed failed signal/slot connection between UserSettings and CSVWorld::SubView	2014-04-23 17:02:37 -05:00
Thomas	ee581f593b	Fixed issue which may occur if there's no evidence chest nearby	2014-04-23 13:20:43 -04:00
Thomas	f6deca7c80	Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors	2014-04-23 13:02:51 -04:00
Thomas	61341d4206	Removed mLocked, kept it as "Negative lock level means unlocked"	2014-04-23 10:00:18 -04:00
graffy76	8c6c70ee9c	Merge branch 'master' of https://github.com/graffy76/openmw	2014-04-23 07:05:34 -05:00
Thomas	6022ffbd1f	Evidence chest now locks when new evidence is added to it	2014-04-23 05:54:18 -04:00
Thomas	420163d35f	Small changes to lock command (If no valid lockLevel exists, defaults to 100)	2014-04-23 05:19:34 -04:00
Thomas	cac8e52154	Seperated locked and lock level, to allow for relocking doors to previous lock level. The data is stored in the esm as -lockLevel if unlocked; lockLevel if locked. While not tested, it should not present any problems.	2014-04-23 05:12:07 -04:00
Thomas	e71a119c23	Made aifollowers run when long distances (800 or 10000, depending) from what they're following.	2014-04-23 02:57:48 -04:00
graffy76	4b607d658f	Re-link user settings to editor main application	2014-04-22 22:19:53 -05:00
graffy76	e3384e3999	relocate support.hpp / remove support.cpp	2014-04-22 22:19:03 -05:00
graffy76	331df17b48	Added new framework files	2014-04-22 22:17:19 -05:00
graffy76	d3148555fa	Delete old framework files	2014-04-22 22:16:14 -05:00
mrcheko	fbd0ffe86f	enable z-moving for flying/water combatants	2014-04-22 22:59:39 +04:00
scrawl	9998c2783e	Fix travis Why again do we need a unit test for something that was never used?	2014-04-21 17:37:06 +02:00
Marc Zinnschlag	e324450118	replaced return value of DocumentManager::addDocument with a signal	2014-04-21 09:02:58 +02:00
mrcheko	f811abb752	pathgrid shortcutting extended	2014-04-20 20:35:07 +04:00
Marc Zinnschlag	86bd2f48dc	removed an unused function	2014-04-20 17:28:10 +02:00
Marc Zinnschlag	0eed697f9a	Merge remote-tracking branch 'digmaster/master'	2014-04-20 13:36:39 +02:00
Marc Zinnschlag	a91b386381	Merge remote-tracking branch 'jeffreyhaines/master'	2014-04-20 13:34:58 +02:00
cc9cii	6a1435c49e	Remove rotation check that was freezing NPC's.	2014-04-20 17:59:08 +10:00
cc9cii	e17fab891d	Suppress travis warning and one more tweak.	2014-04-20 16:49:57 +10:00
Thomas Luppi	d6f1f129eb	Forgot to capitalize something. whooooops dat y do	2014-04-20 00:39:50 -04:00
Thomas Luppi	95ef874205	Gets default keybindings from scancode, not keyvalue. Gives keyboard set-up independant default keybindings; useful for international keyboards or dvorak users	2014-04-20 00:34:58 -04:00
cc9cii	2b544d550b	Fixed the rotation animation glitch.	2014-04-20 14:27:18 +10:00
cc9cii	000afa48b7	An attempt at making turning animation smoother. Copied some code from AiCombat for rotation.	2014-04-20 11:59:47 +10:00
cc9cii	3d26702f5e	Make idle actors face the player. Turning animation is not smooth.	2014-04-20 10:36:01 +10:00
cc9cii	9bd31b6236	Added reaction time and moved game setting variables init to the constructor.	2014-04-20 10:06:03 +10:00
Jeffrey Haines	3484df0743	Fixed garage value found in beta's static analysis Source: https://forum.openmw.org/viewtopic.php?f=6&t=2059#p23844	2014-04-19 19:42:49 -04:00
Jeffrey Haines	6733a1541e	Fixes to Crime System Victimless crimes were removed because victims may not exist in the case of stealing items. Is class now uses case insensitive comparison. Fixed issue with confiscation of stolen items.	2014-04-19 19:03:31 -04:00
cc9cii	3dfd08cf2d	Cleanup and little tweaking.	2014-04-20 08:31:02 +10:00
cc9cii	479a94b35d	Backing off closed doors working, needs cleanup and tweaking.	2014-04-20 08:14:54 +10:00
Marc Zinnschlag	7eb6a2e52d	Merge remote-tracking branch 'scrawl/alarm'	2014-04-18 16:19:28 +02:00
Marc Zinnschlag	34092f9f5d	Merge remote-tracking branch 'scrawl/master'	2014-04-18 15:08:30 +02:00
scrawl	b3916e7744	Crime: mark witnesses as alarmed. Fixes guard dialogue to properly detect if the player turned himself in.	2014-04-18 13:44:09 +02:00
scrawl	4625adfb7f	Fix typo in a condition.	2014-04-18 11:43:37 +02:00
cc9cii	7437647f70	Forgot to add a guard :-(	2014-04-18 16:45:31 +10:00
cc9cii	a0fc514df7	Suppress compiler warning.	2014-04-18 15:45:39 +10:00
cc9cii	c652cb1568	More cleaning up.	2014-04-18 15:19:22 +10:00
cc9cii	2447f0f4aa	Cleaned up logging statements.	2014-04-18 14:41:44 +10:00
cc9cii	aad13d315c	Fixed issue where allowed nodes were being erased. PathFinder was returning an empty path if the closest pathgrid point to the start was also the closest pathgrid point to the goal. Still need to clean up and remove logging statements.	2014-04-18 14:41:44 +10:00
cc9cii	d3be725ee7	Actors are moved on if idling near a closed interior door. Unreachable pathgrid points due to a closed door are removed from the allowed set of points.	2014-04-18 14:41:43 +10:00
cc9cii	1ceeeb4a22	Fix movement glitches for actors with low speeds (e.g. a rat). Was caused by false detection of being stuck.	2014-04-18 14:41:43 +10:00
Marc Zinnschlag	65161c3e24	Merge remote-tracking branch 'sirherrbatka/less-signals'	2014-04-16 10:22:20 +02:00
Marc Zinnschlag	ce33912980	Merge remote-tracking branch 'sirherrbatka/AngryFix'	2014-04-16 10:21:59 +02:00
Marc Zinnschlag	a7cece3d30	do not generate modfiy commands on edits to change a cell to a value equal its original value before the edit	2014-04-15 22:34:15 +02:00
Marek Kochanowicz	8fba71101c	removed signals	2014-04-15 20:39:19 +02:00
Marek Kochanowicz	fc1837e2ed	fixed bug: regions can be dragged ps fuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu	2014-04-15 19:26:43 +02:00
Marc Zinnschlag	30d5040f2f	Merge remote-tracking branch 'cc9cii/Bug-No-1260'	2014-04-15 15:26:58 +02:00
cc9cii	1fc030653f	Avoid hard coding "thief.dds" string.	2014-04-15 22:30:41 +10:00
Marc Zinnschlag	86e65944b8	Merge remote-tracking branch 'jeffreyhaines/master' Conflicts: apps/openmw/CMakeLists.txt	2014-04-15 11:31:48 +02:00
Jeffrey Haines	e2fab228f9	Save state is handled correctly now.	2014-04-14 18:11:04 -04:00
mrcheko	4e7ee97050	fix for windows builds	2014-04-14 17:18:29 +04:00
cc9cii	89be1069a7	Bug #1260 : show thief.dds image for a custom class level up menu	2014-04-14 18:31:46 +10:00
Marc Zinnschlag	71068ae3ad	Merge branch 'regionmap'	2014-04-13 17:24:08 +02:00
Marc Zinnschlag	d188e68227	added f-type hint to TableSubView	2014-04-13 16:40:41 +02:00
Marc Zinnschlag	097c063b8a	added 'view in table' action to region map	2014-04-13 16:40:16 +02:00
Marc Zinnschlag	2eca9e72fd	added view action to region map	2014-04-13 15:46:31 +02:00
Marc Zinnschlag	1892550833	added set/unset region actions to region map	2014-04-13 15:32:49 +02:00
Marc Zinnschlag	fc4195a88f	added create cell menu item to regionmap	2014-04-13 14:17:18 +02:00
Marc Zinnschlag	19b31c4146	always use the cell ID instead of the exterior coordinate fields from the original cell struct	2014-04-13 14:16:59 +02:00
Marc Zinnschlag	decd4270d9	added CellId role to RegionMap model	2014-04-13 13:59:27 +02:00
cc9cii	966ed46870	Better performance but less tolerant of collision induced glitches. Also had to use const_cast to cache on ground status.	2014-04-13 18:34:08 +10:00
cc9cii	3e6e325e5b	Instead of hacking character.cpp, provide a more reliable check for world->isOnGround(mPtr).	2014-04-13 14:53:36 +10:00
cc9cii	e9be6d3f42	Fix falling animation where vec.z is set to zero.	2014-04-13 11:34:59 +10:00
cc9cii	0bef754873	Fix jumping animation glitches caused by minor vertical movements. Should resolve Bug #1271 .	2014-04-13 08:46:02 +10:00
Marc Zinnschlag	2f63eb7ca4	added missing edit lock for record reordering	2014-04-12 20:07:09 +02:00
cc9cii	d2a41167d0	Allow flying and swimming creatures to step inclines. Should have listen to Chris in the first place, see https://forum.openmw.org/viewtopic.php?f=6&t=2075	2014-04-11 21:24:00 +10:00
Marc Zinnschlag	d0ea23431c	replaced CellIndex typedef with new CellCoordinates class	2014-04-11 10:06:16 +02:00
Marc Zinnschlag	0516d95253	added context menu with selection functions to region map	2014-04-10 22:12:09 +02:00
Marc Zinnschlag	7f12733463	Merge remote-tracking branch 'potatoesmaster/1071'	2014-04-08 21:08:59 +02:00
Emanuel Guevel	09bd0324c9	Fail properly when a content file is not found	2014-04-08 20:19:09 +02:00
Marc Zinnschlag	d205d5f0af	Merge branch 'cellselect'	2014-04-08 09:58:00 +02:00
Marc Zinnschlag	e0550ba336	allow multiple cell coordinates in c-type hint for scene subviews	2014-04-07 15:23:14 +02:00
Marc Zinnschlag	0d352cb883	replaced rectangular cell selection with a CellSelection object	2014-04-07 14:16:02 +02:00
Marc Zinnschlag	67965ec10c	added CellCoordinates and CellSelection classes	2014-04-07 13:44:43 +02:00
Marc Zinnschlag	324b2743d4	removed grid button (discarding the first attempt at a cell selector)	2014-04-07 10:21:26 +02:00
Marc Zinnschlag	03b3487f1b	minor cleanup	2014-04-07 09:56:36 +02:00
Marc Zinnschlag	fafb7501e3	Merge remote-tracking branch 'cc9cii/PathFinder-split'	2014-04-07 09:48:15 +02:00
Emanuel Guevel	ce7aa96371	Fix visual glitch happening when closing inventory while sneaking (bug #1255)	2014-04-06 22:21:28 +02:00
Marc Zinnschlag	c7f2cfeca0	Merge remote-tracking branch 'gus/AIFix2'	2014-04-06 15:13:30 +02:00
Jeffrey Haines	a274b48f2f	States are saved. Crime is reacted to. Issues where some crime is ignored. Needs a lot more work	2014-04-05 22:45:40 -04:00
Jeffrey Haines	940c88d2ec	Cleaned up code, implemented crime ids There is a problem with my game freezing. ToggleAi stops my character	2014-04-05 10:26:14 -04:00
Marc Zinnschlag	0fe67b586a	increased scene toolbar button size	2014-04-05 13:16:13 +02:00
Jeffrey Haines	df5cbe5dec	Minor changes	2014-04-04 08:10:35 -04:00
cc9cii	28f7c42fb7	One more comment fix.	2014-04-04 18:17:42 +11:00
cc9cii	f59226265a	Remove redundant parameter from aStarSearch. Also update some comments.	2014-04-04 18:10:06 +11:00
Jeffrey Haines	70919ba60a	Removed witnesses and minor changes	2014-04-03 16:13:14 -04:00
cc9cii	5cf8e7e933	Remove logging.	2014-04-04 06:16:26 +11:00
cc9cii	040d4f8fc4	Move PathgridGraph into separate files.	2014-04-04 06:13:47 +11:00
Jeffrey Haines	0c957a3cde	Added witnesses to the mix	2014-04-03 14:53:31 -04:00
Marc Zinnschlag	baf30ba292	added grid tool (does not work yet)	2014-04-03 14:44:48 +02:00
cc9cii	a8b2eb1fe9	Make Travis happy.	2014-04-03 22:49:22 +11:00
Marc Zinnschlag	3a58da9ad7	size adjustment	2014-04-03 13:30:22 +02:00
cc9cii	325d0616bb	Cleanup debug statements.	2014-04-03 22:17:45 +11:00
Marc Zinnschlag	5d422fec8a	fixed scene toolbar layout problems	2014-04-03 13:00:19 +02:00
cc9cii	98f77714ce	Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder. This version still has debugging statements and needs cleaning up.	2014-04-03 21:43:44 +11:00
Jeffrey Haines	b1abef7a38	Cleaned up code	2014-04-03 01:07:56 -04:00
Jeffrey Haines	58b135a2be	Crime is now checked every frame call	2014-04-03 00:50:09 -04:00
cc9cii	f597d3e88b	Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).	2014-04-03 07:46:26 +11:00
Jeffrey Haines	510f2d10ac	Replaces broken code with todo	2014-04-02 14:20:33 -04:00
Jeffrey Haines	6f1211dd8d	Moved mWitnesses into Player. resetCrime for paying fine.	2014-04-02 12:23:38 -04:00
Jeffrey Haines	7c0b51fb7e	Ai pursue now controls guards pursuit of crimes Should extend AiActivate in the future	2014-04-02 00:18:22 -04:00
Jeffrey Haines	50dac98a2b	Feature 1154 & 73: Crime and NPC reactions	2014-04-01 20:24:25 -04:00
Jeffrey Haines	4037f3705e	Feature 1154 & 73: NPCs react to crime	2014-04-01 14:15:55 -04:00
Marc Zinnschlag	5b5069535e	keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly	2014-04-01 10:04:14 +02:00
Marc Zinnschlag	12e46c5dc7	Merge remote-tracking branch 'megaton/master'	2014-03-31 10:24:12 +02:00
Marc Zinnschlag	4ee1069baa	Merge remote-tracking branch 'scrawl/master'	2014-03-31 10:11:54 +02:00
scrawl	f5810b8e1c	Consider aspect ratio for loading screen background More consistent with the main menu.	2014-03-30 23:07:49 +02:00
scrawl	1265131203	Set the selected index after all items are added (workaround for MyGUI bug)	2014-03-30 20:07:43 +02:00
megaton	50af9bc0d3	General perfomance optimizations.	2014-03-30 19:45:27 +04:00
cc9cii	d04bb3befb	MSVC uses C version of locale.	2014-03-30 17:23:22 +11:00
Jeffrey Haines	8ce938c6f1	Revert 6b28c06..98fd381 This rolls back to commit `6b28c06b2c`.	2014-03-29 22:26:53 -04:00
Jeffrey Haines	98fd381564	Feature #1154 Not all NPCs get aggressive when one is attacked Compiling fix	2014-03-29 21:25:20 -04:00
Jeffrey Haines	6c866deb1b	Feature #1154 Not all NPCs get aggressive when one is attacked Partially implemented	2014-03-29 21:23:34 -04:00
scrawl	5eeed03f5b	Only exchange bribe gold if the bribe was accepted	2014-03-30 00:12:31 +01:00
scrawl	72df9e77c6	Don't show version text in the pause menu	2014-03-30 00:07:32 +01:00
gus	d9ea7107b7	compile fix.	2014-03-29 18:36:32 +01:00
gus	bee057346b	Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2 Conflicts: apps/openmw/mwmechanics/aifollow.cpp	2014-03-29 18:05:56 +01:00
Marc Zinnschlag	adab85eeb7	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-29 13:29:06 +01:00
Jeffrey Haines	6b28c06b2c	Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe	2014-03-29 07:47:41 -04:00
Jeffrey Haines	ad9286a30f	Revert "Revert "made mReceiver private"" This reverts commit `33aecc5218`.	2014-03-29 07:45:56 -04:00
Jeffrey Haines	33aecc5218	Revert "made mReceiver private" This reverts commit `3e8f7b3bae`.	2014-03-29 07:45:36 -04:00
Marc Zinnschlag	c7b969821f	silenced a warning	2014-03-29 11:11:43 +01:00
Marc Zinnschlag	27095f3edb	Merge remote-tracking branch 'cc9cii/AiWander-improvements'	2014-03-29 11:08:51 +01:00
cc9cii	ebb1813b9b	Minor comment clarification.	2014-03-29 20:17:04 +11:00
cc9cii	07fd801d94	My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points. There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily. The check mCell != cell in buildPath() is being triggered frequently. Not sure why.	2014-03-29 19:35:52 +11:00
cc9cii	267855c44e	Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now.	2014-03-29 19:35:52 +11:00
cc9cii	90a813ad2c	Allow interrupting a walking NPC to trigger a greeting.	2014-03-29 19:35:52 +11:00
Marc Zinnschlag	04baa4a573	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-29 08:14:04 +01:00
Jeffrey Haines	3e8f7b3bae	made mReceiver private	2014-03-29 02:59:47 -04:00
Jeffrey Haines	13d330e427	Feature #1233 Bribe gold not in inventory Gold is now put into inventory receivers when bribing.	2014-03-28 21:16:42 -04:00
Marc Zinnschlag	86e5179fd8	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-28 22:40:12 +01:00
Jeffrey Haines	9efef31bb8	Feature #953 Trader Gold - Unused code/warning resolved Removed unused code getBaseGold throws proper error	2014-03-28 17:27:23 -04:00
Marc Zinnschlag	c38812d026	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-28 19:34:40 +01:00
Jeffrey Haines	401d21b4ee	getBaseGold implemented in MWWorld::Class for NPC and Creature Implemented a getBaseGold() to get the vendor gold base NPC gold base now can come from mNpdt12 and mNpdt52	2014-03-28 14:21:38 -04:00
Jeffrey Haines	895748f18d	Gold Pool implemented for Vendors It appears that my solution breaks persuasion gold for some reason. I may be wrong. I can’t see where this could be happening as the files I’ve changes should not affect persuasion at all.	2014-03-28 12:01:56 -04:00
Marc Zinnschlag	2c2106205d	Merge remote-tracking branch 'scrawl/master'	2014-03-28 09:56:35 +01:00
scrawl	d7df9cae21	Bug #1224 : Changed fix to potentially allow for language independent saves	2014-03-27 22:32:42 +01:00
scrawl	4f852daf45	Don't play company logo when using --skip-menu	2014-03-27 19:59:33 +01:00
scrawl	f2cd37edd0	Play company logo movie	2014-03-27 19:51:48 +01:00
scrawl	5906d795c0	Refactored video player (now a MyGUI widget)	2014-03-27 19:10:15 +01:00
scrawl	2e4ef93b28	Add proper main menu (background image, logo animation, title music)	2014-03-27 15:25:01 +01:00
Marc Zinnschlag	5c81f20f46	Merge remote-tracking branch 'rohitnirmal/load-weap-icon'	2014-03-27 14:57:55 +01:00
Marc Zinnschlag	ce792cf182	Merge branch 'light'	2014-03-27 14:39:40 +01:00
Marc Zinnschlag	50f1679a4c	Merge remote-tracking branch 'jeffreyhaines/master'	2014-03-27 13:40:06 +01:00
Jeffrey Haines	6896142db1	Trader Gold Reset Delay Trade Time initialized to 0 Gold pot set correctly for npc’s and creatures	2014-03-27 07:30:24 -04:00
Marc Zinnschlag	53c4878d52	fix for inconsistent case in topic records	2014-03-27 10:01:42 +01:00
Jeffrey Haines	2a8bf46607	Trader Gold Reset Delay Implemented traded gold reset delay. Note: Traders gold pool is still in inventory.	2014-03-27 01:23:56 -04:00
Rohit Nirmal	e695890e01	Only update the icon if player is NOT unarmed, to avoid bad dereference.	2014-03-26 21:53:35 -05:00
Rohit Nirmal	bcacdc49af	Update weapon icon in HUD when save is loaded.	2014-03-26 21:08:31 -05:00
scrawl	27956f3624	Savegame dialog: Hide main menu after successful load	2014-03-27 02:36:21 +01:00
scrawl	e5e1e84c52	Ask for confirmation to exit OpenMW	2014-03-26 22:05:21 +01:00
scrawl	a5598e9c2e	Add Credits button to main menu (plays mw_credits.bik)	2014-03-26 21:38:57 +01:00
scrawl	23f4bbc5b0	Videoplayer: only pause previous sounds if there is an audio stream	2014-03-26 21:36:57 +01:00
scrawl	5562c78ac4	Ask for confirmation when selecting 'New Game'	2014-03-26 21:11:39 +01:00
scrawl	ecfaa41e93	Savegame dialog: use locale-aware datetime format	2014-03-26 20:56:39 +01:00
scrawl	53ba23e303	Fixes #1224 : Store class name instead of id in savegame header	2014-03-26 19:56:12 +01:00
scrawl	793649c854	ToggleAI: Report current status on toggle	2014-03-26 19:55:52 +01:00
scrawl	688415ce54	Play deathknockout/deathknockdown animations when appropriate	2014-03-26 18:55:16 +01:00
Marc Zinnschlag	ed524b2fd4	added bright lighting mode	2014-03-26 18:29:15 +01:00
Marc Zinnschlag	9746f8bd32	added night lighting mode	2014-03-26 17:59:42 +01:00
Marc Zinnschlag	fa29942b27	added day lighting mode	2014-03-26 17:47:56 +01:00
Marc Zinnschlag	d5506172e8	added lighting switching	2014-03-23 15:14:26 +01:00
Marc Zinnschlag	205354ba30	some ambient light cleanup	2014-03-23 13:40:56 +01:00
Marc Zinnschlag	1b6b4e3442	Merge remote-tracking branch 'slothlife/weather_save'	2014-03-23 08:36:45 +01:00
cc9cii	772a49b2a6	Just some notes for future maintenance.	2014-03-23 13:38:11 +11:00
scrawl	0a17245633	Refactored settings window	2014-03-22 19:02:14 +01:00
Marc Zinnschlag	87ae03b5d4	fix for previous commit	2014-03-22 16:39:24 +01:00
Marc Zinnschlag	6bd3b3ee78	include local variable state in saved games	2014-03-22 15:00:49 +01:00
Marc Zinnschlag	4d80bc009a	Merge remote-tracking branch 'scrawl/master'	2014-03-22 09:54:42 +01:00
scrawl	0c207f7212	Fix build error	2014-03-22 02:08:09 +01:00
scrawl	394284d0f8	Fixes #1209 : Tarhiel never falls There are a few pitfalls with this code: - Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?) - The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.	2014-03-22 02:08:04 +01:00
Alexander "Ace" Olofsson	317f1e0b63	Update dialoguesubview.cpp That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)	2014-03-21 13:44:01 +01:00
Marc Zinnschlag	41fd94b160	compensated for different coordinate systems	2014-03-21 13:39:22 +01:00
Marc Zinnschlag	1e57d55717	update/close on deletion of reference/referenceable	2014-03-21 13:27:46 +01:00
Marc Zinnschlag	698fe8cce3	update preview title on changed referenceableID (preview for references only)	2014-03-21 12:52:46 +01:00
Marc Zinnschlag	58daf52a67	deal with empty and invalid referenceable ID fields	2014-03-21 12:44:06 +01:00
Marc Zinnschlag	1a9df4bc56	Merge branch 'preview'	2014-03-21 12:35:40 +01:00
Marek Kochanowicz	2a26ff2299	better fix	2014-03-21 12:13:54 +01:00
Marc Zinnschlag	fc8ae2b9b5	fixed encoding problems	2014-03-21 11:56:48 +01:00
Marc Zinnschlag	10ce47938b	update preview on reference/referenceable changes	2014-03-21 11:22:43 +01:00
Marc Zinnschlag	2128d3008c	Merge branch 'master' into preview	2014-03-21 08:12:06 +01:00
slothlife	6dce3e5186	Fixed include to use C99 header, not C++11 header	2014-03-21 01:33:11 -05:00
slothlife	6eab9c5179	Move weather state save/load to a new class	2014-03-21 01:19:40 -05:00
Rohit Nirmal	e3a9daf921	Play item sound when trying to sell a bound item, too.	2014-03-20 22:22:31 -05:00
Marc Zinnschlag	688e03a9d2	Merge remote-tracking branch 'sirherrbatka/Editor-Dialog'	2014-03-20 22:27:28 +01:00
Marek Kochanowicz	fbb619db73	…	2014-03-20 21:41:11 +01:00
Marek Kochanowicz	a692ce99fa	where was my mind…	2014-03-20 20:26:53 +01:00
Marek Kochanowicz	ccd5e549cd	moved buttons down	2014-03-20 19:53:03 +01:00
Marek Kochanowicz	832a10b2ac	solving problems	2014-03-20 18:40:10 +01:00
Marc Zinnschlag	1a1d52c513	fixed a column ID problem	2014-03-20 14:19:50 +01:00
Marek Kochanowicz	5c34823bb0	added some placeholder icons	2014-03-20 13:59:00 +01:00
Marek Kochanowicz	ad2f9a69a1	prevent deleting already deleted record	2014-03-20 08:59:04 +01:00
slothlife	1acd1bd913	Feature #1173 : Saved Game: include weather state Removed some unused state in and changed Ogre::String to std::string in WeatherManager.	2014-03-20 01:25:52 -05:00
Rohit Nirmal	e4c4747a27	Play item sound even if merchant doesn't purchase it.	2014-03-19 20:08:01 -05:00
Marek Kochanowicz	ea9b6fa37e	view button	2014-03-19 12:01:36 +01:00
Marek Kochanowicz	8f3103ce65	added preview button	2014-03-19 11:43:25 +01:00
Marek Kochanowicz	6416ae90d2	Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog Conflicts: apps/opencs/CMakeLists.txt apps/opencs/view/world/subviews.cpp	2014-03-19 10:23:15 +01:00
Marek Kochanowicz	010160d047	missed those :/	2014-03-18 20:56:55 +01:00
Marek Kochanowicz	c0b2b783cb	use more proper creators	2014-03-18 20:53:21 +01:00
Marek Kochanowicz	f3475f7ef5	Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog	2014-03-18 19:24:10 +01:00
Marek Kochanowicz	db774b02d7	clone and create buttons work	2014-03-18 09:36:22 +01:00
Marek Kochanowicz	95afca0558	delete record button	2014-03-17 19:28:41 +01:00
Marek Kochanowicz	7296b09357	revert button	2014-03-17 19:18:18 +01:00
Marek Kochanowicz	09ba547630	use tool buttons with icons	2014-03-17 15:35:36 +01:00
scrawl	128a47570e	One more fix	2014-03-17 14:15:52 +01:00
scrawl	4443e22387	Build fix	2014-03-17 13:32:13 +01:00
scrawl	c8c0e5de38	Fixed code issues found with unity build. Missing include guards, duplicated functions, ...	2014-03-16 23:49:06 +01:00
scrawl	81dfc26d26	mwscript/locals was added twice	2014-03-16 21:39:46 +01:00
Marc Zinnschlag	20ea859aac	adjusted the far clip distance	2014-03-16 17:14:44 +01:00
sirherrbatka	3c8eeb8c48	added comment	2014-03-16 17:11:13 +01:00
Marc Zinnschlag	6b11265fbc	consider scale and orientation when previewing reference	2014-03-16 17:06:45 +01:00
Marc Zinnschlag	48ea93d890	less random camera start position	2014-03-16 17:06:30 +01:00
sirherrbatka	4a0d1ba272	do not cast and check multiple times	2014-03-16 17:06:11 +01:00
Marc Zinnschlag	fa042a8aca	use proper title for reference prewview subviews (avoid internal ID)	2014-03-16 13:22:32 +01:00
Marc Zinnschlag	8b36de6c67	Merge remote-tracking branch 'cc9cii/Slaughterfish-fix'	2014-03-16 12:57:38 +01:00
Marc Zinnschlag	afbdd84467	Merge remote-tracking branch 'cc9cii/AiWander-fix'	2014-03-16 12:47:30 +01:00
Marc Zinnschlag	c36dfef972	prewview subview	2014-03-16 12:44:01 +01:00
cc9cii	f71fb83bfc	Cleaned up more inaccurate comments.	2014-03-16 20:56:11 +11:00
cc9cii	f57c11254f	Revert to original variable names.	2014-03-16 20:09:18 +11:00
cc9cii	22c544d9d7	Remove unnecessary comment.	2014-03-16 12:51:12 +11:00
cc9cii	fdbd564700	Apparently fall trace needs to be done with the middle of the object.	2014-03-16 08:57:55 +11:00
cc9cii	43757efdc4	Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however.	2014-03-16 08:09:14 +11:00
scrawl	d08394bf78	Fixes #1205 : apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla)	2014-03-15 21:00:25 +01:00
scrawl	61955111f1	Fixes #1204 : Any health value < 1 should show as empty life bar.	2014-03-15 20:48:54 +01:00
scrawl	93c21b5ef2	Fixes #1197 : incorrect mouse wheel step	2014-03-15 20:34:12 +01:00
scrawl	3880247017	Fixes #1206 : effect texture override was not accounted for	2014-03-15 20:28:48 +01:00
Marc Zinnschlag	2fdf80bcbf	Merge remote-tracking branch 'gsedej/master'	2014-03-15 13:53:05 +01:00
cc9cii	e6977d00e8	Oops. Fix typo picked up by Zini.	2014-03-15 08:16:35 +11:00
cc9cii	b2e3fa70c2	Fix spelling errors in comments.	2014-03-14 07:04:39 +11:00
Marek Kochanowicz	4a623ace71	disabling works	2014-03-13 18:41:37 +01:00
Marek Kochanowicz	c97172d89c	fixed segfault and prevent drops from other documents	2014-03-13 17:00:14 +01:00
Marek Kochanowicz	e1a4b64efb	fixed segfault	2014-03-13 16:50:04 +01:00
cc9cii	d54ae58ec9	Bug #900 fix - minor update to comments	2014-03-14 00:09:03 +11:00
cc9cii	d92740efc9	Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this.	2014-03-13 23:44:52 +11:00
Marc Zinnschlag	7bc97fb8b8	reworked code for player positioning on startup and new game	2014-03-13 13:19:32 +01:00
Marek Kochanowicz	dd755a00e4	fix for the bug (?)	2014-03-13 08:52:37 +01:00
Marek Kochanowicz	cc1ceb35ce	drag and drop works	2014-03-12 20:34:55 +01:00
Marek Kochanowicz	fd4829141d	succesfully connected the signals	2014-03-12 19:55:51 +01:00
Marek Kochanowicz	1bf67e7390	added the new qlineedit subclass	2014-03-12 19:36:46 +01:00
Marek Kochanowicz	30a0c82e22	this code segfaults, but i don't know why	2014-03-12 16:28:10 +01:00
Marek Kochanowicz	919065db32	fixed segfault	2014-03-12 16:06:59 +01:00
Marek Kochanowicz	d1290ac556	skip deleled or erased records	2014-03-12 15:46:27 +01:00
Marek Kochanowicz	2278eb5e91	handle locking	2014-03-12 15:17:49 +01:00
Marek Kochanowicz	1a9d4204d2	correction	2014-03-12 15:07:17 +01:00
Gašper Sedej	43a12fffd5	indentation issue...	2014-03-12 14:37:44 +01:00
Marek Kochanowicz	2e226e63b6	change universalid of base subview after pressing next or prev	2014-03-12 13:04:40 +01:00
Gašper Sedej	d72a2f1ffb	Added code to test if git hash is availible	2014-03-12 12:33:42 +01:00
Marek Kochanowicz	cb9bcc3cc1	buttons are functional	2014-03-12 12:25:37 +01:00
scrawl	0cd40294a2	Fixed ranged combat for creatures	2014-03-12 11:30:44 +01:00
Marek Kochanowicz	299b7a6ce6	Added buttons, they don't do anything.	2014-03-12 11:08:04 +01:00
Gašper Sedej	06e02ed77f	Added version and revision number to mainmenu	2014-03-12 10:53:56 +01:00
Marek Kochanowicz	8d50af547a	created editwidget	2014-03-12 10:39:28 +01:00
Marek Kochanowicz	865e6b52ae	scroll area	2014-03-11 21:21:05 +01:00
Marek Kochanowicz	c422dc6eed	Refactorisation.	2014-03-11 20:40:31 +01:00
Marek Kochanowicz	5ad572346b	referencables also work now	2014-03-11 13:02:25 +01:00
Marek Kochanowicz	1edf5a4414	registered additional subviews.	2014-03-11 10:47:30 +01:00
Marek Kochanowicz	87286232d7	fixed bug, god bless overloading	2014-03-11 09:38:53 +01:00
Marek Kochanowicz	a25271f0b6	moving bloat away from the dispatcher	2014-03-11 09:14:13 +01:00
Marc Zinnschlag	ef1364878f	moved test cube from SceneWidget to WorldspaceWidget	2014-03-10 18:35:49 +01:00
Marek Kochanowicz	17b521cec8	additional check	2014-03-10 17:57:40 +01:00
Marek Kochanowicz	f4614c2c63	use qlabels for not editable fields	2014-03-10 17:52:45 +01:00
Marek Kochanowicz	089732419a	introduce longString	2014-03-10 17:18:29 +01:00
Marek Kochanowicz	cc96a38921	use qlinedit for the var	2014-03-10 13:27:52 +01:00
Marek Kochanowicz	874847c959	handle color	2014-03-10 13:25:01 +01:00
Marc Zinnschlag	7812427836	added Preview submenu item; fixed View issues regarding exterior cells	2014-03-10 12:44:34 +01:00
Marek Kochanowicz	73cb3ac0ed	embelishing	2014-03-10 12:04:03 +01:00
Marek Kochanowicz	361bc55973	dont force trying display	2014-03-10 09:47:41 +01:00
Marek Kochanowicz	9ab920bd80	display id and other not editable data	2014-03-10 09:37:53 +01:00
Marek Kochanowicz	b2fdaa74b0	trying to set the size policy	2014-03-09 18:44:04 +01:00
Marc Zinnschlag	2b17f5dde9	register resources locations on editor startup	2014-03-09 12:32:21 +01:00
Marc Zinnschlag	2de862126a	moved resources group creation from Engine to bsa component	2014-03-09 11:42:39 +01:00
Marek Kochanowicz	7eb10756d4	some extra views enabled	2014-03-09 08:58:24 +01:00
scrawl	6eaa7553f8	Fixes #1181 : Enable controls when loading a savegame	2014-03-09 03:34:49 +01:00
Sandy Carter	72a3c50eb8	(#1191 ) Disallow picking up if inventory disabled Check if window manager has allowed the inventory window if not, then items should not be possible to pick up	2014-03-08 13:45:54 -05:00
Marek Kochanowicz	0447be7e7a	register extra views. do not display id	2014-03-08 17:24:00 +01:00
Marek Kochanowicz	1f1774b5e1	changing the enumdelegate seteditordata	2014-03-08 16:54:05 +01:00
Marek Kochanowicz	9612c6a6fd	handle also bool boxes	2014-03-08 16:50:42 +01:00
Marek Kochanowicz	08ccae6b49	handle comboboxes	2014-03-08 16:21:49 +01:00
Marek Kochanowicz	a8b11829d4	disable not editable widgets	2014-03-08 15:18:40 +01:00
Marek Kochanowicz	3c60345d6b	nest wrapper into the proxy class	2014-03-08 15:15:00 +01:00
scrawl	072dc6d438	Feature #50 : Implement marksman mechanics.	2014-03-08 06:03:45 +01:00
scrawl	12de0afb03	Feature #50 : Spawn projectiles Fix a bug in copyObjectToCell. Make actor rotations more consistent.	2014-03-08 01:31:27 +01:00
Marek Kochanowicz	2e6b45dafb	edit view, savind works	2014-03-07 22:17:40 +01:00
Marek Kochanowicz	020e3f8fc5	Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3	2014-03-07 17:16:38 +01:00
Marek Kochanowicz	f0a45fa15f	just saved progress	2014-03-07 17:15:43 +01:00
cc9cii	f36bea03ab	Bug #1189 fix by scrawl	2014-03-07 19:36:44 +11:00
Marek Kochanowicz	b0ae78e889	basicly enabled code	2014-03-06 20:10:13 +01:00
Marc Zinnschlag	f1353dc84f	Merge branch 'scene'	2014-03-06 16:46:44 +01:00
Marc Zinnschlag	516a3b9abd	close interior cell view when cell is deleted	2014-03-06 16:40:08 +01:00
Marc Zinnschlag	0254a209f6	some general cleanup	2014-03-06 13:51:21 +01:00
Marc Zinnschlag	f04348fb8e	do not offer view action for cells flagged as deleted	2014-03-06 13:43:06 +01:00
Marc Zinnschlag	4a119c8f46	ambient lighting in interior cells	2014-03-06 13:02:21 +01:00
Marc Zinnschlag	7e0f0c8402	fixed SceneWidget destructor	2014-03-06 12:42:09 +01:00
Marc Zinnschlag	397921e457	specialising WorldspaceWdiget into paged and unpaged subclasses	2014-03-06 10:13:39 +01:00
Marc Zinnschlag	7386d3eb0b	moved navigation into the WorldspaceWidget	2014-03-06 10:01:23 +01:00
scrawl	e08f6c9ce3	Bug #416 : Copy framebuffer to a texture instead of not clearing Potentially faster than the previous workaround, and should work for triple buffering too.	2014-03-06 04:01:25 +01:00
scrawl	83b6fcf22e	Bug #416 : Workaround for page flipping problem	2014-03-05 22:24:05 +01:00
scrawl	1d926816b5	Terrain: background load blendmaps & layer textures. Refactor QuadTree update.	2014-03-05 21:46:37 +01:00
scrawl	2a4e99c069	Set StaticGeometry origin Fixes an exception for coordinates far away from (0,0,0).	2014-03-05 21:46:37 +01:00
scrawl	edb5a54092	Include some more required Ogre headers explicitely.	2014-03-05 21:46:37 +01:00
scrawl	195071efc7	Terrain: geometry is now loaded in background threads. TODO: background load layer textures and blendmaps. "Distant land" setting has been removed for now (i.e. always enabled).	2014-03-05 21:46:37 +01:00
scrawl	065b6d3331	Terrain: moved ESM::Land load to earlier in the startup procedure Required for background loading as we cannot load ESM::Land data from background threads.	2014-03-05 21:46:36 +01:00
scrawl	8730b61362	Render maps after all cells have finished loading Still not fixing Bug #772, but at least this will allow for background loading of terrain.	2014-03-05 21:46:36 +01:00
scrawl	c9e349f60f	Terrain: support alternate coordinate systems. Get rid of LoadingListener for now	2014-03-05 21:46:36 +01:00
Bret Curtis	ab224f93c9	remove our stdint.h version that uses boost and force usage of system stdint.h	2014-03-05 17:08:58 +01:00
cc9cii	ce8d327e8e	Debug MSVC build of openmw needs number of sections beyond 2^16	2014-03-05 22:11:10 +11:00
gus	d84319300a	fix	2014-03-05 11:27:16 +01:00
gus	f4879dacd5	add AIfollow to summoned creatures	2014-03-05 11:24:39 +01:00
Marc Zinnschlag	a264e86e13	subclasses scene widget for worldspace scenes	2014-03-04 14:47:43 +01:00
Marc Zinnschlag	f9d2fde783	Merge branch 'openmw-29' Conflicts: apps/openmw/mwmechanics/aicombat.cpp	2014-03-04 09:34:38 +01:00
Marc Zinnschlag	0ae9cc0106	removed unused function	2014-03-03 08:21:16 +01:00
Marc Zinnschlag	26c2f28879	replaced global world->scene menu item with individual view context menu items in cell and reference tables	2014-03-02 22:43:44 +01:00
Marc Zinnschlag	55195f819a	changed edit requests from row index format to UniversalId/hint format	2014-03-02 22:34:41 +01:00
Marc Zinnschlag	797f5527ee	added hint parameter for UniversalId viewing requests	2014-03-02 13:29:02 +01:00
Marc Zinnschlag	cb3994281c	changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace)	2014-03-02 13:11:15 +01:00
Marc Zinnschlag	ca30f2af3d	minor fix	2014-03-02 11:03:37 +01:00
Marc Zinnschlag	536a0e0ab0	added orbit navigation mode	2014-03-01 14:15:04 +01:00
scrawl	a99aa15d14	Fix a copy&paste mistake leaving start rotation uninitialized	2014-02-28 17:23:58 +01:00
Marc Zinnschlag	4d3abeedcb	keep camera upright in 1st person mode	2014-02-28 13:37:01 +01:00
Marc Zinnschlag	ae637d6abc	rolling	2014-02-28 11:58:03 +01:00
Marc Zinnschlag	0926501717	Merge remote-tracking branch 'cc9cii/branch_0_29_fixes' into openmw-29	2014-02-27 15:45:45 +01:00
Marc Zinnschlag	4eea2c7a86	added free navigation mode	2014-02-27 15:42:59 +01:00
Marc Zinnschlag	c977b2a756	moved implementation of the 1st person camera into a separate file	2014-02-27 15:23:14 +01:00
Marc Zinnschlag	14c3bfcf62	added navigation class	2014-02-27 14:46:06 +01:00
cc9cii	56ae85df0c	Fix 32bit Windows crash while taking the save screenshot.	2014-02-28 00:28:02 +11:00
cc9cii	8fa88f4480	sync with upstream	2014-02-28 00:13:57 +11:00
cc9cii	2421f23c2f	cleanup the mess...	2014-02-27 23:59:23 +11:00
Marc Zinnschlag	8f73cc9268	added navigation mode selection	2014-02-25 14:59:46 +01:00
Marc Zinnschlag	526d75df51	inverted ctrl key	2014-02-25 14:30:38 +01:00
Marc Zinnschlag	644f5cb8de	fixed mouse button release detection	2014-02-25 14:28:55 +01:00
Marc Zinnschlag	e33bd4d508	camera rotation via ctrl-left button drag	2014-02-25 14:24:35 +01:00
Marc Zinnschlag	e987199949	getting rid of some magic numbers	2014-02-25 14:14:53 +01:00
Marc Zinnschlag	07d20a2013	camera panning via left button drag	2014-02-25 14:09:07 +01:00
Marc Zinnschlag	b9107addc0	mouse wheel zooming	2014-02-25 13:39:49 +01:00
Marc Zinnschlag	b6ae521aa5	moving the camera with A and D keys	2014-02-25 13:31:15 +01:00
Marc Zinnschlag	af50575259	use shift key to speed up camera movement	2014-02-25 13:17:15 +01:00
Marc Zinnschlag	8081c067a6	moving the camera with W and S keys	2014-02-25 13:09:37 +01:00
Marc Zinnschlag	4ec4599be3	added navigation mode enum to SceneWidget	2014-02-25 12:30:45 +01:00
Marc Zinnschlag	6ec86564d1	re-enabled OGRE in OpenCS; cleaned up startup	2014-02-25 11:58:32 +01:00
cc9cii	5b48ca114f	aicombat pathfinding fix - check the correct list	2014-02-25 08:31:14 +01:00
cc9cii	85c467f00f	Minor cleanup for aicombat pathfinding workaround.	2014-02-25 08:30:52 +01:00
Nikolay Kasyanov	76c1d60d23	Fixed OpenCS build on OS X	2014-02-24 15:59:05 +01:00
Marc Zinnschlag	c62a352956	Merge branch 'cellstore'	2014-02-24 10:03:13 +01:00
Marc Zinnschlag	9b18e01507	keep track of which cells have state that needs to be saved	2014-02-24 10:03:04 +01:00
Marc Zinnschlag	bfcd768078	various bits of cleanup	2014-02-23 21:39:18 +01:00
Marc Zinnschlag	83ded18af0	encapsulated reference collections	2014-02-23 21:21:27 +01:00
Marc Zinnschlag	367919200f	moved CellRefList into a separate file	2014-02-23 20:11:05 +01:00
Marc Zinnschlag	f220867144	make Ptr a bit more pointer-like	2014-02-23 18:17:41 +01:00
Marc Zinnschlag	b72c1c2c58	encapsulated water level	2014-02-23 17:34:18 +01:00
gus	95ff869163	Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2	2014-02-23 17:07:49 +01:00
Marc Zinnschlag	79e723ad06	encapsulated mIds	2014-02-23 16:46:07 +01:00
Marc Zinnschlag	8ea686c6c8	encapsulated mState	2014-02-23 14:26:36 +01:00
cc9cii	1bd2664cb0	aicombat pathfinding workaround	2014-02-23 11:47:25 +01:00
cc9cii	1ab5948f19	merge upstream changes	2014-02-23 19:11:37 +11:00
Marc Zinnschlag	b0ae5b8ab7	Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29	2014-02-22 17:16:55 +01:00
cc9cii	fcfc8fcccb	Revert "Allow MinGW64 compilation in Windows/msys" This reverts commit `c3f350e3fb`. Conflicts: libs/platform/string.h	2014-02-22 23:45:13 +11:00
cc9cii	ac606a865c	Back out unnecessary change.	2014-02-22 23:22:23 +11:00
cc9cii	c241405d91	Fix Windows save & load.	2014-02-22 12:15:20 +11:00
cc9cii	c3f350e3fb	Allow MinGW64 compilation in Windows/msys	2014-02-22 12:06:50 +11:00
Nikolay Kasyanov	59508e914f	Fixed OpenCS build on OS X	2014-02-22 01:17:58 +04:00
Marek Kochanowicz	e348c6baa9	accept drops from filters table. Cool. ☺	2014-02-21 13:50:59 +01:00
Marek Kochanowicz	e2dce53543	additional check on droping to prevent exception	2014-02-21 12:55:01 +01:00
Marek Kochanowicz	fcf17805a0	Installing basic event filter	2014-02-21 12:48:39 +01:00
Marc Zinnschlag	7693f712bc	started making CellStore into a proper class; encapsulated mCell member	2014-02-21 11:35:46 +01:00
Marek Kochanowicz	55e9083570	refactorisation	2014-02-21 10:27:23 +01:00
Marek Kochanowicz	1c35a85adf	fixed bugs, added extra display_type	2014-02-20 19:27:51 +01:00
Marek Kochanowicz	7dff34ebf1	Features implemented. Time to debug.	2014-02-20 19:15:09 +01:00
Marek Kochanowicz	3ad6df1f92	try with the passing action	2014-02-20 17:54:18 +01:00
Marek Kochanowicz	38a86b5015	We can handle droping multiple records	2014-02-20 16:01:54 +01:00
Marek Kochanowicz	b788ab8b4c	correcting	2014-02-20 14:10:03 +01:00
Marek Kochanowicz	4fe21dc38f	Const correctness	2014-02-20 12:43:09 +01:00
Marc Zinnschlag	736644de05	Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()" This reverts commit `51fb9f65ea`.	2014-02-20 12:31:40 +01:00
Marek Kochanowicz	eb3cbaa4e1	Create filter on droping record.	2014-02-20 12:25:47 +01:00
Marek Kochanowicz	c7b3e139aa	Propagate signal to the edit widget	2014-02-20 11:07:04 +01:00
Marek Kochanowicz	fca7701359	Column titles retrived and passed to the filterbox.	2014-02-19 16:15:51 +01:00
pvdk	b43325119a	Some changes to the version retrieval: ignore shallow clones	2014-02-19 14:19:08 +01:00
Marek Kochanowicz	d7a1abb30b	emit signal with types (will be connected to the tablesubview)	2014-02-19 12:55:39 +01:00
Marek Kochanowicz	dd95ed8e4c	Accept drops on the filterbox	2014-02-19 12:32:48 +01:00
Marek Kochanowicz	569533eeae	Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop	2014-02-19 11:23:53 +01:00
scrawl	d25b3ad9cb	Fix AiCombat for creatures with weapons	2014-02-19 11:23:03 +01:00
scrawl	ebc67a82cf	Don't list unnamed quests in the quest book	2014-02-19 11:23:03 +01:00
scrawl	1fba5d1bb9	Terrain: change world bounds from AABB to 4 floats	2014-02-19 11:23:03 +01:00
scrawl	bc376e6649	Closes #888 : Treat "Bip 01" as animation root if existing	2014-02-19 11:23:03 +01:00
scrawl	439018e706	Get rid of useless return values	2014-02-19 11:23:03 +01:00
scrawl	90f6cda4cc	Moved includes to appropriate place	2014-02-19 11:23:03 +01:00
Marek Kochanowicz	e9664d80bd	make convert enumns public static	2014-02-19 11:22:47 +01:00
Marc Zinnschlag	550e5eb686	Merge remote-tracking branch 'corristo/osx-music-fix'	2014-02-18 09:12:02 +01:00
gus	d8f24ac499	bug fix	2014-02-17 15:49:49 +01:00
Marc Zinnschlag	ea16f79d77	Merge remote-tracking branch 'gus/AIFix2'	2014-02-17 10:54:07 +01:00
gus	84959eea28	woops, thanks scrawl	2014-02-17 10:50:10 +01:00
gus	6e1425321b	remove cout spam	2014-02-17 10:43:09 +01:00
gus	e5b19cf3c6	clean up	2014-02-17 10:37:11 +01:00
Marc Zinnschlag	02c6c65705	Merge remote-tracking branch 'sirherrbatka/DragDrop'	2014-02-17 09:55:50 +01:00
Marek Kochanowicz	2bb9e47507	Improvements.	2014-02-17 08:58:55 +01:00
Nikolay Kasyanov	51fb9f65ea	#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()	2014-02-17 02:59:23 +04:00
Nikolay Kasyanov	5e8cb2e466	Another attempt to fix #1041 . This time I'm sending real data from decoder once after playback started.	2014-02-17 02:35:13 +04:00
Marek Kochanowicz	e1a0f60041	allow _foo ids without qoute	2014-02-16 20:26:22 +01:00
Marek Kochanowicz	b83817e05e	May only include alphanumeric characters and underscores and may not start with a number.	2014-02-16 20:18:28 +01:00
Marek Kochanowicz	3cc23a9cb3	very basic, but safe putting down " "	2014-02-16 18:41:42 +01:00
Nikolay Kasyanov	4e28fd85a3	Fixed build on OS X	2014-02-16 20:22:46 +04:00
Marc Zinnschlag	c18c3e51ee	handle IDs that don't exist anymore after loading	2014-02-16 16:23:05 +01:00
Marc Zinnschlag	9788bbcab9	partially store creature state in saved game files (only attributes and dynamics for now)	2014-02-16 15:56:36 +01:00
Marc Zinnschlag	b0532e0c85	store NPC state in saved game files	2014-02-16 15:51:45 +01:00
Marc Zinnschlag	9f721fd144	store list of known topics in saved game files	2014-02-16 12:54:27 +01:00
Marc Zinnschlag	6ac64bbe15	Merge branch 'script' Conflicts: readme.txt	2014-02-16 12:12:56 +01:00
Marek Kochanowicz	17af865a9f	checking for the source of the drop, reject those from other files for now	2014-02-16 09:51:33 +01:00
Marc Zinnschlag	9cdfca6c26	Merge remote-tracking branch 'potatoesmaster/disable-crash'	2014-02-15 22:55:00 +01:00
Marek Kochanowicz	cbe1fe2f95	removed misplaced bracket	2014-02-15 22:38:59 +01:00
Marek Kochanowicz	45d9364195	Put the id in the quote.	2014-02-15 22:14:27 +01:00
Marek Kochanowicz	ec8c8a9d88	-journalinfo +topic	2014-02-15 22:05:42 +01:00
Marek Kochanowicz	41606a67e4	implemented whitelist of allowed types in the scripts	2014-02-15 20:49:09 +01:00
Marek Kochanowicz	930b77e60a	allow drag and drop into the script edit window.	2014-02-15 19:52:40 +01:00
Marc Zinnschlag	01a7918124	Merge remote-tracking branch 'potatoesmaster/selected-spell'	2014-02-15 18:38:10 +01:00
Marek Kochanowicz	97fe5465bf	created new files	2014-02-15 17:55:18 +01:00
Emanuel Guevel	3d8ca02479	Fix breaking of enchanted items casting	2014-02-15 17:39:57 +01:00
Marc Zinnschlag	0afa61eed5	fixed referenceable-loading in case of more than one content file	2014-02-15 15:50:17 +01:00
Marc Zinnschlag	2007a3e902	improved script check error messages	2014-02-15 13:25:38 +01:00
Marek Kochanowicz	56be62b956	small reformatting	2014-02-15 13:23:51 +01:00
Marek Kochanowicz	4ee90c24e5	more readable code.	2014-02-15 13:22:14 +01:00
Marc Zinnschlag	4e04131957	fixing case broke sorting in script context	2014-02-15 13:09:43 +01:00
Marc Zinnschlag	2130ec39d6	disable warnings by default in script verifier	2014-02-15 12:58:34 +01:00
Marek Kochanowicz	b1f63947e8	Checking if the drop comes from same document.	2014-02-15 12:40:07 +01:00
Marek Kochanowicz	d6820b977e	store const ref to the document in the table.	2014-02-15 12:22:32 +01:00
Marek Kochanowicz	f3dc45f1ec	long line split.	2014-02-14 15:29:10 +01:00
Marek Kochanowicz	37d262b147	Splited very long line.	2014-02-14 15:12:34 +01:00
Marc Zinnschlag	7b8802588e	Merge remote-tracking branch 'sirherrbatka/DragDrop'	2014-02-14 14:28:30 +01:00
Marek Kochanowicz	aafde926d3	Documentation, corrections.	2014-02-14 14:04:36 +01:00
Marc Zinnschlag	e17af4231a	added script verifier	2014-02-14 13:38:30 +01:00
Marc Zinnschlag	0ff744c2ff	fixed CSMWorld::ScriptContext::isJournalId	2014-02-14 12:56:05 +01:00
gus	a315d5cc2b	aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp	2014-02-14 12:55:14 +01:00
Marek Kochanowicz	ae418f2538	nicer formatting	2014-02-14 12:51:50 +01:00
Marc Zinnschlag	0a8ffbfb1d	added missing implementation for CSMWorld::ScriptContext::getMemberType	2014-02-14 12:46:54 +01:00
Marc Zinnschlag	910d62e4b8	added missing implementation for CSMWorld::ScriptContext::getGlobalType	2014-02-14 11:59:33 +01:00
Marc Zinnschlag	451e1f413b	instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly	2014-02-14 11:15:16 +01:00
Emanuel Guevel	7c981587fc	When searching object by id, search in active cells before searching in the player's inventory	2014-02-13 22:58:12 +01:00
Marc Zinnschlag	053b3dc371	Merge branch 'openmw-28' Conflicts: CMakeLists.txt	2014-02-13 20:57:28 +01:00
Emanuel Guevel	e597328b6b	Make enable/disable a no-op for items in containers	2014-02-13 20:24:27 +01:00
Marek Kochanowicz	40cc108e54	drag and drop works.	2014-02-13 20:19:51 +01:00
Marek Kochanowicz	1bcc6d6918	using new icon.	2014-02-13 19:14:17 +01:00
Marek Kochanowicz	2afe3f3e57	Introduced multitype icon.	2014-02-13 19:00:35 +01:00
Marek Kochanowicz	6662560cbc	new displays for referencable table columns	2014-02-13 15:43:19 +01:00
Marc Zinnschlag	d6e212a02b	Merge branch 'master' into script	2014-02-13 15:02:02 +01:00

... 19 20 21 22 23 ...

8862 commits