2226 commits

Author	SHA1	Message	Date
gugus	a711a3ebe1	Various fixes	2012-05-29 16:45:43 +02:00
gugus	f83ffecae5	SetAngle and SetScale script instruction	2012-05-29 15:57:13 +02:00
scrawl	8b7baa808e	fixed the hud icon positioning issues	2012-05-29 15:36:48 +02:00
scrawl	48ba293e88	added the success formula, and spell deleting (shift+click)	2012-05-29 15:13:44 +02:00
scrawl	30461438f6	still left: spell success formula	2012-05-29 12:35:03 +02:00
scrawl	5412d6ed9e	fixed a typo that prevented spells from getting added	2012-05-29 10:47:48 +02:00
gugus	d8051095d6	rotation are updated in the physis system	2012-05-29 10:36:12 +02:00
gugus	26d6c9453c	more work on rotation	2012-05-29 10:15:29 +02:00
scrawl	c7268233df	spell window layout & opening/closing/pinning logic	2012-05-29 09:02:22 +02:00
scrawl	1b561ce91f	Merge branch 'master' into next	2012-05-29 06:56:23 +02:00
scrawl	69e6bc6588	add water settings to settings window	2012-05-29 06:45:44 +02:00
scrawl	5d03e86613	added field of view and texture filtering to settings window	2012-05-29 04:54:54 +02:00
scrawl	6945afe95b	alchemy window layout	2012-05-29 02:57:19 +02:00
scrawl	8c7cb6909d	addition to c7010623fb : apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors	2012-05-29 01:59:16 +02:00
scrawl	f75266e4ba	fixed race dialog bug	2012-05-29 01:47:49 +02:00
gugus	77084b27c0	some work for rotation/scaling	2012-05-28 16:01:35 +02:00
scrawl	0a17d6d710	more resolution switching fixes	2012-05-28 12:34:29 +02:00
Marc Zinnschlag	76b23ae864	Merge remote branch 'scrawl/buildplayerfix'	2012-05-28 11:44:43 +02:00
scrawl	a54623bcd2	reset attributes when building player	2012-05-28 11:37:56 +02:00
scrawl	e1ee45a6d6	Issue #297: Make the stats review dialog show correct values for attributes/skills/health/magicka/fatigue	2012-05-28 10:50:00 +02:00
scrawl	6014a90002	added tooltip delay option	2012-05-28 09:46:05 +02:00
scrawl	14f4f09f83	proper resolution switching (reposition GUI & adjust mouse clipping region)	2012-05-28 09:19:25 +02:00
scrawl	3daf1ebc3f	small map tweak	2012-05-28 05:03:50 +02:00
scrawl	19c428e86c	delete fix	2012-05-28 02:04:00 +02:00
scrawl	8f667580bb	ogre 1.8 final release compability fixes	2012-05-27 23:12:45 +02:00
scrawl	f6a6684685	when the resolution changes, adjust camera aspect ratio and recreate compositors	2012-05-27 21:39:18 +02:00
scrawl	10cfe0f5bc	Issue #295: Class creation dialogs tooltips; plus tons of other improvements	2012-05-27 06:39:10 +02:00
scrawl	f1d3978897	Issue #290: Auto-Close MW-reference related GUI windows	2012-05-27 01:14:33 +02:00
scrawl	a7e6a142f9	blend fog of war into adjacent cells	2012-05-27 00:39:33 +02:00
scrawl	63213b36bf	Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind	2012-05-26 23:06:15 +02:00
scrawl	313a8e55b7	- Issue #296: Clicking on HUD elements shows/hides the respective window ... - Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore	2012-05-26 21:09:21 +02:00
scrawl	3cba884f59	Issue #294: show/hide HUD elements based on allowed windows	2012-05-26 05:46:46 +02:00
scrawl	738e107b52	Merge branch 'master' into next	2012-05-26 05:31:32 +02:00
scrawl	c7010623fb	Issue #294: disallowed inventory prevents Talk, Open and Take actions	2012-05-25 18:45:17 +02:00
gugus	51b6d5cae0	Scale *should* work. (no script instruction yet)	2012-05-25 18:23:06 +02:00
Marc Zinnschlag	173820d29b	Merge branch 'enable'	2012-05-25 18:19:12 +02:00
scrawl	750259973e	potion creating works, most of the values are bogus	2012-05-25 18:00:13 +02:00
Marc Zinnschlag	6fe53aa320	Issue #277: containers in cells were not filled up on cell load when the cell was preloaded before	2012-05-25 17:55:00 +02:00
Marc Zinnschlag	0131c53005	Issue #176: removed enable/disable functions from MWWorld::Class	2012-05-25 17:28:27 +02:00
Marc Zinnschlag	36885b2e40	Issue #176: removed enable/disable functions from Creature, Npc and Light	2012-05-25 17:04:33 +02:00
scrawl	63b3b82657	don't allow more than 4 potion effects	2012-05-25 16:23:49 +02:00
scrawl	1df1b521a4	show the list of potion effects	2012-05-25 16:20:57 +02:00
scrawl	6eb15f7680	auto-select the alchemy tools with highest quality	2012-05-25 15:24:33 +02:00
scrawl	3ba24aee0d	Merge branch 'alchemy' into next	2012-05-25 13:37:40 +02:00
scrawl	9b623a79ff	Merge branch 'master' into alchemy	2012-05-25 13:14:27 +02:00
scrawl	09c870ad68	first alchemy window layout (not pretty)	2012-05-25 12:58:28 +02:00
scrawl	51b8a76a68	merged by branches together, starting with alchemy window ... Merge branch 'guimode_stacking' into next Conflicts: apps/openmw/mwgui/mode.hpp	2012-05-24 15:57:23 +02:00
scrawl	c2b818373e	adjust tooltip skin, now is never transparent	2012-05-24 15:11:45 +02:00
scrawl	a3a22e9096	ingredient tooltip shows possible effects	2012-05-24 14:47:57 +02:00
Chris Robinson	05fd8f0211	Update the actual sounds and music volume when settings change	2012-05-24 05:30:22 -07:00
Marc Zinnschlag	684208dfc9	Issue #176: when deleting objects, don't go through disable to remove actors from the mechanics manager	2012-05-24 13:26:07 +02:00
Marc Zinnschlag	c0ee382c72	Issue #176: made actor deregistration more robust	2012-05-24 13:21:52 +02:00
scrawl	57d834b14b	fixed an issue with interactive messagebox	2012-05-24 12:05:43 +02:00
scrawl	6ea7bdb224	vsync & fps buttons, sound volume apply fix	2012-05-24 11:50:48 +02:00
scrawl	cbe89f7e32	copy&paste mistake	2012-05-24 08:56:45 +02:00
scrawl	189b044392	small correction	2012-05-24 04:37:41 +02:00
scrawl	9b94edd561	audio tab with volume sliders	2012-05-24 04:34:53 +02:00
scrawl	cb35f4d208	some unrelated gui cleanup	2012-05-24 03:50:02 +02:00
scrawl	a1907e7b88	cleaning up mwgui/widgets part 1	2012-05-24 03:48:02 +02:00
scrawl	7ebbc099b3	allow stacking gui modes	2012-05-23 12:23:35 +02:00
scrawl	689cf7ce05	ConfirmationDialog	2012-05-23 05:28:25 +02:00
Jason Hooks	0066ef9b54	Some cleanup	2012-05-22 21:40:24 -04:00
scrawl	656a8f1be9	working menu transparency slider	2012-05-23 01:32:36 +02:00
scrawl	313294c522	settings window (hotkey F2) which does nothing. Yay!	2012-05-22 21:40:42 +02:00
scrawl	343bbaf0fd	integrated video settings in the settings file, the launcher is now useless	2012-05-22 03:36:03 +02:00
Marc Zinnschlag	7938566004	Merge remote branch 'scrawl/graphics' ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-05-21 11:24:36 +02:00
Marc Zinnschlag	76d733d2b3	Merge remote branch 'scrawl/inventoryGUI'	2012-05-21 11:17:11 +02:00
gugus	dac98b2213	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-05-21 11:02:10 +02:00
scrawl	bda90b77bc	oops, forgot something	2012-05-21 10:59:06 +02:00
gugus	ca9224ed7f	starting scale function	2012-05-21 10:58:04 +02:00
scrawl	157dd81524	removed script instruction, will be in the settings window later	2012-05-21 10:57:49 +02:00
scrawl	5f6e8224f4	skill progress	2012-05-21 10:48:25 +02:00
Marc Zinnschlag	3e85151c9d	Merge remote branch 'scrawl/inventoryGUI' ... Conflicts: apps/openmw/CMakeLists.txt	2012-05-21 10:13:27 +02:00
scrawl	8f2c8bbea4	Merge branch 'master' into graphics	2012-05-21 09:50:46 +02:00
scrawl	789dfe1c88	fix a bug with water reflection plane height	2012-05-21 09:50:02 +02:00
scrawl	40c52c5d09	max faction rank crashfix	2012-05-21 05:19:20 +02:00
scrawl	1079bb2677	finished tooltips for everything in the stats window, some gui refactoring	2012-05-21 05:14:07 +02:00
scrawl	76d71f86bc	fixed a faction case folding issue	2012-05-21 03:10:55 +02:00
scrawl	4a009fc2bb	faction tooltip (doesn't handle player having max. rank)	2012-05-21 02:58:06 +02:00
scrawl	8ce4727424	skill tooltips	2012-05-21 01:58:11 +02:00
scrawl	6518eb7794	some cleanup	2012-05-20 22:55:14 +02:00
scrawl	1c7110fbf5	birthsign tooltip	2012-05-20 22:45:30 +02:00
scrawl	8d52ee27dc	attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files	2012-05-20 22:06:54 +02:00
Marc Zinnschlag	420cd53be0	Merge branch 'effects'	2012-05-19 17:41:47 +02:00
Marc Zinnschlag	be46f5a59c	various fixes	2012-05-19 17:39:24 +02:00
scrawl	876b369ca5	minor tooltip fix	2012-05-19 16:28:10 +02:00
scrawl	92d9e070fb	small tweak to getPlayerGold() method	2012-05-19 16:10:13 +02:00
scrawl	2a4c55f1ab	use Class::getInventoryStore instead of casting ContainerStore.	2012-05-19 16:04:34 +02:00
scrawl	4fb30544d4	more gui files cleanup	2012-05-19 16:00:00 +02:00
scrawl	7a4de0ed1d	changed more gui stuff to use the new tag system	2012-05-19 15:32:32 +02:00
Marc Zinnschlag	0dc412d44c	Merge remote branch 'scrawl/refid_case'	2012-05-19 15:07:12 +02:00
Marc Zinnschlag	9f1919a230	Issue #256: added active spell management (completely untested)	2012-05-19 15:01:07 +02:00
scrawl	7ef0ad4e39	show faction & birthsign in the stats window	2012-05-19 14:55:09 +02:00
Marc Zinnschlag	635a89c35c	Issue #256: RNG fix	2012-05-19 14:43:02 +02:00
scrawl	24ce88de2a	working mygui tag replacement system for GMST strings	2012-05-19 14:19:21 +02:00
scrawl	ee884634b9	fixed item refID handling in the dialogue manager and container script extensions.	2012-05-19 13:19:26 +02:00
Marc Zinnschlag	74ae3605e0	Issue #256: added getTimeStamp function to World	2012-05-19 09:31:45 +02:00
scrawl	9ca579ba63	slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly	2012-05-19 00:36:01 +02:00
scrawl	1006411c02	small fix for mygui log being spammed with errors	2012-05-19 00:06:11 +02:00
scrawl	41466fc5fc	gold label fix, and don't allow selling gold	2012-05-18 23:00:31 +02:00
scrawl	656b08f620	removed the workaround for the ContainerStore bug.	2012-05-18 22:32:06 +02:00
scrawl	8a0c859c16	Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI	2012-05-18 22:27:48 +02:00
scrawl	f28f36f262	added sounds to trade window	2012-05-18 22:27:27 +02:00
Marc Zinnschlag	498530fad7	container iterator fix	2012-05-18 22:24:19 +02:00
scrawl	c30b9e4bb9	add/remove gold from the player at the end of the transaction.	2012-05-18 22:21:44 +02:00
scrawl	c004f5d570	adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications	2012-05-18 22:06:25 +02:00
Marc Zinnschlag	a4343bfa18	Issue #256: added TimeStamp class	2012-05-18 22:04:22 +02:00
scrawl	db49e2c046	bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things	2012-05-18 20:53:24 +02:00
scrawl	fb47681fbd	fix a bug, some cleanup	2012-05-18 17:58:33 +02:00
scrawl	342a244e31	NPC now doesn't buy items of types that he shouldn't accept.	2012-05-18 17:36:20 +02:00
scrawl	50a8eb05d9	transfering items between player and merchant works and shows a red frame for bought/sold items.	2012-05-18 17:27:55 +02:00
scrawl	e2400ca7b2	only show items in the trade window that the NPC actually trades (services enum)	2012-05-18 15:51:33 +02:00
Marc Zinnschlag	124ea77612	Issue #256: consider equipped items when calculating magic effects	2012-05-18 15:48:55 +02:00
Marc Zinnschlag	372efaafd7	Issue #256: changed implementation of MagicEffects::operator+=	2012-05-18 15:27:41 +02:00
Marc Zinnschlag	40c58c1bb7	Issue #256: fixed a capitalisation mistake	2012-05-18 15:26:08 +02:00
Marc Zinnschlag	5236bcb557	Issue #256: added operator+= for MagicEffects	2012-05-18 15:12:11 +02:00
Marc Zinnschlag	79055e281d	Issue #256: Force update after building the player character	2012-05-18 13:54:07 +02:00
Marc Zinnschlag	e1997b7f04	Issue #256: added MagicEffects::add overload for EffectLists	2012-05-18 13:17:35 +02:00
scrawl	adf0550292	fixed a wrong label.	2012-05-18 00:14:31 +02:00
scrawl	52e5e14654	use GMST sDefaultCellname for the map window when cell has no region or name.	2012-05-17 23:42:09 +02:00
scrawl	3cacc8feec	add re-stocking items to containers (though restocking isn't implemented)	2012-05-17 23:22:41 +02:00
scrawl	9a3fd96a0c	display the merchant gold.	2012-05-17 22:24:47 +02:00
scrawl	41efea4c1d	in the trade window, don't show items that the merchant has equipped.	2012-05-17 21:56:16 +02:00
scrawl	6ae642aa06	complete trade window layout	2012-05-17 21:15:48 +02:00
scrawl	c9aa0ca1f4	don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region	2012-05-17 19:54:09 +02:00
scrawl	4213b4370f	trade window shows up and shows the vendor's inventory items.	2012-05-17 19:53:04 +02:00
scrawl	1f85475536	Merge branch 'master' into inventoryGUI	2012-05-17 19:03:41 +02:00
scrawl	375c198ebd	WeatherManager: fix for cells that have no region.	2012-05-17 18:21:05 +02:00
scrawl	0afda15ce9	fix for cells that have no region.	2012-05-17 18:14:33 +02:00
scrawl	ae77e7b0d8	don't try to retrieve land data from non-predefined cells.	2012-05-17 18:11:34 +02:00
scrawl	5da4da820e	beginnings of trade window layout.	2012-05-17 17:15:44 +02:00
Marc Zinnschlag	6b74fec8ed	don't do a half finished cell change, when trying to switch to an interior cell that does not exist	2012-05-17 17:13:41 +02:00
scrawl	0dc5e5919b	show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works.	2012-05-17 14:54:03 +02:00
scrawl	66abfd17ab	check the container's "Organic" flag before trying to place items inside.	2012-05-17 14:13:35 +02:00
scrawl	0c1d06d9f7	added some trade window stuff, which does nothing yet.	2012-05-17 13:36:25 +02:00
Marc Zinnschlag	e56ff9283d	Issue #256: moved magic effects update from MechanicsManager to Actors	2012-05-17 13:21:49 +02:00
Marc Zinnschlag	1fddbf9a40	Issue #256: moved dynamic stats update from MechanicsManager to Actors	2012-05-17 13:15:31 +02:00
scrawl	630241c8e2	load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum.	2012-05-17 13:12:38 +02:00
scrawl	c5185cf2e4	drop item on avatar from external container bugfix	2012-05-17 12:09:53 +02:00
scrawl	fca9f1fc5f	gold dropping works without crash, but the code needs clean up.	2012-05-16 22:56:54 +02:00
scrawl	178ad876d7	fix for objects other than Miscellaneous.	2012-05-16 22:17:13 +02:00
scrawl	5875ce5128	select the correct gold base object (still crashing)	2012-05-16 22:13:56 +02:00
scrawl	f73d3ad33f	fix to the "drop object on ground" feature. still crashes for gold.	2012-05-16 21:27:02 +02:00
scrawl	6d34e61dbd	don't stack gold if it has a script (not used in MW, but some mods might)	2012-05-16 19:18:50 +02:00
scrawl	4b5d6ce311	allow stacking gold	2012-05-16 17:22:25 +02:00
scrawl	0f1e09d2c1	make Class::use method return an equip action for equippable items, add sound for equipping	2012-05-16 16:08:55 +02:00
scrawl	9c4243782e	sorting items	2012-05-16 15:17:55 +02:00
scrawl	9a01e18b29	fix some MessageBox code that was using deleted pointers sometimes	2012-05-16 15:00:20 +02:00
scrawl	398a7dc65c	crash fix (hopefully)	2012-05-16 14:32:48 +02:00
scrawl	6a0cb32b7e	removed unnecessary code	2012-05-16 14:30:02 +02:00
scrawl	c5d685c780	added an assert	2012-05-16 14:28:57 +02:00
scrawl	f8c20ef77f	don't allow putting items into a container if the weight is exceeded.	2012-05-16 00:20:24 +02:00
scrawl	2fa7ce0c19	equipping works also when the item wasn't in player inventory before.	2012-05-16 00:02:05 +02:00
scrawl	477f1b42ab	fixed another item dropping bug	2012-05-15 23:28:04 +02:00
scrawl	0f811edb47	fixed a bug with dropping items on the ground	2012-05-15 22:54:28 +02:00
scrawl	5a43fe3e5f	remove debug prints	2012-05-15 22:48:14 +02:00
scrawl	3f4ce32727	implemented player encumbrance bar	2012-05-15 22:45:46 +02:00
scrawl	e9ea1fba4e	fixed typo getCapacity method	2012-05-15 22:31:52 +02:00
scrawl	d3a53ae0b8	removed the _freeSlot method which is now unneeded	2012-05-15 22:01:09 +02:00
scrawl	0063387979	Merge branch 'master' into inventoryGUI	2012-05-15 21:48:05 +02:00
scrawl	175623bf22	change the drag&drop to not use a seperate containerstore	2012-05-15 21:44:57 +02:00
Marc Zinnschlag	fdfddc8be7	some todo comment cleanup	2012-05-15 21:34:32 +02:00
Marc Zinnschlag	7e00fea18b	added getEncumbrance function	2012-05-15 21:34:00 +02:00
Marc Zinnschlag	c6493fb133	added getCapacity function	2012-05-15 21:17:00 +02:00
scrawl	ca4fa21d64	removed the attempt to unify activation and use scripts which was incorrect	2012-05-15 20:51:19 +02:00
scrawl	71de10cb7e	equipping items works, but only if you have more than one of the item that you're equipping	2012-05-15 20:33:34 +02:00
scrawl	765881a61d	equipping items in the inventorywindow (there is no visual indication yet)	2012-05-15 18:20:32 +02:00
scrawl	ab6336b745	using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)	2012-05-15 18:05:53 +02:00
scrawl	b18ee198b4	use a raycast to determine where to place object, if distance is too far ... drop it on the ground	2012-05-15 16:47:23 +02:00
scrawl	7fbee0d488	use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift	2012-05-15 13:00:26 +02:00
scrawl	24a0fecd37	implemented item count selection dialog	2012-05-15 12:51:51 +02:00
scrawl	320cc7d020	implemented ctrl and shift-keys for item drag&drop (take all, take 1)	2012-05-15 11:02:50 +02:00
scrawl	933a40de14	better floating object label positioning.	2012-05-14 21:37:43 +02:00
scrawl	d3e162ec83	dropping items works	2012-05-14 17:41:17 +02:00
scrawl	6c9f75b322	some unfinished work for dropping objects into the gameworld	2012-05-13 18:35:56 +02:00
scrawl	967fb13fca	remove the old inventory code, split HUD, map and mainmenu into seperate implementation files	2012-05-13 18:14:03 +02:00
scrawl	f300a5621c	Merge branch 'master' into inventoryGUI	2012-05-13 17:45:57 +02:00
Marc Zinnschlag	2bf12a4839	Merge remote branch 'scrawl/itemstacking'	2012-05-13 17:22:18 +02:00
scrawl	82b9f835b1	make sure iterator is not end() before trying to get the equipped item	2012-05-13 16:54:18 +02:00
scrawl	a47d29c184	fix the inventory window overlapping with over windows in default layout	2012-05-13 16:41:00 +02:00
scrawl	8c458fc5ce	Merge branch 'master' into gui	2012-05-13 16:20:35 +02:00
scrawl	471f6467ec	Merge branch 'master' into graphics ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-05-13 16:18:22 +02:00
scrawl	e9a1ef4269	Merge branch 'master' into inventoryGUI	2012-05-13 16:16:54 +02:00
Marc Zinnschlag	73d19f9185	Merge remote branch 'scrawl/itemstacking'	2012-05-13 16:06:30 +02:00
scrawl	d341d2113c	fixed some issues	2012-05-13 14:58:38 +02:00
scrawl	ee7e482cba	implemented un-stacking	2012-05-13 11:52:17 +02:00
scrawl	3a93df8db4	dynamic inventory layout like morrowind	2012-05-13 11:25:35 +02:00
scrawl	d266b4fe87	hide the cursor during drag&drop and don't allow hotkeys that change guimode	2012-05-13 10:18:17 +02:00
scrawl	f31853d30b	mouse wheel works when mouse is over an item	2012-05-13 01:27:17 +02:00
scrawl	16522ddc59	InventoryStore re-stacking unequipped items	2012-05-12 23:09:03 +02:00
scrawl	78b06d0ebf	inventory window pinning	2012-05-12 22:44:12 +02:00
scrawl	822e5fbe1e	add indication which filter is selected	2012-05-12 22:00:15 +02:00
scrawl	902309a554	working filters	2012-05-12 21:44:33 +02:00
scrawl	0114bf948c	revised filters	2012-05-12 21:28:04 +02:00
scrawl	8e6c943400	"take all"-button sound (first item)	2012-05-12 20:39:21 +02:00
scrawl	fd18c95c5f	implemented filters (no gui yet)	2012-05-12 20:35:50 +02:00
scrawl	24e54a81bd	don't show icons in the inventory tooltips, exactly like MW does	2012-05-12 20:28:12 +02:00
scrawl	e6e50f4ad4	fix items getting cut off	2012-05-12 20:14:19 +02:00
scrawl	f3c88adc0b	items can now also be dropped on another item (and will be placed in ... container)	2012-05-12 20:06:44 +02:00
scrawl	54c23c7422	show the background texture for enchanted items in inventory/container	2012-05-12 19:48:01 +02:00