openmw

mirror of https://github.com/OpenMW/openmw.git synced 2025-01-23 22:53:55 +00:00

Author	SHA1	Message	Date
Marc Zinnschlag	08f6d04960	constness fixes	2013-03-18 08:29:40 +01:00
Marc Zinnschlag	19c3b5516d	Merge remote-tracking branch 'glorf/fallbacks-next' into next	2013-03-18 08:14:25 +01:00
scrawl	95e1cdc07d	Move getArmorRating to MWWorld::Class.	2013-03-17 22:29:12 +01:00
scrawl	c66675b599	Fix the 'Take all' button taking equipped items when stealing	2013-03-17 22:28:28 +01:00
Glorf	5922637c58	Unblocked Solstheim weather that should work now.	2013-03-17 20:12:26 +01:00
Glorf	f3fd3a7691	Much more moons fallbacks	2013-03-17 19:36:14 +01:00
Glorf	1369090a80	More moons fallbacks, minor weather fixes	2013-03-17 14:50:02 +01:00
Glorf	6165cd2c6b	Moons fallbacks partially implemented	2013-03-17 14:22:30 +01:00
Glorf	ea7f386e7d	Access to Fallback via getFallback	2013-03-17 13:50:15 +01:00
greye	52ed451ae7	fix eraseStatic() assumptions	2013-03-17 08:36:15 +04:00
scrawl	c07b3ea61d	Text defines for npc race, class, and faction should use the translated name	2013-03-17 04:20:30 +01:00
scrawl	dd57eabc3e	Better use an enum for magic effect IDs	2013-03-16 23:28:26 +01:00
scrawl	1666bc7740	Armor rating	2013-03-16 22:53:33 +01:00
scrawl	e8b08326dc	Corrected Id, Race, Class, Faction and Cell select functions to do the exact opposite as before. That is how they are displayed in the CS, anyway.	2013-03-16 20:52:05 +01:00
scrawl	cebcbe11f8	Implemented service refusal	2013-03-16 20:32:21 +01:00
scrawl	c0b0227e8a	enchanting	2013-03-16 19:00:14 +01:00
pvdk	75be474005	Use the resolution QRegExp cap() instead of converting ints back and forth	2013-03-16 13:45:23 +01:00
pvdk	d1860f2d6c	Removed color information from Direct3D resolutions	2013-03-16 13:40:29 +01:00
pvdk	c15d920133	Fixed the first run dialog, makes sure Morrowind.ini is found	2013-03-16 01:46:28 +01:00
scrawl	485b6c855a	Fix NPC race height not being applied	2013-03-15 16:44:35 +01:00
Marc Zinnschlag	66a2df68db	some cleanup	2013-03-15 10:26:04 +01:00
Glorf	727a598cbe	Last tabulator died	2013-03-15 10:32:03 +01:00
Glorf	542c1bcc53	Some other tabulators deleted	2013-03-15 10:28:39 +01:00
Glorf	e1c6c3fe02	Tabulators deleted	2013-03-15 10:22:02 +01:00
Glorf	521bebd2f4	Fallback system rewritten, added light fallbacks	2013-03-15 10:17:30 +01:00
Marc Zinnschlag	4de2a741ed	Merge remote-tracking branch 'scrawl/master'	2013-03-15 09:58:24 +01:00
pvdk	110dd5d0ee	Possible fix for the resolutions not appearing with Direct3D Renderer	2013-03-15 01:56:39 +01:00
scrawl	3e9cd0e2e3	Fix the back button on generate class result dialog advancing creation stage	2013-03-14 22:33:51 +01:00
Marc Zinnschlag	ef72894b81	Merge remote-tracking branch 'scrawl/alwaysrun' into next	2013-03-14 22:11:12 +01:00
scrawl	7ab236337b	Dialogue responses should be random only for persuasion results	2013-03-14 21:33:00 +01:00
scrawl	b36295cbb3	Removed a leftover	2013-03-14 21:10:22 +01:00
scrawl	5b943a965f	Handle always run in the inputmanager, instead of using forced stance.	2013-03-14 21:08:19 +01:00
scrawl	2d8f0949a4	Always run key (Y)	2013-03-14 20:27:16 +01:00
scrawl	beab20cb42	Fix message boxes not opening if they opened as a result of object activation	2013-03-14 19:53:57 +01:00
gus	9efb073617	clean up + correct a bug	2013-03-14 18:05:00 +00:00
gus	80804fac35	check if the NPC is close from a non loaded cell. If yes, AITravel is simply ended.	2013-03-14 17:16:37 +00:00
greye	d30b38f336	fix Store<T>::eraseStatic()	2013-03-14 19:28:17 +04:00
Marc Zinnschlag	73278edf7e	Merge remote-tracking branch 'scrawl/collision' into next	2013-03-14 13:29:31 +01:00
scrawl	84afd87321	Placeable objects should not collide unless they have a NiRootCollisionNode	2013-03-14 03:04:02 +01:00
scrawl	c4a42f2e1f	Fix infinite recursion on shutdown caused by incorrect onWidgetDestroy listener	2013-03-13 23:17:25 +01:00
scrawl	e4717d7c92	Merge branch 'next' of git://github.com/zinnschlag/openmw into next	2013-03-13 19:46:05 +01:00
scrawl	17fb0f5a69	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-03-13 19:45:47 +01:00
scrawl	0223df4dfc	Fix invalid cast exception in the spell creation dialog	2013-03-13 19:45:22 +01:00
scrawl	fdcbdbf35d	Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay	2013-03-13 19:44:34 +01:00
gus	f943580138	Somehow manages to get from one cell to another, but this looks wrong... And I don't know how morrowind do it, because aitravel is completly buggy	2013-03-12 17:44:22 +00:00
Marc Zinnschlag	25fd7a41eb	Merge remote-tracking branch 'scrawl/next' into next	2013-03-12 18:13:57 +01:00
scrawl	4c588cbab6	Levelup dialog is now dynamic; added level descriptions	2013-03-12 17:18:47 +01:00
Marc Zinnschlag	10fad47a81	some cleanup	2013-03-12 14:51:16 +01:00
Marc Zinnschlag	170451cb79	Merge remote-tracking branch 'graffy76/saveOnClose' into next	2013-03-12 14:47:42 +01:00
Marc Zinnschlag	75bd30844d	added optional format sub-record to tes3 record	2013-03-12 14:33:35 +01:00
graffy76	50abb22162	Fix to allow application closing from multiple views and a single view.	2013-03-12 06:28:13 -05:00
Marc Zinnschlag	9e68a420ae	restructuring tes3 record structs	2013-03-12 08:15:20 +01:00
Marc Zinnschlag	ce67fbdfca	Merge remote-tracking branch 'pvdk/encoding'	2013-03-12 07:02:44 +01:00
Marc Zinnschlag	0b51e89b78	Merge remote-tracking branch 'pvdk/uifix2'	2013-03-12 07:01:41 +01:00
pvdk	31ba332647	Moved Windows icon to files/launcher	2013-03-12 04:05:14 +01:00
pvdk	f574c37e93	Added encoding flag to ini importer arguments	2013-03-12 04:00:43 +01:00
scrawl	41a958cd4e	Fix hardcoded beast races in MWClass::Npc::getModel	2013-03-12 02:50:23 +01:00
scrawl	46d8f3ce5a	Fix hardcoded race IDs	2013-03-12 02:44:03 +01:00
scrawl	eeb60edb65	Properly check for the Beast flag instead of hardcoding beast races	2013-03-12 02:09:54 +01:00
scrawl	543f573739	Fix the firstguard armor mod	2013-03-12 02:02:59 +01:00
pvdk	81604613b5	Narrowed down includes to improve compile time	2013-03-12 01:29:13 +01:00
scrawl	bcdab2aeab	Fix wrong padding breaking local map for cells where the bounds center is far from the origin	2013-03-11 19:32:39 +01:00
Marc Zinnschlag	2e1a1fd11a	removing some remains of the removed GMST fixing feature	2013-03-11 16:30:47 +01:00
Marc Zinnschlag	64d517dd79	removed unused file type information from esm component	2013-03-11 14:42:49 +01:00
graffy76	96b62940b3	Fixes docked subviews becoming tabbed and application closure when closing one of several views.	2013-03-11 06:38:27 -05:00
Marc Zinnschlag	a0df25c631	Merge remote-tracking branch 'pvdk/uifix'	2013-03-11 10:10:48 +01:00
Pieter van der Kloet	b4d408af5d	Added actions to datafiles.ui and implemented them in the launcher	2013-03-11 01:48:01 +01:00
Pieter van der Kloet	fc1940257a	Fixed issue with new profile dialog being too small	2013-03-11 01:23:24 +01:00
Pieter van der Kloet	091c569fbe	Fixed issue with the combobox dropdown looking weird	2013-03-11 01:20:30 +01:00
pvdk	52e5dcc7f0	Some fixes to the way data paths are saved and settings are handled	2013-03-10 21:12:26 +01:00
Marc Zinnschlag	f6d2dec973	Merge remote-tracking branch 'glorf/master'	2013-03-10 17:28:57 +01:00
gus	bbc4c23f7e	AITravel now works correctly on exterior cells. As long as NPC don't try to leave cell, it's ok.	2013-03-10 15:07:22 +00:00
Glorf	93de570f9a	Moved specializations out of step	2013-03-10 15:58:29 +01:00
Glorf	04e99ee9d6	Character creation struct consts	2013-03-10 15:15:33 +01:00
Glorf	1ef682896a	Character creation questions import	2013-03-10 15:03:48 +01:00
graffy76	ce91ef36ea	Fix for warnings on close, leaves all views open until a decision is made	2013-03-10 07:49:43 -05:00
Glorf	d5ca00c927	Another fix	2013-03-10 12:11:38 +01:00
Marc Zinnschlag	bdec87e51b	some cleanup	2013-03-10 11:30:50 +01:00
Glorf	81338d3b23	Weather code fixes	2013-03-10 11:30:24 +01:00
Marc Zinnschlag	65c382116f	Merge remote-tracking branch 'glorf/master'	2013-03-10 11:24:23 +01:00
Marc Zinnschlag	6cef7fb610	rescale all objects to the range of [0.5, 2] when a cell becomes active	2013-03-10 10:00:20 +01:00
Glorf	a68c55fea5	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-03-10 00:29:42 +01:00
Glorf	aebd9a3700	Weather to pull	2013-03-10 00:24:14 +01:00
Marc Zinnschlag	549678394c	Merge remote-tracking branch 'potatoesmaster/fallback-archives'	2013-03-09 23:01:42 +01:00
scrawl	a51b73b609	Fix topics that have the same name as a service opening that service when clicked	2013-03-09 21:50:01 +01:00
Marc Zinnschlag	fbaad8e105	Merge remote-tracking branch 'potatoesmaster/strfix'	2013-03-09 21:33:32 +01:00
Emanuel Guevel	289bbc64f7	Load fallback archives listed in openmw.cfg at startup	2013-03-09 21:14:11 +01:00
Sebastian Wick	0ae48c1f83	fix for Bug #509	2013-03-09 20:40:59 +01:00
scrawl	b19571df89	If character creation dialogs are enabled in the wrong order, force creation stage to advance	2013-03-09 14:59:50 +01:00
Marc Zinnschlag	2cc20c67cb	Merge remote-tracking branch 'scrawl/raycasting'	2013-03-09 14:34:29 +01:00
scrawl	5c94c654d4	Fix wrong rotation of objects dropped on the ground	2013-03-09 13:27:24 +01:00
scrawl	c8b31b4745	Remove an outdated message	2013-03-09 13:26:00 +01:00
graffy76	c17821e6c8	Merge branch 'master' of https://github.com/zinnschlag/openmw into saveOnClose	2013-03-08 20:08:56 -06:00
Emanuel Guevel	c020665cf2	Fix appending int to string in an exception message	2013-03-09 01:00:03 +01:00
scrawl	d7c4a622cf	Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack	2013-03-08 23:46:25 +01:00
Marc Zinnschlag	d396785008	Merge remote-tracking branch 'scrawl/master'	2013-03-08 11:00:20 +01:00
graffy76	03c7f18112	Fixes for save-on-close message boxes	2013-03-07 17:48:05 -06:00
scrawl	285b4bf726	Allow zooming camera in vanity or preview mode with the mousewheel	2013-03-08 00:12:56 +01:00
Emanuel Guevel	1223a2e105	Bsatool: extract and extractall modes	2013-03-07 21:21:00 +01:00
Emanuel Guevel	3adf3f5121	Revive bsatool	2013-03-07 21:13:10 +01:00
Marc Zinnschlag	17e406e58c	Merge remote-tracking branch 'mikesc/bug586'	2013-03-07 20:48:58 +01:00
Michal Sciubidlo	f2f4b6e2d5	Make MWWorld::getInterior case insensitive. Interior cells names can use different mix of uppercase/lowercase in different places. getInterior() should return same cell in all cases. Fixes bug #586.	2013-03-07 20:15:01 +01:00
Marc Zinnschlag	2a9d15cd9f	Merge remote-tracking branch 'scrawl/master'	2013-03-07 16:42:07 +01:00
scrawl	66a754e9aa	Fix tooltip position when hovering the crosshair over NPCs	2013-03-07 15:25:22 +01:00
scrawl	0ee0dbdb97	Added "dispose corpse" button, added stealing (all items visible and no penalty yet)	2013-03-07 14:00:13 +01:00
scrawl	e34685b8a3	Fix manually changed mouse cursor	2013-03-07 12:46:26 +01:00
Marc Zinnschlag	a994a23f4e	file loading fixes	2013-03-07 07:56:29 +01:00
Pieter van der Kloet	9145fb210b	Merge remote-tracking branch 'upstream/master' into opencsui	2013-03-07 03:02:03 +01:00
Pieter van der Kloet	7504ae675b	Implemented a file dialog for the editor using launcher .ui	2013-03-07 03:00:59 +01:00
gus	01908dbcc2	little improvement	2013-03-06 21:17:33 +00:00
gus	5fc7103425	First attempt at pathfinding using boost::graph	2013-03-06 20:31:47 +00:00
scrawl	8be9627c8d	Fix method signatures	2013-03-06 21:26:41 +01:00
scrawl	f7d8f6456f	Stats should never go below 0	2013-03-06 20:45:11 +01:00
Marc Zinnschlag	642653d10e	World constructor fixes	2013-03-06 19:57:00 +01:00
Marc Zinnschlag	7e100c36b5	Merge remote-tracking branch 'gus/AI'	2013-03-06 19:05:55 +01:00
Marc Zinnschlag	ef86a693c3	Merge remote-tracking branch 'scrawl/sneak'	2013-03-06 18:59:37 +01:00
Marc Zinnschlag	69eb5aa99a	Merge remote-tracking branch 'scrawl/master'	2013-03-06 18:59:02 +01:00
gus	5938e19362	Clean up	2013-03-06 17:31:57 +00:00
scrawl	66d2d3522f	Race selection preview: render only the head, and focus the camera on its node	2013-03-06 18:03:47 +01:00
scrawl	268bb23590	Implemented sneaking animation	2013-03-06 16:58:56 +01:00
scrawl	39411eda7b	Fix the spell buying window listing already owned spells	2013-03-06 15:11:40 +01:00
Pieter van der Kloet	c9859382bf	Made the launcher write the custom resolution to file, cleaned resolution parsing	2013-03-06 01:35:32 +01:00
gus	d3bf3812a4	changing rotation order (fix some misoriented objects)	2013-03-05 20:16:57 +00:00
gus	8b6f0e0770	Correct orientation sign	2013-03-05 18:28:57 +00:00
Marc Zinnschlag	d839a4c6c2	Merge remote-tracking branch 'scrawl/graphics'	2013-03-05 16:31:22 +01:00
scrawl	fe7b2732d8	Avoid manually updating render targets from within frameRenderingQueued	2013-03-05 14:24:29 +01:00
scrawl	2486ec6cb9	Material fixes (vertex colors, alpha)	2013-03-05 13:51:48 +01:00
Marc Zinnschlag	46de45b9a2	added var type column to globals	2013-03-05 11:37:13 +01:00
Marc Zinnschlag	dc3edc6024	Merge branch 'vartype'	2013-03-05 10:59:08 +01:00
Marc Zinnschlag	1489570b09	change variant in info record to new type	2013-03-05 10:34:03 +01:00
Marc Zinnschlag	ba4907fbaf	use new Variant type for GMSTs	2013-03-05 08:02:27 +01:00
Pieter van der Kloet	770d8af931	Forgot to add the DataFilesPage .ui	2013-03-05 03:57:27 +01:00
Pieter van der Kloet	75cf009101	Finished implementing the .ui file for the DataFilesPage	2013-03-05 03:47:57 +01:00
Pieter van der Kloet	4c9d0563fe	WIP: Implementing the .ui for the DataFilesPage	2013-03-05 03:13:39 +01:00
Pieter van der Kloet	fb5213a754	Made the GraphicsPage use a .ui file and added support for custom res	2013-03-05 02:17:28 +01:00
Marc Zinnschlag	8a887a0aef	Merge remote-tracking branch 'potatoesmaster/tradewindow'	2013-03-04 19:42:51 +01:00
Marc Zinnschlag	ac810faa7e	Merge remote-tracking branch 'scrawl/master'	2013-03-04 19:36:58 +01:00
Marc Zinnschlag	a93034b0a9	Merge remote-tracking branch 'k1ll/store_segfault_fix'	2013-03-04 19:27:14 +01:00
scrawl	d5c6c221c1	Books/scrolls: Fix the take button incorrectly showing	2013-03-04 17:28:01 +01:00
scrawl	ca707aa65f	Transparency should be evaluated per subentity, not per NIF	2013-03-04 16:57:00 +01:00
scrawl	cab5315a8e	Disable mipmaps generation	2013-03-04 16:28:20 +01:00
Marc Zinnschlag	a1ac20c6f3	changed global variable records to new variant type	2013-03-04 14:32:59 +01:00
Marc Zinnschlag	65081f5520	added variant class	2013-03-04 14:32:23 +01:00
gus	3384d92761	oups introduced a bug..	2013-03-04 12:28:43 +00:00
gus	48b3f1e0cf	Clean up. But still a little hacky	2013-03-04 12:08:35 +00:00
Emanuel Guevel	8e07638699	Update the trading offer on "max sale" button click	2013-03-04 12:24:41 +01:00
graffy76	6911868f2a	File->close and File->exit menu items added. Exit uses closeAllWindows() to ensure ViewManager::closeRequest is called on the last open window. Exit will close all open windows but the last one in cases of active save operation or modified file.	2013-03-03 15:58:26 -06:00
scrawl	f1d35b73b8	Cleanup	2013-03-03 19:52:20 +01:00
scrawl	359ae06fcf	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 19:35:26 +01:00
scrawl	c9fefc7f5d	Simpler, more lightweight underwater effect, changed colors to match vanilla better	2013-03-03 19:28:11 +01:00
Marc Zinnschlag	123a111580	Merge remote-tracking branch 'scrawl/master'	2013-03-03 17:13:05 +01:00
scrawl	f0e3463e9b	Disable assertion for comparing iterators from different containers (Bug #605 )	2013-03-03 16:50:10 +01:00
scrawl	5341bf9504	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:51:58 +01:00
Marc Zinnschlag	3e97943e06	Merge remote-tracking branch 'scrawl/includes'	2013-03-03 15:37:13 +01:00
Marc Zinnschlag	5595675664	Merge remote-tracking branch 'scrawl/effects'	2013-03-03 15:33:23 +01:00
scrawl	05bd94effb	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:14:20 +01:00
scrawl	002830e13b	Make sure render textures are inactive when in a cell without water	2013-03-03 15:11:45 +01:00
scrawl	867b22ce19	Fix a terrain glitch	2013-03-03 15:11:19 +01:00
scrawl	11f21a1988	Weather update should be before renderer update	2013-03-03 15:10:40 +01:00
gus	5951abfae2	fix some script instructions	2013-03-03 13:59:38 +00:00
gus	7fb2ff18a3	Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public)	2013-03-03 13:06:45 +00:00
gus	e1882dce32	correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived.	2013-03-03 13:02:41 +00:00
scrawl	9a84f6744f	Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)	2013-03-03 13:11:02 +01:00
scrawl	6037c44ea6	Fix ingredient effect display	2013-03-03 12:41:57 +01:00
scrawl	6f05c4229f	Implemented potion & ingredient effect stacking	2013-03-03 12:41:37 +01:00
scrawl	8e05c4159d	Magic effect icons for permanent enchantments	2013-03-03 12:17:37 +01:00
scrawl	cf87708c1f	Magic effect icons for spells	2013-03-03 12:01:19 +01:00
scrawl	0f6fd80294	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout	2013-03-03 11:02:38 +01:00
graffy76	eb90bd71ba	Fixed triggering confirmation messages boxes when more than one view is open.	2013-03-02 21:34:55 -06:00
Pieter van der Kloet	0a6e3701ab	Made the Play page use a .ui file too	2013-03-03 01:49:41 +01:00
Pieter van der Kloet	f2193bb1ba	Made the mainwindow use a .ui file and removed the stylesheet	2013-03-03 00:48:09 +01:00
Pieter van der Kloet	2b6bb9657b	Added Qt Designer .ui files	2013-03-02 23:49:31 +01:00
Pieter van der Kloet	a3c5c868ec	Merge remote-tracking branch 'upstream/master' into launcherui	2013-03-02 23:01:53 +01:00
Nathan Jeffords	109dff2d29	renamed high level NIF files...	2013-03-02 13:23:09 -08:00
k1ll	dde43e8c87	Some cleanup	2013-03-02 21:46:31 +01:00
graffy76	bf6c855e6d	Final changes to implement save-on-close features	2013-03-02 12:49:26 -06:00
Nathan Jeffords	d3c1f5e7b2	renamed low-level NIF related files and include guards to conform to naming convention	2013-03-02 10:46:12 -08:00
k1ll	9acd4061cc	Fix dangling static references in mShared	2013-03-02 17:04:17 +01:00
graffy76	9193ddc9d3	Merge branch 'master' into saveOnClose	2013-03-02 09:24:42 -06:00
graffy76	a2e36594c9	Completed "abort save on close" feature	2013-03-02 09:22:44 -06:00
graffy76	f85be6a744	80% complete save-on-close feature	2013-03-02 07:57:41 -06:00
scrawl	e1957e4ee9	Potion effects should be hidden until discovered	2013-03-02 13:34:26 +01:00
Marc Zinnschlag	0f4f91605a	some cleanup	2013-03-02 11:19:48 +01:00
Marc Zinnschlag	401903c9ce	Merge remote-tracking branch 'lazydev/master'	2013-03-02 11:11:41 +01:00
lazydev	ccb7ed93b3	fix for https://bugs.openmw.org/issues/593	2013-03-02 03:54:25 +04:00
Marc Zinnschlag	3961fb36d4	Merge remote-tracking branch 'chris/transparency-fixes'	2013-03-01 23:18:35 +01:00
Chris Robinson	e6b547b9ba	Merge remote-tracking branch 'zini/master' into transparency-fixes	2013-03-01 13:32:30 -08:00
scrawl	ef1678e47e	Oops, rotation center should be dynamic	2013-03-01 22:32:02 +01:00
Chris Robinson	238a8feb18	Fix transparency checks	2013-03-01 13:27:25 -08:00
scrawl	d8f2d0195a	Got rid of the texture rotation hack by rendering the cursor manually.	2013-03-01 18:45:52 +01:00
scrawl	1d988676fe	Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this.	2013-02-28 22:56:29 +01:00
Chris Robinson	1168f15361	Don't disable depth writes when blending is enabled	2013-02-28 12:17:58 -08:00
scrawl	b7ab12e7cf	Workaround to prevent the map drawing on top of the world button	2013-02-28 21:12:13 +01:00
scrawl	3efbb5e728	Don't try to render a map in empty cells	2013-02-28 20:27:35 +01:00
Marc Zinnschlag	038c5c3e82	Merge remote-tracking branch 'mikesc/bug574'	2013-02-28 20:21:38 +01:00
Michal Sciubidlo	3df34fb5cc	fix bug 574	2013-02-28 19:52:32 +01:00
vorenon	c9a701cfa1	Removed the 3 dots after the load text.	2013-02-28 19:25:18 +01:00
vorenon	f66f67eaa1	Loading text uses now the corresponding GMSTs	2013-02-28 17:54:42 +01:00
vorenon	a6fb58bc59	Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell" This commit replaces the default "Loading Cell" text with "Loading Interior" and "Loading Exterior"	2013-02-28 16:31:24 +01:00
vorenon	d4aa33b9a7	Removing the unloading cells part instead of just commenting them.	2013-02-28 15:58:03 +01:00
vorenon	ffd96c7715	Removed "Unloading Cell..." text from loading screen OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of the "flicker" every time a cell loads.	2013-02-28 13:19:05 +01:00
Chris Robinson	bfe80bb8dc	Avoid duplicating skeletons due to casing issues Manually created resource names are apparently always case sensitive, causing some skeletons to get loaded multiple times.	2013-02-27 12:33:36 -08:00
Marc Zinnschlag	ce1310614c	Merge remote-tracking branch 'potatoesmaster/pinned'	2013-02-27 17:37:04 +01:00
Marc Zinnschlag	14459460c1	Merge remote-tracking branch 'potatoesmaster/gender'	2013-02-27 17:36:57 +01:00
Marc Zinnschlag	7cae69ee4e	Merge remote-tracking branch 'vorenon/master'	2013-02-27 17:36:03 +01:00
Emanuel Guevel	be9d49c510	Do not hide pinned windows during loadings	2013-02-27 16:17:41 +01:00
Emanuel Guevel	0bc4c3556a	Fix dialogue gender filter	2013-02-27 15:58:01 +01:00
scrawl	369f881170	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-27 09:25:44 +01:00
scrawl	9b0ac4e299	NPCs / creatures can now emit ripples	2013-02-27 09:20:42 +01:00
vorenon	89cba3cf45	Replaced ifs/elseifs with switch	2013-02-26 19:52:51 +01:00
vorenon	13c33c1613	added missing click sound to main menu	2013-02-26 19:37:47 +01:00
Chris Robinson	35e2b6942a	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-26 10:21:28 -08:00
Chris Robinson	ceafcc2ebb	Support float samples with ffmpeg Requires the AL_EXT_FLOAT32 extension in OpenAL	2013-02-26 10:19:33 -08:00
Nathan Jeffords	21f502e3dd	properly handle potentially non 16 bit planar audio formats	2013-02-26 09:37:18 -08:00
vorenon	b1ca719d61	Added click sound to OK button for message boxes	2013-02-26 16:37:59 +01:00
vorenon	1a43d86d9e	Close messages boxes with the activation key (Bug #589 )	2013-02-26 15:58:32 +01:00
scrawl	d4264353a3	Merge branch 'z-up' into graphics Conflicts: apps/openmw/mwrender/localmap.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/water.cpp files/materials/water.shader	2013-02-26 14:54:53 +01:00
Marc Zinnschlag	dc445844d2	Merge remote-tracking branch 'scrawl/z-up'	2013-02-26 14:37:50 +01:00
Marc Zinnschlag	a7102c143f	ESX variable type cleanup	2013-02-26 14:37:11 +01:00
scrawl	b9912a19e0	Z-up conversion: fix player arrow direction on global map	2013-02-26 14:31:30 +01:00
scrawl	cd68012498	Z-up conversion: raycasts	2013-02-26 14:28:35 +01:00
scrawl	cc9b72b9b1	Removing some leftovers of mwRoot node	2013-02-26 14:01:10 +01:00
scrawl	341f9b96e2	Local map: restore zHigh	2013-02-26 13:53:23 +01:00
scrawl	284ba58e1e	Z-up conversion: global map, shader fix	2013-02-26 13:52:01 +01:00
scrawl	2e7bc1a368	Z-up conversion: local map, fix tcg	2013-02-26 13:39:10 +01:00
scrawl	5c0c5854e8	Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not	2013-02-26 12:01:10 +01:00
scrawl	3ef952172d	Z-up conversion: water, sky	2013-02-26 10:38:48 +01:00
scrawl	3cb3ec91c0	Z-up conversion: camera	2013-02-26 09:12:35 +01:00
scrawl	a5451eb9d9	Z-up conversion: terrain, objects	2013-02-26 08:30:06 +01:00
Chris Robinson	955e2713a9	Fix encumbrance term calculation	2013-02-25 17:29:32 -08:00
Chris Robinson	a576e9e430	Set the race selection character preview in a valid (idle) pose.	2013-02-25 16:40:08 -08:00
Chris Robinson	9679daa6a4	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 13:10:21 -08:00
Chris Robinson	da575b181e	Use the correct GMST for the race menu	2013-02-25 13:04:17 -08:00
Pieter van der Kloet	b209b6a0e6	Added missing includes	2013-02-25 22:00:51 +01:00
Pieter van der Kloet	469d608f51	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 21:26:54 +01:00
Pieter van der Kloet	9cd8dd39de	Make the launcher code conform to the coding standards and cleanup	2013-02-25 21:22:07 +01:00
Marc Zinnschlag	bd9884b244	Merge remote-tracking branch 'chris/misc-cleanup'	2013-02-25 19:45:09 +01:00
Chris Robinson	000128d084	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 10:38:08 -08:00
Marc Zinnschlag	08f13ef5ab	Merge remote-tracking branch 'greye/master'	2013-02-25 19:34:03 +01:00
Marc Zinnschlag	fa45def475	Merge remote-tracking branch 'scrawl/master'	2013-02-25 19:30:30 +01:00
greye	661fd73c6e	fix rotation for objects in inactive cells and forced vanity mode	2013-02-25 22:00:50 +04:00
Chris Robinson	48271e49ec	Properly update the Ptr object in the mechanics manager when moving across cells	2013-02-25 09:57:34 -08:00
scrawl	8aff033a0c	Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog	2013-02-25 18:29:11 +01:00
scrawl	b1fc68d44d	Merge branch 'master' into graphics	2013-02-25 17:36:33 +01:00
scrawl	355390429e	Fix World::isUnderwater to use dynamic waterlevel	2013-02-25 17:27:50 +01:00
Marc Zinnschlag	88e8659a49	minor cleanup	2013-02-25 16:52:31 +01:00
Chris Robinson	5d5d28c06c	Increase the ID cache to 40 Helps improve performance with Tribunal and Bloodmoon's scripts	2013-02-25 07:43:56 -08:00
scrawl	73d48a95f6	Add message box when the player tries to move when being overencumbered.	2013-02-25 16:31:48 +01:00
scrawl	cacdb33b42	Merge branch 'master' into graphics Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/sky.cpp	2013-02-25 15:12:03 +01:00
Marc Zinnschlag	cd40d167ce	Merge remote-tracking branch 'chris/animation2'	2013-02-25 14:56:03 +01:00
scrawl	dfe29db9cb	Fix bug #591 : Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)	2013-02-25 06:57:32 +01:00
Pieter van der Kloet	c4ebdc230c	Cleaned up strings and indentation	2013-02-25 01:28:13 +01:00
Pieter van der Kloet	a0007325ad	Added a warning when stylesheet cannot be read and check if data paths contain masters/plugins	2013-02-25 01:22:14 +01:00
Pieter van der Kloet	6eaaf20c94	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 00:56:23 +01:00
Pieter van der Kloet	17a0a201df	Various fixes and changes to the settings handling	2013-02-25 00:56:04 +01:00
Chris Robinson	000236ba80	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 15:30:46 -08:00
Chris Robinson	74b8095fc7	Use default parameters where appropriate	2013-02-24 14:43:20 -08:00
Chris Robinson	5267d17408	Revert "forgot to destroy child scene nodes" This reverts commit `f1a3309392`. Unneeded. The caller already calls this which destroys the children recursively	2013-02-24 14:14:08 -08:00
ChrisKCat	9e7b559b09	Merge pull request #6 from scrawl/lights For light objects without an AttachLight bone, attach the light to the c...	2013-02-24 14:12:53 -08:00
scrawl	f1a3309392	forgot to destroy child scene nodes	2013-02-24 19:03:25 +01:00
scrawl	1ae2d3c6ab	For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.	2013-02-24 19:00:06 +01:00
Nathan Jeffords	7ea1f6a02a	fixes for using FFMPEG on windows	2013-02-24 09:42:08 -08:00
scrawl	a3afb91485	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-24 18:04:51 +01:00
Chris Robinson	94be45e07e	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 06:20:10 -08:00
ChrisKCat	aab7cf137b	Merge pull request #5 from greye/cross-cell fix and unify object cell change update in mwrender	2013-02-24 05:32:52 -08:00
Marc Zinnschlag	fa880e3274	Merge remote-tracking branch 'lazydev/master'	2013-02-24 14:07:52 +01:00
Chris Robinson	db9a3aeddf	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 03:32:35 -08:00
Chris Robinson	89d4c245e9	Better calculate jump velocity The fatigue term isn't currently used correctly	2013-02-24 03:30:33 -08:00
greye	6a8c532244	fix and unify object cell change update in mwrender	2013-02-24 15:04:56 +04:00
scrawl	0d6a3367d3	Water shader no longer depends on object shaders being enabled	2013-02-24 10:28:50 +01:00
scrawl	3135482cee	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-24 10:06:04 +01:00
Pieter van der Kloet	919d1ee572	Some fixes to the settings handlers	2013-02-24 04:14:18 +01:00
Pieter van der Kloet	4737b20e4c	Fixed a bug in the combobox popup font size, items overlapping	2013-02-24 04:00:22 +01:00
Pieter van der Kloet	be43fa334f	Added support for non-latin characters, fixes Bug #515	2013-02-24 03:14:19 +01:00
Pieter van der Kloet	9198afeefb	Improved context menu, added context menu for masters and added multi-selection support	2013-02-24 03:10:27 +01:00
Chris Robinson	90cb9ee0ac	Don't set a vertical velocity when on the ground	2013-02-23 16:30:11 -08:00
lazydev	a5ff8181b7	fix for https://bugs.openmw.org/issues/569	2013-02-24 03:35:43 +04:00
Chris Robinson	8e59ea4941	Use a separate method to handle animation events	2013-02-23 14:39:01 -08:00
Pieter van der Kloet	150d4a7a72	Added support for multiple ini files	2013-02-23 23:18:42 +01:00
Chris Robinson	d77d035d3a	Handle the "sound" events in runAnimation	2013-02-23 14:15:11 -08:00
Chris Robinson	df8889dcc4	Limit maximum frame time to 200ms This effectively slows game time when it drops below 5 fps. Something like this is desirable when dealing with time-based animations, which can jump forward after a lengthy cell transition.	2013-02-23 13:15:37 -08:00
Marc Zinnschlag	9a03b17b2d	Merge branch 'localworkaround'	2013-02-23 20:50:22 +01:00
Marc Zinnschlag	a95431c387	fix	2013-02-23 20:20:40 +01:00
Marc Zinnschlag	9e8d0128e0	Merge remote-tracking branch 'blunted2night/size_t-warnings_v2'	2013-02-23 20:06:27 +01:00
Nathan Jeffords	44b1c66c4b	fixed various warnings about converting size_t to int	2013-02-23 10:23:38 -08:00
Chris Robinson	d208422ca7	Add a method to update an Animation's Ptr object	2013-02-23 10:12:36 -08:00
Marc Zinnschlag	d98ec67671	Merge remote-tracking branch 'graffy76/recentfiles'	2013-02-23 18:53:33 +01:00
Chris Robinson	a2eaec7878	Avoiding holding the InventoryStore in the NpcAnimation class	2013-02-23 08:03:52 -08:00
Chris Robinson	0d0e75fe0b	Don't set animation sources for models that don't have a skeleton	2013-02-23 07:36:11 -08:00
graffy76	89dace3cc3	Fix for operations widget - hides when no operations are running.	2013-02-23 09:07:13 -06:00
Chris Robinson	0148db8ccf	Merge remote-tracking branch 'zini/master' into animation2 Conflicts: apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp	2013-02-23 05:59:35 -08:00
Marc Zinnschlag	3472a6f180	workaround for infinite recursion during local variable access	2013-02-23 14:40:56 +01:00
scrawl	4b51184ec4	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 14:37:28 +01:00
Chris Robinson	e6da9dfae5	Specify the animation key to stop playing at	2013-02-23 05:15:10 -08:00
Marc Zinnschlag	59748a7647	Merge remote-tracking branch 'greye/cross-cell'	2013-02-23 13:55:31 +01:00
Sergey Shambir	a3adcf752d	TradeWindow: fixed coding style Mentioned here: https://github.com/zinnschlag/openmw/pull/554	2013-02-23 13:51:21 +01:00
greye	ac7095537f	remove insertMesh() call on object cell change	2013-02-23 16:50:37 +04:00
greye	d983ed5c78	fix invalid SceneNode pointer on cell change	2013-02-23 16:45:55 +04:00
greye	9659b4a95e	update NpcAnimation inventory reference on cell change	2013-02-23 16:45:55 +04:00
Marc Zinnschlag	868916a9a2	added add-on global variables in the same way add-on GMSTs were added	2013-02-23 12:51:45 +01:00
Marc Zinnschlag	6f5a772d02	fixed another case handling problem	2013-02-23 12:35:05 +01:00
Chris Robinson	b8f5813609	Set all animation sources at once	2013-02-23 03:34:03 -08:00
Marc Zinnschlag	c9ca565462	removed a redundant function call	2013-02-23 12:05:09 +01:00
Chris Robinson	f841576bba	Don't override animations played with playgroup	2013-02-23 01:54:46 -08:00
scrawl	7e816c826b	Fix lights without a mesh	2013-02-23 09:17:12 +01:00
scrawl	01102f9c73	Don't emit if there wasn't enough movement	2013-02-23 05:53:20 +01:00
graffy76	6f89d453a5	Operations widget height fix and abort button feature. Successfully tested resizing of Operations QDockWidget for multiple concurrent operations.	2013-02-22 21:53:32 -06:00
scrawl	5b099393fa	Fix time factor	2013-02-23 04:43:51 +01:00
scrawl	db9e49968e	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 04:13:51 +01:00
scrawl	f17ea109ca	Fix light positions	2013-02-23 04:06:05 +01:00
Chris Robinson	b12c6a4c16	Fix character preview	2013-02-22 11:16:00 -08:00
Chris Robinson	ecbf1568a1	Fix NPC part attachment	2013-02-22 10:15:29 -08:00
Chris Robinson	9dee2a72cd	Use a separate method to calculate animation velocity	2013-02-22 09:22:06 -08:00
Chris Robinson	3c0b29de45	Merge remote-tracking branch 'zini/master' into animation2	2013-02-22 01:34:22 -08:00
Chris Robinson	84227caa0c	Cleanup Npc::getSpeed a little	2013-02-22 01:30:06 -08:00
Chris Robinson	7ec73c29f2	Do not return the player's Animation object for non-players	2013-02-22 01:27:26 -08:00
Chris Robinson	9c3af5f344	Do not interpret noclip mode as flying	2013-02-22 01:26:30 -08:00
lazydev	71e5369f04	Loading translation data for all the plugin files, not only for the first one	2013-02-22 02:18:54 +04:00
Chris Robinson	7fcca180b6	Implement rudimentary jumping	2013-02-20 20:08:04 -08:00
Pieter van der Kloet	63a13cf9ca	Whoops, removed an include	2013-02-20 19:29:12 +01:00
Pieter van der Kloet	18d01cd65a	Implemented a first-run dialog to import Morrowind.ini settings	2013-02-20 19:27:04 +01:00
Chris Robinson	bbde0146a7	Merge remote-tracking branch 'zini/master' into animation2	2013-02-20 08:27:40 -08:00
Chris Robinson	4eb8ea0c95	Fix stepping and vertical force accumulation	2013-02-20 07:51:36 -08:00
Chris Robinson	b14def7c09	Set the character as being on the ground when colliding with a shallow enough slope	2013-02-20 05:24:38 -08:00
Chris Robinson	fe6fa9ebe7	Simplify newtrace a bit	2013-02-20 04:14:52 -08:00
Chris Robinson	617158afcd	Ensure updated skeleton bone placement matches in world space Objects attached to actors (shirts, robes, etc) do not require the same node hierarchy as the character root. So to ensure proper placement, we need to set the bone target's derived transformation using the source bone's derived transformation (which in turn means we need to work up from the root, to ensure the bone's parents are properly placed).	2013-02-20 02:41:46 -08:00
Chris Robinson	cfdc820a1f	Make an actor fly when it has a levitate effect	2013-02-20 01:55:12 -08:00
Emanuel Guevel	3dc28baa28	Remove "PinToggle" event from layout file	2013-02-20 01:31:10 +01:00
Emanuel Guevel	3ba3c71556	Make the "lock window" button to change state visually	2013-02-20 01:30:39 +01:00
Emanuel Guevel	43d6392921	Change the way pinnable window are made visible This ensure pinned window are not displayed in main menu, dialogue and container mode.	2013-02-20 01:00:13 +01:00
Pieter van der Kloet	2172fb4229	Added checkable message box class	2013-02-19 16:41:33 +01:00
Pieter van der Kloet	35b68a3c40	Fixed accidental profile deletion and added sorting by date	2013-02-19 15:58:01 +01:00
Chris Robinson	8196694c08	Avoid applying the animation when resetting it	2013-02-19 06:04:25 -08:00
Chris Robinson	f8349a04bf	Use the looping portion of the animation to calculate the velocity	2013-02-19 05:26:58 -08:00
Chris Robinson	5d55b41714	Remove a now-unneeded(?) hack	2013-02-19 04:59:38 -08:00
Chris Robinson	89fabdb3a9	Update the PhysicActor's RigidBody when moving This works, but is less than ideal. As it is now, the rigid body gets updated twice as the position and rotation are set separately. They should instead be updated together.	2013-02-19 04:18:15 -08:00
Chris Robinson	1399a06c76	Update animation looping when setting the same state	2013-02-19 04:01:33 -08:00
Chris Robinson	a510adc572	Allow stepping when not being affected by gravity	2013-02-19 02:25:57 -08:00
Chris Robinson	8255a64bfe	Handle levitate and swift swim effects	2013-02-19 02:10:36 -08:00
Chris Robinson	c694161272	Don't try to step if not on the ground	2013-02-19 01:28:02 -08:00
Chris Robinson	5a1a0b7338	Add and use an MWWorld::isFlying method	2013-02-18 22:39:43 -08:00
Chris Robinson	17200cb226	Don't try to move when there's no speed	2013-02-18 20:43:55 -08:00
scrawl	5d403ebdd3	Fix collision debug drawer (tcg)	2013-02-19 04:03:24 +01:00
scrawl	427152c518	Disabled ripples until we can properly trigger them from the new character controller.	2013-02-19 03:15:31 +01:00
scrawl	6cceb04adf	When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.	2013-02-19 03:08:00 +01:00
Pieter van der Kloet	37fe31e858	Merge remote-tracking branch 'upstream/next' into settings_selwidget	2013-02-19 01:12:47 +01:00
scrawl	32b837ebd4	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-19 00:15:54 +01:00
Pieter van der Kloet	bcf4f96209	Added writing masters/plugins to openmw.cfg	2013-02-18 23:10:50 +01:00
Pieter van der Kloet	178cf2154e	Made checking/unchecking work with the new datafiles model	2013-02-18 17:59:08 +01:00
Chris Robinson	627b866744	Don't try to set a new state when dead	2013-02-18 06:29:16 -08:00
Chris Robinson	f2948ced23	Allow diagonal movement	2013-02-18 03:07:31 -08:00
Marc Zinnschlag	0713afb97d	Merge branch 'gmstfixing' into next	2013-02-18 09:24:22 +01:00
Marc Zinnschlag	a50ff34774	better default value for string GMSTs	2013-02-18 09:23:14 +01:00
scrawl	42883ec64b	cleanup	2013-02-18 02:33:53 +01:00
Chris Robinson	bea460955d	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 16:03:39 -08:00
Marc Zinnschlag	1343c2c22b	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:29:45 +01:00
scrawl	b52df83d84	Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again	2013-02-17 20:23:22 +01:00
Marc Zinnschlag	e5149e57ac	Merge remote-tracking branch 'scrawl/next' into next	2013-02-17 20:04:18 +01:00
Marc Zinnschlag	475f4f9311	implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified	2013-02-17 20:03:39 +01:00
scrawl	52d0f0b750	Fixed OpAddItem, OpRemoveItem	2013-02-17 19:44:00 +01:00
Marc Zinnschlag	abd307d70e	Issue #567 : workaround for crash with non-English ESX files	2013-02-17 19:26:01 +01:00
scrawl	e1ca0a15ae	Add message box when item is added to player's inventory	2013-02-17 18:58:54 +01:00
scrawl	170a9762ac	Fix travel services not actually costing gold.	2013-02-17 18:30:21 +01:00
scrawl	791d16bbdb	Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes	2013-02-17 18:12:38 +01:00
Marc Zinnschlag	31bfe62bbc	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 17:41:19 +01:00
Marc Zinnschlag	9221c861c5	Merge remote-tracking branch 'graffy76/next' into next Conflicts: apps/opencs/CMakeLists.txt	2013-02-17 17:38:33 +01:00
Marc Zinnschlag	bb990b96bf	Merge branch 'globaltype' into next	2013-02-17 17:27:41 +01:00
Marc Zinnschlag	50d61a5b6e	proper implementation of gmst type column	2013-02-17 17:27:25 +01:00
scrawl	7ffcfa3622	Water and clouds no longer depend on timescale.	2013-02-17 16:23:55 +01:00
scrawl	5a11ddc485	Pressing F1 again hides the quick keys menu.	2013-02-17 16:01:36 +01:00
scrawl	d899f33444	Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.	2013-02-17 16:00:31 +01:00
scrawl	00db13be32	Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.	2013-02-17 15:56:22 +01:00
graffy76	ceefae81e8	fix for the opencs icon	2013-02-17 07:46:50 -06:00
Chris Robinson	e2d7cc49e3	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 03:42:37 -08:00
Marc Zinnschlag	44d66cbf5a	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 09:09:31 +01:00
Marc Zinnschlag	448293f270	Merge remote-tracking branch 'scrawl/bug_559' into next	2013-02-17 09:09:06 +01:00
Marc Zinnschlag	b8c0c94d5f	Merge remote-tracking branch 'wareya/master' into next	2013-02-17 08:58:41 +01:00
scrawl	c4f17f5596	playercontrols switch now disables activation in general (Chris' suggestion)	2013-02-17 03:03:41 +01:00
scrawl	373de19aee	Removed dialogue fix again, now on separate branch	2013-02-17 03:02:47 +01:00
scrawl	df8e502f8c	Ouch, I used && instead of &, this broke actions without a sound	2013-02-17 02:52:49 +01:00
Wareya	c98a815581	Remove debug printing from previous commit	2013-02-16 13:37:25 -05:00
Wareya	f0220fb06b	Implement "Rest Until Healed" Fixes: https://bugs.openmw.org/issues/563	2013-02-16 13:35:03 -05:00
scrawl	a5c8d5748f	fix FailedAction.	2013-02-16 18:05:25 +01:00
scrawl	0bc34c1c0d	Action::executeImp returns a bool value to indicate if the sound should be played.	2013-02-16 16:40:44 +01:00
scrawl	7d918caa93	Don't allow dialogue if player controls are disabled.	2013-02-16 16:26:40 +01:00
Marc Zinnschlag	910858c300	Merge remote-tracking branch 'sergeyshambir/guiconvience' into next	2013-02-16 14:50:42 +01:00
Douglas Mencken	eb09662f1d	Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead. It is boost headers' job to deal with their internals.	2013-02-16 14:49:11 +01:00
Douglas Mencken	a3e421167b	esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel Signed chars, unsigned chars... Just use int for index everywhere.	2013-02-16 14:48:44 +01:00
Chris Robinson	158e18b98d	Remove an unused method	2013-02-16 00:30:07 -08:00
Chris Robinson	c965bd8e18	Increase step size to 30	2013-02-15 17:22:55 -08:00
Douglas Mencken	df5919f2c5	Use `signed char' explicitly where needed. It is important because: - It is implementation-dependent if plain `char' signed or not. - C standard defines three distinct types: char, signed char, and unsigned char. - Assuming that char is always unsigned or signed can lead to compile-time and run-time errors. You can also use int8_t, but then it would be less obvious for developers to never assume that char is always unsigned (or always signed). Conflicts: components/esm/loadcell.hpp	2013-02-15 20:28:14 +01:00
scrawl	4da11a96a5	Fixed gold ref count always becoming 1 when dropped on the ground	2013-02-15 17:34:55 +01:00
Pieter van der Kloet	fd430dc5a9	Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget Conflicts: apps/launcher/datafilespage.cpp components/fileorderlist/datafileslist.cpp	2013-02-15 15:38:30 +01:00
Pieter van der Kloet	ee27e3bb58	Merge remote-tracking branch 'upstream/next' into settingsnext Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp	2013-02-15 15:21:14 +01:00
Pieter van der Kloet	0e143b1926	Merge remote-tracking branch 'upstream/master' into settingsparser	2013-02-15 14:45:19 +01:00
Pieter van der Kloet	43e9ad8733	The text color of the profiles dialog now turns red on invalid names	2013-02-15 14:26:09 +01:00
Pieter van der Kloet	990895fd2b	Mainwindow size and position now gets saved/restored	2013-02-15 14:12:25 +01:00
Chris Robinson	c57001e3bd	Remove an unused field	2013-02-15 05:11:06 -08:00
Chris Robinson	e4341525c8	Add a jump state Currently unused	2013-02-15 04:45:28 -08:00
Chris Robinson	ff0099fa6e	Scale the animation speed based on the animation velocity and movement speed This may not be totoally correct since it takes the whole animation into account, rather than just the looping portion. But it's good enough for now.	2013-02-15 02:15:39 -08:00
Chris Robinson	e1a1530774	Better implement Npc::getSpeed	2013-02-15 01:27:57 -08:00
Chris Robinson	3348e8a436	Clarify a comment	2013-02-14 22:41:14 -08:00
Chris Robinson	ac717373b1	Add a method to check if an object is on the ground	2013-02-14 22:35:15 -08:00
Chris Robinson	18b606fddf	Use the PhysicActor's set/getOnGround method	2013-02-14 20:10:04 -08:00
Chris Robinson	15dc82f454	Increase step size to 15	2013-02-14 18:59:05 -08:00
Chris Robinson	a729b1b12a	Snap to the ground after moving Depends on two factors: * End up close enough above to a walkable plane (it's within sMaxStep units down and is angled sMaxSlope or less) * Started out on the ground without any upward movement This also reduces the distance needed to be to the ground to 4 (from 10), and ensures the actor is 2 units above the ground when on it. Downward force is also removed when starting on the ground.	2013-02-14 18:34:51 -08:00
Pieter van der Kloet	1b9cf8c23f	More work on integrating the settings parser, profiles are handled correctly	2013-02-15 01:20:48 +01:00
scrawl	7604fb51b6	CG no longer listed in the settings if the plugin isn't loaded.	2013-02-14 23:17:21 +01:00
Pieter van der Kloet	5d1bede9e5	Forgot to add two files	2013-02-14 11:20:47 +01:00
scrawl	6a49ea9b4f	Cleaning out some old bits	2013-02-13 18:39:36 +01:00
Chris Robinson	6a9755778e	Merge remote-tracking branch 'zini/next' into animation2	2013-02-12 18:14:46 -08:00
scrawl	de90b911c9	Near clip plane corrections	2013-02-12 20:56:00 +01:00
scrawl	d213ff680f	Disabled terrain LOD	2013-02-12 20:55:45 +01:00
Marc Zinnschlag	5e3529783d	Merge remote-tracking branch 'ace/win-fixes' into next	2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson	bbb845824d	Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__	2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson	0ae01794f1	Fixed build errors in OpenCS	2013-02-12 13:57:16 +01:00
Sergey Shambir	7d7a1119da	Fixed book text misalignment, at least in some cases https://bugs.openmw.org/issues/284	2013-02-12 11:49:20 +04:00
Sergey Shambir	03803f19b5	BookTextParser: moved to Ogre::UTFString Font height and unicode characters glyph width now accounted correctly.	2013-02-12 11:22:19 +04:00
Sergey Shambir	3b64389668	BookTextParser: fixed infinitive loop	2013-02-12 11:14:30 +04:00
Marc Zinnschlag	1a079ec8d3	Merge branch 'master' into next	2013-02-11 19:53:51 +01:00
Marc Zinnschlag	1fd7d8ed2a	Merge remote-tracking branch 'graffy76/master' into next	2013-02-11 15:35:59 +01:00
Pieter van der Kloet	aa25471517	WIP: working on improving the config file handling	2013-02-11 15:01:00 +01:00
graffy76	55dd17c27c	Added setBarColor() function to CSVDoc::Operation. Created four color types for existing operations (save, verify, compile and search), with a default for future / undefined ops.	2013-02-11 04:30:16 -06:00
Michal Sciubidlo	f4d60ae7b2	Files sorting (masters then plugins). Remove unneeded includes.	2013-02-10 19:59:25 +01:00
Marc Zinnschlag	64d9d9e2ce	Merge remote-tracking branch 'wheybags/master' into next	2013-02-10 17:29:28 +01:00
Marc Zinnschlag	eb6590f7d8	added delegate factory	2013-02-10 17:21:25 +01:00
Tom Mason	c32c31f6d6	break after activating button	2013-02-10 15:41:02 +00:00
Tom Mason	158c6fc9fa	pressing enter when a messagebox is prompting for "ok", will activate ok button	2013-02-10 14:58:46 +00:00
Sergey Shambir	59808c3e10	GUI: Birth and Class dialogs now both select 1st item in list at first time.	2013-02-10 08:59:38 +04:00
Sergey Shambir	725bfe6372	TradeWindow: balance now changes per time if user holds +/- button pressed	2013-02-10 08:50:36 +04:00
Sergey Shambir	bba024d6ad	Right mouse button click now stops Container GuiMode.	2013-02-10 08:37:45 +04:00
Chris Robinson	4ee5857bae	Filter accumulation axis for mLastPosition as needed	2013-02-09 19:09:56 -08:00
Chris Robinson	8d6f017f17	Remove an unneeded Animation field	2013-02-09 13:25:39 -08:00
Chris Robinson	34ddf69a31	Merge remote-tracking branch 'zini/next' into animation2	2013-02-09 09:46:57 -08:00
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
Marc Zinnschlag	f19fbaa293	Merge remote-tracking branch 'mark76/multiple_esm_esp' into next	2013-02-09 15:30:29 +01:00
Marc Zinnschlag	2d937cd9e2	Merge branch 'gmst' into next	2013-02-09 15:26:25 +01:00
Marc Zinnschlag	d40ee06897	fixed base/modified logic	2013-02-09 15:25:50 +01:00
Mark Siewert	55bd9eef66	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-09 13:03:35 +01:00
Mark Siewert	eefbdde6de	- For pull request: remove all instances of maps used to track refnumbers. - new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.	2013-02-09 13:00:57 +01:00
scrawl	6805c7bab4	Merge branch 'master' into graphics	2013-02-08 18:35:41 +01:00
Marc Zinnschlag	828695f295	added value column to gmst table	2013-02-08 14:48:38 +01:00
Marc Zinnschlag	cce2d63433	added type column to gmst table	2013-02-08 12:20:03 +01:00
Marc Zinnschlag	d5dd0640c7	basic gmst support	2013-02-08 09:58:19 +01:00
Chris Robinson	f5afa43db5	Remove an unneeded parameter	2013-02-07 17:45:41 -08:00
Chris Robinson	d47d2216f2	Use some const references where appropriate	2013-02-07 16:33:44 -08:00
Chris Robinson	cbdd459500	Remove unneeded playerMove from PhysicActor	2013-02-07 15:48:41 -08:00
Chris Robinson	ca6f8b6d88	Reorganize a bit of code in the movement solver	2013-02-07 13:18:16 -08:00
Chris Robinson	fe0e6c452d	Remove the unneeded playerMove object from PhysicsSystem	2013-02-07 12:11:10 -08:00
Nikolay Kasyanov	0d4b0bfd93	Trying to resolve sound issues on OS X with ffmpeg backend	2013-02-07 23:40:20 +04:00
Marc Zinnschlag	dd2b7d5c63	handle deleted records	2013-02-07 13:26:00 +01:00
Marc Zinnschlag	c1cd8305bc	a bit of cleanup for the previous commit	2013-02-07 13:13:06 +01:00
Marc Zinnschlag	21733e8181	hide startup dialogue when opening open dialogue	2013-02-07 13:11:41 +01:00
Marc Zinnschlag	adcaea464b	basic globals record loading	2013-02-07 12:52:01 +01:00
Marc Zinnschlag	7d112e4d5c	rewrote logic of content file loading	2013-02-07 11:33:08 +01:00
Chris Robinson	8de2d24d0e	Restore old ground check	2013-02-06 21:57:59 -08:00
Chris Robinson	923d0d6eb4	Fix up some header includes	2013-02-06 21:47:09 -08:00
Chris Robinson	e577ee2de8	Add a method to set/retrieve being on the ground	2013-02-06 21:44:58 -08:00
Chris Robinson	ebc7bc9427	Rename A_AlwaysRun to A_Run Note that there is an "always run" key, but its functionality is handled by A_ToggleWalk.	2013-02-06 18:22:16 -08:00
Chris Robinson	a8f0ce43a5	Add a run key	2013-02-06 17:51:47 -08:00
Chris Robinson	cbaf489eb6	Add running states	2013-02-06 16:53:52 -08:00
Chris Robinson	04524fbf92	Don't scale the movement vector up	2013-02-06 15:23:52 -08:00
Chris Robinson	bdda7278c4	Use 3/4ths of the physic actor's height to test if swimming	2013-02-06 12:56:30 -08:00
Chris Robinson	dfd16c4424	Fix movement rotations	2013-02-06 12:39:26 -08:00
Marc Zinnschlag	43912f927a	Merge remote-tracking branch 'potatoesmaster/importer' into next Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-06 10:12:40 +01:00
Chris Robinson	9cf30f39bd	Don't apply gravity when swimming	2013-02-05 19:45:51 -08:00
Chris Robinson	fc307e64b0	Add swimming states	2013-02-05 19:05:07 -08:00
Chris Robinson	18b7008409	Better fix some scaling issues	2013-02-05 18:25:09 -08:00
Chris Robinson	535cd8360f	Load extra animations for NPCs	2013-02-05 18:09:43 -08:00
Chris Robinson	8b1e7b95ba	Attempt to load the skeleton source if it doesn't yet exist	2013-02-05 17:55:12 -08:00
Chris Robinson	c839502743	Setup base_anim.nif as an initial skeleton source for biped creatures	2013-02-05 17:16:45 -08:00
Chris Robinson	054ef3113a	Check existing skeleton sources if the current one has no animation root	2013-02-05 17:15:40 -08:00
Chris Robinson	16933e3926	Scale the accumulation root translation	2013-02-05 16:59:20 -08:00
Chris Robinson	600fe06f00	Use a vector of skeletons to handle animation sources	2013-02-05 16:29:51 -08:00
Chris Robinson	e217a3d25c	Silence some console spam	2013-02-05 15:51:26 -08:00
Emanuel Guevel	a4f051e85a	Fix game files import	2013-02-06 00:51:05 +01:00
Emanuel Guevel	6e3c016351	Add archives to settings imported by mwiniimporter Add Morrowind.bsa by default.	2013-02-06 00:51:05 +01:00
Chris Robinson	ee3764e9b3	Increase max slope to 60. 45 is too low.	2013-02-05 15:07:48 -08:00
scrawl	86d65519e3	Settings window fix	2013-02-05 23:57:30 +01:00
Chris Robinson	8c0bb1ff4d	Rotate movement in the movement solver	2013-02-05 14:02:14 -08:00
Michal Sciubidlo	347a734364	Move OpenDialog to editor and use it in startup dialogue. Remove debug output from DataFilesList.	2013-02-05 22:06:36 +01:00
Chris Robinson	f7f1adfb9d	Don't accumulate animations with activators	2013-02-05 12:55:06 -08:00
Chris Robinson	2c39760bd5	Move the movement solver code to mwworld's physics system	2013-02-05 12:45:10 -08:00
Michal Sciubidlo	f7e5ea24f4	Merge branch 'startup' into cs_load. Fix include in textinputdialog.cpp.	2013-02-05 21:23:49 +01:00
scrawl	608c112f34	Supply the new render window to mygui	2013-02-05 20:48:25 +01:00
scrawl	31f760ccce	Fixing issues from last commit: restored input and occlusion queries	2013-02-05 20:26:13 +01:00
Chris Robinson	0a4568bd11	Move the PtrMovementList typedef to MWWorld Use it for the doPhysics parameter, too	2013-02-05 11:03:39 -08:00
Chris Robinson	2cdda96798	Clear out some unneeded doPhysics stuff	2013-02-05 10:23:26 -08:00
scrawl	c4d518132f	With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.	2013-02-05 19:22:08 +01:00
Chris Robinson	3251796ba0	Fix left/right movement	2013-02-05 09:57:08 -08:00
Chris Robinson	d50832081c	Remove the unneeded PhysicActor field from MovementSolver	2013-02-05 09:37:02 -08:00
Chris Robinson	a782a9109b	Store the vertical velocity in the physic actor	2013-02-05 09:24:22 -08:00
Chris Robinson	82e4da4e64	Get the half-extents from the physicactor	2013-02-05 07:41:57 -08:00
scrawl	499f3ac0d1	Slightly better ripple normal blending. Not physically accurate at all, but looks good.	2013-02-05 16:40:41 +01:00
Chris Robinson	1c604445ba	Store movement vectors as they get returned	2013-02-05 06:59:01 -08:00
scrawl	3772cd9257	Refraction can be disabled separately now	2013-02-05 14:29:46 +01:00
Chris Robinson	4bd1e63ac1	Merge remote-tracking branch 'zini/master' into animation2 Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-02-05 03:26:46 -08:00
Marc Zinnschlag	c409f1184e	cleaned up object movement and fixed a bug regarding local scripts	2013-02-05 12:19:06 +01:00
Chris Robinson	786cb6e928	Merge remote-tracking branch 'zini/master' into animation2	2013-02-05 02:57:02 -08:00
Marc Zinnschlag	86fb3574a0	Merge remote-tracking branch 'wheybags/master' into next	2013-02-05 11:55:47 +01:00
Chris Robinson	bd4fdf47a3	Merge remote-tracking branch 'zini/master' into animation2 Conflicts: apps/openmw/mwrender/sky.cpp	2013-02-05 02:27:57 -08:00
scrawl	a29919d02d	restored global map	2013-02-05 00:39:56 +01:00
scrawl	35b5fdab5d	Merge branch 'terrainfix' into graphics	2013-02-05 00:28:59 +01:00
scrawl	09180666b2	Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix	2013-02-05 00:21:42 +01:00
scrawl	58cf182db2	better place for syncing	2013-02-05 00:21:29 +01:00
scrawl	bb1f23875d	Merge branch 'terrainfix' into graphics	2013-02-04 23:16:11 +01:00
scrawl	596628d339	Fix terrain derived data update (bug 534, bug 544)	2013-02-04 23:13:01 +01:00
Chris Robinson	5ee298cdc1	Make sure the player updates last	2013-02-04 14:08:38 -08:00
Michal Sciubidlo	66ec4ca7d9	Split launcher specific code from DataFilesList back to DataFilesPage.	2013-02-04 22:14:14 +01:00
Chris Robinson	2f8affc955	Make sure the player's controller is properly updated when they change	2013-02-04 12:58:06 -08:00
scrawl	0f37c24d5f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-04 21:55:41 +01:00
Chris Robinson	ee9b19d2ed	Make sure to remove a Ptr from the activators when requested	2013-02-04 12:04:06 -08:00
Chris Robinson	39cf7b0b42	Pass the Ptr of the object being moved to the move method This prevents having to store another copy of it, which risks getting out of sync.	2013-02-04 11:17:48 -08:00
Chris Robinson	1a5cb8760d	Rotate movement vector to world space before passing to the movement solver	2013-02-04 11:04:20 -08:00
Chris Robinson	6b32fa7999	Use the correct position for the actor	2013-02-04 09:48:21 -08:00
scrawl	bf037b7d29	Removed problematic ModVertexAlpha method, now done in shader	2013-02-04 18:03:03 +01:00
Chris Robinson	1747c1e01a	Integrate a new movement solver to handle object movement and collisions Temporary, and pretty breoken. Needs some serious integration fixes.	2013-02-04 07:10:14 -08:00
Marc Zinnschlag	ba0d13fc12	moved code for creating new base content records into the Document class	2013-02-04 13:50:38 +01:00
Marc Zinnschlag	4c973a0f67	constructing documents from a file list instead of a single name	2013-02-04 13:46:54 +01:00
Marc Zinnschlag	3f0a49a2f6	Merge branch 'master' into startup Conflicts: apps/opencs/CMakeLists.txt	2013-02-04 10:22:37 +01:00
Chris Robinson	91513206a0	Don't use per-animation accumulation values This breaks walking diagonally and "jumping" (which technically wasn't jumping anyway).	2013-02-03 12:02:51 -08:00
scrawl	fa07288b15	tweaked map light color	2013-02-03 20:29:50 +01:00
scrawl	5cc8af0f14	fix map positions	2013-02-03 20:06:03 +01:00
scrawl	a44dfcd2ac	Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.	2013-02-03 19:28:31 +01:00
scrawl	109d0a942f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-03 19:02:57 +01:00
scrawl	979a874220	Fixed the custom near clip planes	2013-02-03 19:01:59 +01:00
scrawl	5334934612	Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.	2013-02-03 18:03:09 +01:00
Chris Robinson	51d5efeeb2	Work out the state in the character controller update method	2013-02-03 07:15:34 -08:00
Mark Siewert	3e43db5f76	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-03 16:14:41 +01:00
scrawl	15e51b76de	Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth	2013-02-03 15:46:23 +01:00
Tom Mason	ac112ef972	refactored special variable code	2013-02-03 13:27:27 +00:00
Marc Zinnschlag	c97553703a	fixes for static build without cg	2013-02-03 13:47:55 +01:00
Marc Zinnschlag	a4872e3217	rewrote the opencs cmake scripts (more compact and no more annoying warnings)	2013-02-03 13:30:40 +01:00
Chris Robinson	23acf4b130	Don't break right away when the animation time remaining is 0	2013-02-03 01:38:42 -08:00
Chris Robinson	60a75cb5ee	Make sure to keep the character preview animation updated	2013-02-03 00:54:50 -08:00
Chris Robinson	7fe877d8ea	Add a couple more character states	2013-02-03 00:19:22 -08:00
Chris Robinson	007a5963de	Handle most state changes in the character controller when setting the movement vector	2013-02-02 23:39:43 -08:00
Tom Mason	f785659297	Implemented OnPCAdd special variable Had to edit OpAddItem in miscextensions.cpp, as local variables were not being initialised for items added through it. Does not get reset on drop, as per original morrowind.	2013-02-02 17:36:12 +00:00
Michal Sciubidlo	155cca0c9a	Upload missing files. Fix folder name. Keep Qt optional. Move open dialogue from doc to tools. Rename 'load' to 'open'. Deleted wrong comment.	2013-02-02 18:36:01 +01:00
Marc Zinnschlag	67a1ec5166	added provisional startup dialogue	2013-02-02 16:14:58 +01:00
Chris Robinson	c23a96d606	Run an aniamtion update after "playing" the inventory idle This is so all the NPC parts get updated correctly.	2013-02-02 06:08:03 -08:00
Chris Robinson	fc7590694d	Revert "Revert "Use a child scene node for the accumulation root"" This reverts commit `376dfed15b`. I was wrong. It's needed at least for NPCs since they're attaching multiple animated skeletons to an object, and they all need to be offset correctly. Would be nice to use a Node, Bone, or TagPoint instead of a hefty SceneNode, though.	2013-02-02 05:43:37 -08:00
Marc Zinnschlag	85697e4628	reverted to C++03	2013-02-02 13:24:28 +01:00
Chris Robinson	7f87c1873b	Use an array to store the entity parts	2013-02-02 02:53:22 -08:00
scrawl	a461b282c1	water ripples (experimental)	2013-02-01 23:43:23 +01:00
Chris Robinson	376dfed15b	Revert "Use a child scene node for the accumulation root" This reverts commit `d6f923f274`. We don't need it for any of the NIFs we're currently handling. As long as there's no NIF files that would break it, we should require a stationary root if an animation wants to accumulate. If we must, a better idea may be to inject an extra bone into the skeleton instance and make that the accumulation root.	2013-02-01 08:50:32 -08:00
scrawl	3ec703e6af	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-01 16:25:54 +01:00
Michal Sciubidlo	492482de7f	Add "open" option in opencs.	2013-02-01 00:42:03 +01:00
Tom Mason	0f58e03343	Unequipping items will reset OnPCEquip variable	2013-01-31 19:04:39 +00:00
Tom Mason	9ad08520fd	Implemented OnPCDrop special variable Scripts are responsible for resetting to 0, as investigation showed that is how vanilla handled it.	2013-01-31 18:45:32 +00:00
Tom Mason	0fc5ee5149	allow OnPCEquip special variable to be of any type	2013-01-31 17:46:16 +00:00
Chris Robinson	d6f923f274	Use a child scene node for the accumulation root	2013-01-30 22:28:18 -08:00
Tom Mason	09f9557ecb	Implemented OnPCEquip special variable	2013-01-31 00:34:16 +00:00
Tom Mason	dc91211b12	Fixed Small bug where scripts were being removed when they shouldn't be. Scripts should only be removed when the item is being moved to another cell, otherwise they should remain active.	2013-01-31 00:21:04 +00:00
Michal Sciubidlo	ac62dd050d	Rename datafilespage to datafileslist	2013-01-30 21:08:27 +01:00
Michal Sciubidlo	f029a9011a	Move datafilespage to shared space.	2013-01-30 20:21:03 +01:00
Chris Robinson	b6354c6282	Don't share skeleton instances between bounded parts on an NPC However, a skeleton instance will still be shared between entities in an entity list.	2013-01-30 09:29:16 -08:00
Chris Robinson	5c3a7f7d52	Avoid handling animation states We don't need them anymore	2013-01-30 07:34:07 -08:00
Chris Robinson	360f7bfac8	Apply animations to bones manually Couple reasons for this: * This paves the way for allowing animations specified in other skeletons to be applied to the character (NPCs and certain creatures can have multiple animation sources, but Ogre is incredibly strict when it comes to sharing animations between skeletons). * It will allow for entities to be animated based on the character's skeleton, without having to duplicate the mesh for each skeleton it can be used on. This doesn't impact Ogre's ability to efficiently deform skinned meshes, nor does it get in the way of hardware skinning.	2013-01-30 07:04:18 -08:00
Chris Robinson	600d3bf9eb	Make sure the player node's visibility cascades	2013-01-30 02:38:50 -08:00
Chris Robinson	04d4c125ba	Print when an animation event is unhandled	2013-01-29 02:00:42 -08:00
Chris Robinson	d4ddaa3d95	Only register activators that have a MWRender::Animation object	2013-01-29 01:08:52 -08:00
Chris Robinson	99efe4e494	Remove an unnecessary class member	2013-01-29 01:02:55 -08:00
Chris Robinson	879359f39d	Set the animation state loop flag as appropriate	2013-01-29 00:50:52 -08:00
Chris Robinson	92d0c55f32	Add a flag to specify if an animation should be playing	2013-01-29 00:43:42 -08:00
Chris Robinson	fdabef65a1	Use a method to update an object's cell in the mechanics manager This prevents destroying and recreating the object's character controller (and messing up the current animation) when moving between cells.	2013-01-29 00:19:24 -08:00
Chris Robinson	8d98f3649c	Use a separate class to handle activator mechanics	2013-01-28 23:39:11 -08:00
Chris Robinson	7df4d0d19f	Remove an unnecessary cast	2013-01-28 21:41:51 -08:00
Pieter van der Kloet	25edba0887	Rewriting the config code of the pages to use the new settings classes	2013-01-27 16:39:51 +01:00
Chris Robinson	7b71b4eb31	Add a missing include	2013-01-27 03:03:48 -08:00
Pieter van der Kloet	5579df30ff	Implemented data/data-local support and added settingshandlers to main.cpp	2013-01-26 18:19:04 +01:00
Chris Robinson	0cd3880b20	Merge remote-tracking branch 'zini/master' into animation2	2013-01-26 04:54:52 -08:00
Chris Robinson	b1ffdf855f	Reset the initial state of animated nodes on the skeleton instances This is so the animation specifies node keyframe data based on the node's parent. This will also be necessary for applying animations from different skeleton sources, as they can have different binding positions (even native .skeleton resources will need to specify animation data this way).	2013-01-26 04:48:53 -08:00
Mark Siewert	dca8dc4fdb	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/esmreader.hpp - Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.	2013-01-25 18:22:01 +01:00
Pieter van der Kloet	6faf6f57e1	Added settings file reader/writers for openmw.cfg and settings.cfg	2013-01-25 05:19:06 +01:00
Emanuel Guevel	19dff822f4	Dialogue: do not filter on disposition for creatures	2013-01-24 19:43:21 +01:00
Emanuel Guevel	ed9a9904b4	Dialogue filter: search script variables case-insensitively	2013-01-24 19:39:31 +01:00
Marc Zinnschlag	90d05858ef	disabling dialogue sub-views for now	2013-01-22 11:50:08 +01:00
Marc Zinnschlag	cd662af634	Merge branch 'globals'	2013-01-22 11:47:24 +01:00
Chris Robinson	05f8b8c283	Specify the text key to reset animations to	2013-01-22 00:31:45 -08:00
Chris Robinson	37fe1bd3f0	Handle looping in the Animation object	2013-01-21 22:51:13 -08:00
Marc Zinnschlag	2756d3ee94	Merge remote-tracking branch 'wheybags/containerscripts'	2013-01-21 23:02:45 +01:00
Tom Mason	f5f3c2e62d	enabling / disabling should not affect scripts	2013-01-21 20:06:08 +00:00
Chris Robinson	e956a1cbc0	Merge SpecialIdle character state into Idle	2013-01-21 03:24:52 -08:00
Chris Robinson	6905bd18ba	Filter out the group name from the text keys It's already in the animation name, and the text keys are animation-specific anyway.	2013-01-21 02:59:12 -08:00
Chris Robinson	536f8104e6	Do not create an 'all' animation.	2013-01-20 17:24:43 -08:00
Chris Robinson	e1e76bde76	Combine a loop into another where it's used	2013-01-20 15:39:43 -08:00
Mark Siewert	713d324eeb	- Minor code cleanup	2013-01-20 19:07:33 +01:00
Tom Mason	31c71c029d	objects with scripts attached, that are inside containers will behave correctly when the container is moved	2013-01-20 17:01:30 +00:00
Emanuel Guevel	736e471613	Print a fallback text when no topic response is found	2013-01-20 17:44:09 +01:00
Emanuel Guevel	43e85ea0c6	Disallow redirection to info refusal for greetings	2013-01-20 17:44:09 +01:00
Emanuel Guevel	05796d85a4	NPC: take stats from NPDT12 into account Some available stats (level, reputation and disposition) were not used for NPC with auto-calculated stats.	2013-01-20 17:44:08 +01:00
Emanuel Guevel	951eb1b236	Dialogue: return a response from "Info Refusal" when disposition is not satisfied	2013-01-20 17:44:08 +01:00
Tom Mason	23dada0ee4	moved script handling on enable / disable into their own functions	2013-01-20 16:38:56 +00:00
Tom Mason	28c580d280	disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly	2013-01-20 15:43:52 +00:00
Tom Mason	abe25c5f66	removed use of c++11 auto	2013-01-20 14:24:55 +00:00
Tom Mason	665a530e10	renamed realAdd to addImp	2013-01-20 14:14:34 +00:00
Tom Mason	3c6ddd7fa7	fixed isInCell method	2013-01-20 14:10:04 +00:00
Chris Robinson	85ca1e993f	Properly check if an animation exists before playing it	2013-01-19 21:55:04 -08:00
Nathan Jeffords	f55da17933	made some journal accessor methods constant	2013-01-19 16:21:41 -08:00
Nathan Jeffords	4c7ae3d1ff	prevent duplicate journal entries from being recorded	2013-01-19 16:21:15 -08:00
Nathan Jeffords	528c3da6da	record heard topics in journal	2013-01-19 16:20:22 -08:00
Chris Robinson	68779375b2	Implement WalkLeft and WalkRight character states	2013-01-19 16:19:47 -08:00
Nathan Jeffords	d6b956cdcf	fixed swapped day & month fields when created a stamped journal entry	2013-01-19 16:19:03 -08:00
Chris Robinson	a7b07ee5cf	Don't reset the animation when setting the same state Unless looping is being toggled on.	2013-01-19 15:46:22 -08:00
Chris Robinson	e0541b52c4	Use a list to store and get state information	2013-01-19 14:56:24 -08:00
Mark Siewert	a8e02779b2	- Add support for multiple plugins trying to modify the same reference - Fix a small signed/unsigned warning	2013-01-19 23:33:18 +01:00
Chris Robinson	de2d084e61	Add a looping property to handle if an animation should loop	2013-01-19 14:22:15 -08:00
Marc Zinnschlag	2d96f52864	select correct record when opening a dialogue sub view	2013-01-19 14:29:14 +01:00
Chris Robinson	0b68953f0d	Scale animation speed using the direction length The direction length doesn't currently give a good speed, but it's something.	2013-01-18 21:40:47 -08:00
Chris Robinson	aecfc0829a	Implement WalkForward and WalkBack character states	2013-01-18 18:04:00 -08:00
Chris Robinson	e33f59e0fe	Ensure the direction vector is initialized and copied properly	2013-01-18 17:41:36 -08:00
Chris Robinson	1cdd64cd9b	Return the animation movement from the character controller. Consequently, dead actors don't move anymore. The doPhysics call apparently isn't moving them.	2013-01-18 17:05:58 -08:00
Chris Robinson	9123f4f2af	Return the movement vector from runAnimation	2013-01-18 16:21:29 -08:00
Chris Robinson	9235fba770	Store the movement vector in the character controller	2013-01-18 16:00:51 -08:00
Chris Robinson	40f8e75763	Use a SpecialIdle state for PlayGroup/LoopGroup invoked animations Note that actors will not automatically resume a normal idle state afterward. Their AI will need to control what to do when the special idle is finished.	2013-01-18 15:39:28 -08:00
Chris Robinson	a527cb8349	Loop the current animation when not dead This should be better, but it's not perfect. It misses the case where start < loop start == loop stop <= stop	2013-01-18 15:22:14 -08:00
Chris Robinson	c7684cb979	Pass the key time to markerEvent	2013-01-18 14:50:55 -08:00
Chris Robinson	3e9b0a333c	Allow specifying the accumulation for animations Animations that move a character may do so either visually or physically. An axis' accumuluation value specifies whether the movement is visual (0) or physical (1). Idle animations, for instance, typically don't physically move a character, while death animations may physically move them along the X and Y planes, but not along Z (the vertical movement is purely visual).	2013-01-18 14:25:32 -08:00
Chris Robinson	5cafc24ee2	Rename CharState_Alive back to CharState_Idle	2013-01-18 13:43:45 -08:00
Chris Robinson	613529f1d6	Merge remote-tracking branch 'zini/master' into animation2	2013-01-18 01:02:53 -08:00
Chris Robinson	a94947029e	Check the marker name before deciding what to do with it Also, don't force 'idle' after a playgroup	2013-01-18 00:59:48 -08:00
Chris Robinson	9d7ccfda1f	Rename CharState_Idle to CharState_Alive	2013-01-17 21:07:36 -08:00
Chris Robinson	8720433fa9	Do not automatically loop animations There are 0 length idle animations that break this	2013-01-17 17:54:09 -08:00
Chris Robinson	8fa1b56efc	Loop the current animation if there's nothing more queued	2013-01-17 16:34:26 -08:00
Chris Robinson	00879ab20e	Fix player rendering	2013-01-17 15:48:09 -08:00
Chris Robinson	fef6284f15	Only reset the animation time if a new state was set	2013-01-17 15:47:25 -08:00
Chris Robinson	fc0f9e2159	The animation state tracks the animation time for us	2013-01-17 14:49:42 -08:00
Chris Robinson	7cce44290e	Handle the animation queue in mwmechanics	2013-01-17 13:18:40 -08:00
Chris Robinson	47c157303a	Filter events that do not belong to the current group	2013-01-17 11:03:58 -08:00
Chris Robinson	da4f17859e	Recognize soundgen animation markers	2013-01-17 10:16:36 -08:00
Marc Zinnschlag	82b790770d	Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'	2013-01-17 10:21:01 +01:00
Chris Robinson	82d549e22f	Don't update the animation if time is the same	2013-01-16 21:39:14 -08:00
Chris Robinson	7ee389f3b2	Handle animation skipping in the character controller	2013-01-16 21:25:50 -08:00
Chris Robinson	852aa214cc	Store the available animation names in the character controller	2013-01-16 21:16:22 -08:00
Chris Robinson	afbc9f3e41	Keep track of the animation group currently playing	2013-01-16 20:44:37 -08:00
Chris Robinson	4dd01b81c6	Update mTime when updating or reseting the animation, and refactor the animation loop	2013-01-16 20:14:49 -08:00
Chris Robinson	685f219560	Return a movement vector from the character controller update	2013-01-16 18:56:13 -08:00
Chris Robinson	daad8d9859	Don't update the character controller while paused	2013-01-16 18:03:39 -08:00
Chris Robinson	d2f5a886c7	Handle playgroup and skipanim through mwmechanics	2013-01-16 17:53:18 -08:00
Emanuel Guevel	4feaa66897	Do not open the dialogue window if no greeting is found	2013-01-17 01:58:44 +01:00
Chris Robinson	46fc61a4c1	Run animations from the character controller	2013-01-16 16:31:09 -08:00
Chris Robinson	46728ab27f	Handle "sound:" animation events	2013-01-16 15:52:03 -08:00
Chris Robinson	3c32385e17	Avoid trying to animate things that don't have animations	2013-01-16 15:00:06 -08:00
Chris Robinson	94b93227d3	Treat activators as actors for rendering and mechanics Kinda hacky, but it's the only way to get animated activators (flags, silt striders, etc) to work properly.	2013-01-16 14:37:32 -08:00
Chris Robinson	d2fc3c7b33	Add a method to tell the character controller of new text keys	2013-01-16 13:09:21 -08:00
Marc Zinnschlag	7b568cbb15	Merge remote-tracking branch 'potatoesmaster/dialogue'	2013-01-16 22:03:40 +01:00
Chris Robinson	0a2f92f679	Keep track of the current text key in the animation	2013-01-16 11:57:08 -08:00
Chris Robinson	f46587c383	Store an character controller in the animation	2013-01-16 11:01:08 -08:00
Chris Robinson	3c487e6019	Play an animation when changing states	2013-01-16 10:45:18 -08:00
Chris Robinson	b378bc92a0	Store an animation object in the character controller	2013-01-16 10:16:37 -08:00
Chris Robinson	63e685ea39	Add a method to get the Animation from a Ptr	2013-01-16 09:59:19 -08:00
Chris Robinson	c1b32d6006	Remove outdated comments	2013-01-16 08:24:20 -08:00
Chris Robinson	3c02e1ccc9	Run physics right after updating the actors	2013-01-16 08:22:38 -08:00
Chris Robinson	1ce8eaf52c	Merge remote-tracking branch 'zini/master' into animation2 Conflicts: apps/openmw/mwrender/actors.cpp apps/openmw/mwrender/actors.hpp	2013-01-16 07:36:56 -08:00
Marc Zinnschlag	312f68bf9c	Merge remote-tracking branch 'thoronador/fix-spelling'	2013-01-16 12:28:33 +01:00
scrawl	df602553d1	Reworked MWRender::Water to be more OOP-ish and possibly allow other reflection types.	2013-01-16 09:13:36 +01:00
Thoronador	3220330ce0	fix spelling in comment	2013-01-16 04:19:16 +01:00
Chris Robinson	94e30199d1	Merge remote-tracking branch 'zini/master' into animation2 Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-15 14:59:30 -08:00
Emanuel Guevel	9e00c6694f	Allow only ID filtered topics for dialogue with creatures	2013-01-15 21:40:44 +01:00
Chris Robinson	8a073c113e	Use const references where appropriate	2013-01-15 12:07:15 -08:00
Chris Robinson	8361192b64	Use typedefs for some maps and some cleanup	2013-01-15 11:10:41 -08:00
Marc Zinnschlag	3053440462	Issue #539 : fixed AiWander	2013-01-15 12:40:44 +01:00
Emanuel Guevel	82287445af	DialogueWindow: do not execute onFrame() when not visible	2013-01-15 00:59:48 +01:00
Emanuel Guevel	f1f9173f24	Prevent closing dialogue window when an answer is expected	2013-01-15 00:53:32 +01:00
Jordan Milne	10a3caa504	more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine	2013-01-13 23:38:46 -04:00
Jordan Milne	9b485a86ef	resize the window in a slightly less bad way, fix my check in setUseHardwareCursors to be the right way round	2013-01-13 22:38:22 -04:00
Jordan Milne	043e29c620	Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble)	2013-01-13 21:32:45 -04:00
scrawl	6c6ce4a05c	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-14 00:10:57 +01:00
Jordan Milne	d26e33eb26	Merge branch 'master' into sdl_input	2013-01-13 17:06:39 -04:00
Tom Mason	6fc64e8a4e	scripts run for items added to containers, and scripted items in player inv handled correctly	2013-01-13 19:49:56 +00:00
Tom Mason	7c8b3f1239	Merge remote-tracking branch 'real/master'	2013-01-13 17:07:18 +00:00
Tom Mason	c138e00aa2	objects scripts are now stopped when they are removed from a container	2013-01-13 17:05:12 +00:00
Marc Zinnschlag	654cd3ab9b	Issue #479 : Use magnitude specified when adding disease	2013-01-13 14:52:55 +01:00
Jordan Milne	b6ec64485c	fix includes for Windows	2013-01-12 17:52:26 -04:00
Tom Mason	d4ca954d47	scripts on items in containers added to script list on cell change	2013-01-12 18:31:57 +00:00
Chris Robinson	94b24f07e1	Keep track of the state in the character controller, and don't remove dead actors from the map	2013-01-12 10:10:27 -08:00
Chris Robinson	4890d901a2	Store an MWWorld::Ptr in the character controller	2013-01-12 08:49:08 -08:00
Jordan Milne	5a6589af01	extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start	2013-01-12 11:57:29 -04:00
Chris Robinson	35d17fdaf6	Associate a character controller with each MWWorld::Ptr	2013-01-12 07:12:12 -08:00
Marc Zinnschlag	f4ee8e2642	Issue #479 : Added additional magnitude parameter to known spells	2013-01-12 13:10:20 +01:00
scrawl	e4f140841e	Make OpenMW work with Ogre 1.9	2013-01-12 08:23:15 +01:00
scrawl	2c3719a6f5	Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass.	2013-01-12 07:02:12 +01:00
scrawl	30136eb449	Update settings UI	2013-01-12 06:36:48 +01:00
scrawl	52516ca4b4	Merge branch 'master' into graphics	2013-01-12 01:22:01 +01:00
scrawl	ed3c23ad9a	Fixed crash on changing cell due to Utf8Encoder going out of scope	2013-01-12 01:18:36 +01:00
Jordan Milne	eeacb04fe2	Fully working hardware cursors (if you compile SDL2 with XCursor support)	2013-01-11 09:32:29 -04:00
Jordan Milne	3fb920a66f	Merge branch 'master' into sdl_input	2013-01-11 08:29:01 -04:00
Jordan Milne	f9b064d1bc	add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully	2013-01-11 08:27:59 -04:00
Marc Zinnschlag	101810d1e8	Merge remote-tracking branch 'scrawl/ingredients'	2013-01-11 11:12:07 +01:00
Nathan Jeffords	d5ebd6654d	cache loaded NIF files to eliminate reloads Created a NIF file caching mechanism to prevent the system from reloading a NIF during a startup and cell changes.	2013-01-10 21:47:02 -08:00
Nathan Jeffords	d469415e59	factored out two function from OMW::Engine::go The initialization code inside Engine::go is now in two function it calls prior to running the main loop.	2013-01-10 21:32:24 -08:00
Jordan Milne	a030c03513	support the printscreen button properly	2013-01-10 23:53:19 -04:00
Jordan Milne	403b6756f5	remove dependency on boost::locale, use system mouse position in in-game menus	2013-01-10 23:29:51 -04:00
scrawl	c71656493d	Ingredient effects now correctly hide until the player has discovered them	2013-01-11 01:23:24 +01:00
Jordan Milne	eff26159d9	Merge branch 'master' into sdl_input	2013-01-10 18:03:35 -04:00
Jordan Milne	601d79ef3f	fix the mouse wheel in mygui	2013-01-10 17:59:49 -04:00
Jordan Milne	ed644259ce	Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling	2013-01-10 17:21:47 -04:00
Chris Robinson	97f8c73d91	Remove some useless parameters SceneNode::setVisibility merely passes the value to its attached object, of which there are none at the point it would be called. Additionally, the method is always called with enabled=true anyway.	2013-01-10 11:09:33 -08:00
scrawl	6ef85c46fd	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-10 19:35:40 +01:00
Chris Robinson	771a5f7316	Add the beginnings of a character controller	2013-01-10 08:35:24 -08:00
Chris Robinson	e8ac3976b5	Fix some subentity assumptions	2013-01-10 06:35:06 -08:00
Chris Robinson	7f2d71554e	Use the correct offset when building static geometry from an entity	2013-01-10 04:16:18 -08:00
Marc Zinnschlag	274ff530dc	Merge remote-tracking branch 'wheybags/master'	2013-01-10 11:53:42 +01:00
Chris Robinson	23ac1c2de5	Merge remote-tracking branch 'zini/master' into animation2 Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-09 20:52:12 -08:00
scrawl	55769aaf91	Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled	2013-01-10 01:46:00 +01:00
Marc Zinnschlag	6e0b86c6f9	Merge remote-tracking branch 'potatoesmaster/getdisposition'	2013-01-10 01:29:02 +01:00
Tom Mason	8486a51535	fixed drop amounts thanks to zinnschlag	2013-01-09 22:55:28 +00:00
Tom Mason	3517635cfd	added Drop and DropSoulGem functions	2013-01-09 21:16:45 +00:00
Marc Zinnschlag	4defb1a476	Merge remote-tracking branch 'trombonecot/lowerstring' Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2013-01-09 22:13:59 +01:00
scrawl	d3c0851aa7	Changed light attenuation back to linear in all cases, this seems to be what MW does.	2013-01-09 22:08:42 +01:00
scrawl	b8c6f6640b	Fixing water <-> waterfall blending issues (Sort of... the second part will follow later)	2013-01-09 21:56:26 +01:00
eduard	2dc0064cc2	more string lowercase	2013-01-09 20:51:52 +01:00
Chris Robinson	a14132b5a0	Merge remote-tracking branch 'zini/master' into animation2	2013-01-09 11:12:26 -08:00
scrawl	bc73c5b1ec	enable directional lighting for character previews	2013-01-09 20:08:59 +01:00
Tom Mason	5bfdb2449d	allowed dropObjectOnGround to be used on npcs, not just player	2013-01-09 18:53:14 +00:00
Chris Robinson	c4c8295e0b	Rename NIFLoader to Loader, and update some comments	2013-01-09 09:10:59 -08:00
Nathan Jeffords	6ca87e108f	updated loading screen to use the resource managers pattern matching when finding files	2013-01-09 08:54:03 -08:00
Nathan Jeffords	44031ec3d7	fleshed out BSAArchive and DirArchive. Implemented both lists & finds, with pattern matching. Conflicts: components/bsa/bsa_archive.cpp	2013-01-09 08:53:27 -08:00
Chris Robinson	be74859f05	Avoid some unnecessary copying when calling addPartGroup	2013-01-09 08:03:28 -08:00
Marc Zinnschlag	6567bf38f8	Merge remote-tracking branch 'wheybags/master'	2013-01-09 17:01:47 +01:00
Chris Robinson	9fedaf18d6	Make some methods private	2013-01-09 07:55:55 -08:00
Chris Robinson	625a538f03	Combine part selection into a single loop	2013-01-09 07:43:10 -08:00
Jordan Milne	cb01df49c0	begin to support text input	2013-01-09 11:30:33 -04:00
Jordan Milne	5fa77da9d4	Merge branch 'master' into sdl_input	2013-01-09 10:56:15 -04:00
Emanuel Guevel	3e41a1118a	GetDisposition: return calculated disposition instead of base disposition	2013-01-09 15:14:17 +01:00
Tom Mason	375961fe5e	small fix	2013-01-09 13:27:12 +00:00
Tom Mason	b035a5aa4a	beast races cannot equip anything they oughtn't to be able to equip	2013-01-09 13:18:05 +00:00
Jordan Milne	53cff0ba68	use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu	2013-01-09 09:05:47 -04:00
Chris Robinson	1e38e381a4	Use text keys for each animation	2013-01-09 03:30:55 -08:00
Marc Zinnschlag	649ae645f3	Merge remote-tracking branch 'blunted2night/bug_495_v2'	2013-01-09 12:12:41 +01:00
Jordan Milne	02ccb75894	Wrap the mouse to the window (except in debug mode) Grab the mouse when not in the main menu (except in debug mode) Always hide the cursor when it's over the window Allow warping the mouse around Handle ^C properly	2013-01-09 06:10:05 -04:00
Jordan Milne	1bf36c686c	add ability to check if a window is on the stack (to see if we're in the main menu)	2013-01-09 06:09:47 -04:00
Chris Robinson	bb98542c5a	Build separate animations for each group	2013-01-09 01:40:38 -08:00
Chris Robinson	e44729cd43	Make the text keys lower-case when extracting them I think it's safe to assume all text keys are treated in a case-insensitive manner. So far the only known NiTextKeyExtraData records are for animation keys, which effectively are.	2013-01-09 00:17:42 -08:00
Jordan Milne	857bb42297	Create a separate scenemanager for each CharacterPreview instance	2013-01-09 01:44:15 -04:00
Jordan Milne	f85679db93	Merge branch 'master' into sdl_input	2013-01-09 00:04:55 -04:00
Nathan Jeffords	719663d86e	added option to override the activation distance The command line option '--activate-dist <int>' can be used to override the in game activation distance.	2013-01-08 20:00:06 -08:00
Tom Mason	62a2ba1cc6	beast races cannot equip shoes/boots	2013-01-09 03:03:14 +00:00
Tom Mason	135f0870f7	in actionequip, was ignoring actor param, and always using player	2013-01-09 02:16:17 +00:00
Jordan Milne	6b49b8ab47	MyGUI doesn't care for SDL's mouse button ordering, send it what it expects	2013-01-08 22:14:30 -04:00
Jordan Milne	3b1d285cf3	fix compile errors, work with unmodified SDL	2013-01-08 21:01:58 -04:00
Nathan Jeffords	39d27b87c9	fixed build error with Audiere coded enabled	2013-01-08 09:14:56 -08:00
Marc Zinnschlag	d4a9236ae5	hocking up dialogue sub view to a widget mapper	2013-01-08 14:59:40 +01:00
Marc Zinnschlag	c0fb46384c	Merge branch 'master' into globals	2013-01-08 11:32:53 +01:00
Chris Robinson	9675a6d04a	Merge remote-tracking branch 'zini/master' into animation2	2013-01-08 02:25:37 -08:00
Jordan Milne	6449f68d61	Merge branch 'master' into sdl_input	2013-01-08 06:24:31 -04:00
Jordan Milne	884d3ea4d8	Rip out OIS, fill the holes with SDL goodness. WIP.	2013-01-08 06:19:05 -04:00
Marc Zinnschlag	c6ff58d5b5	Merge remote-tracking branch 'scrawl/videoplayback' Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-08 11:17:19 +01:00
Nathan Jeffords	b3932e3dea	added a separate activation distance for NPCs	2013-01-07 23:40:17 -08:00
Nathan Jeffords	b9fbd6ae4b	Factored faced object lookups into MWRender::World * Renamed MWWorld::World::getFacedHandle to getFacedObject. * Changed it to return an object pointer * Updated clients to use return object directly.	2013-01-07 23:38:08 -08:00
Nathan Jeffords	05dad29005	update MWWord::World to track distances while performing occlusion queries. This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.	2013-01-07 23:11:15 -08:00
Nathan Jeffords	0108be2e4f	updated MWWorld::PhysicsSystem::getFacedXXX functions * changed the names and return values to be consistent * made the distance to search a parameter * change the distance returned to world units instead of percentage of query distance	2013-01-07 23:00:00 -08:00
Nathan Jeffords	86f691d3d5	split MWWord::World::update into multiple functions	2013-01-07 22:48:24 -08:00
Chris Robinson	2a9dc5ad94	Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist	2013-01-07 21:00:21 -08:00
Tom Mason	9ee823d8f8	fixed typo in vmformat.txt	2013-01-07 21:09:03 +00:00
Tom Mason	4c5ed43cc9	added removesoulgem, and fixed addsoulgem	2013-01-07 21:08:04 +00:00
Tom Mason	c2901fe6cc	added addsoulgem scripting function	2013-01-07 18:16:50 +00:00
Chris Robinson	d8dbd5e206	Store text key iterators for the start and stop times	2013-01-07 05:56:03 -08:00
Chris Robinson	d3e949f5c6	Make the animation text keys lower case to help lookup	2013-01-07 05:23:44 -08:00
Chris Robinson	05dfafa777	Avoid an unnecessary lookup when moving the scene node	2013-01-07 05:09:15 -08:00
Chris Robinson	5f668976a8	Improve resetting the animation position	2013-01-07 04:48:59 -08:00
scrawl	f1b138d0a8	Merge branch 'master' into videoplayback Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-07 13:25:15 +01:00
scrawl	c2b75e28e9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2013-01-07 13:20:50 +01:00
scrawl	282601d6e9	support the allowSkipping extra parameter for playBink command.	2013-01-07 13:19:52 +01:00
scrawl	35f4d09288	swscale handled better (cmake)	2013-01-07 13:06:16 +01:00
Marc Zinnschlag	2557ef4d7d	post merge fixes and some misc clean up	2013-01-07 12:17:46 +01:00
Marc Zinnschlag	41767f8dfa	Merge remote-tracking branch 'blunted2night/better_flicker'	2013-01-07 12:06:21 +01:00
Chris Robinson	648e3331f5	Don't try to move objects that aren't in a cell	2013-01-06 23:20:20 -08:00
Chris Robinson	921ae76ea9	Merge remote-tracking branch 'zini/master' into animation2	2013-01-06 21:20:49 -08:00
Chris Robinson	5b3a20ef69	Update the object position as the animation moves	2013-01-06 21:18:48 -08:00
Chris Robinson	910619eb21	Store the NonAccum animation root from the skeleton instance Currently this is assumed to be the node with the animation text keys.	2013-01-06 17:31:53 -08:00
Chris Robinson	b96a979719	Store an MWWorld::Ptr with the Animation	2013-01-06 17:05:48 -08:00
Nathan Jeffords	0f3712f284	change flickering light's brightness pattern	2013-01-06 14:29:22 -08:00
Chris Robinson	2b1fe7dc44	Add part info for weapons and shields	2013-01-06 05:39:39 -08:00
Marc Zinnschlag	25815ab8f7	Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'	2013-01-06 13:31:01 +01:00
Chris Robinson	976b042cca	Use a list to reduce some repeating code	2013-01-06 02:14:19 -08:00
Chris Robinson	99769879e3	Fix some createEntities calls	2013-01-06 00:32:38 -08:00
Chris Robinson	efca5ded47	Clean up some header includes to reduce nesting	2013-01-05 21:12:08 -08:00
Emanuel Guevel	63f09462fd	to_utf8, Utf8Encoder: pass encoding as constructor parameter Edit other files accordingly.	2013-01-06 01:37:58 +01:00
Chris Robinson	58d35dbfcf	Have createEntities' caller retrieve the text keys as needed	2013-01-05 04:01:11 -08:00
Chris Robinson	818a24cdd6	Hold on to the AnimationState being used for animating	2013-01-05 00:03:14 -08:00
Chris Robinson	6e84d4bcdd	Add a helper method to load entity objects	2013-01-04 23:19:48 -08:00
Marc Zinnschlag	fbb59302d9	Merge remote-tracking branch 'blunted2night/loading_screen_fix'	2013-01-04 10:50:59 +01:00
Emanuel Guevel	67273fc177	mwiniimporter: use Utf8Encoder	2013-01-04 01:52:02 +01:00
Nathan Jeffords	9afe4467d8	cache results of query for spash screen names ResourceGroupManager::listResourceNames returns a list of all resource accessable which is expensive, this change caches the result of the processed query so additional splash screen changes are quicker.	2013-01-03 15:45:09 -08:00
Mark Siewert	d6377fb2e3	- Support deleting references from a plugin - Add preliminary support for loading some unique fields appearing only in savegames - Add a few lines required for supporting respawning references. Incomplete.	2013-01-03 18:51:04 +01:00
Marc Zinnschlag	b7b51f24d6	added new Role for table headers (Role_Display)	2013-01-03 11:20:25 +01:00
Marc Zinnschlag	0af7a2888a	Merge remote-tracking branch 'scrawl/ai_script'	2013-01-03 09:56:36 +01:00
Marc Zinnschlag	25d9918765	post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)	2013-01-03 09:55:48 +01:00
Marc Zinnschlag	c0260697c2	Merge remote-tracking branch 'scrawl/master'	2013-01-03 09:52:46 +01:00
Marc Zinnschlag	ce5d27b07b	Merge remote-tracking branch 'scrawl/button_fixes'	2013-01-03 09:50:24 +01:00
scrawl	42e0501c67	fix typo	2013-01-03 02:40:21 +01:00
scrawl	a5ef669eb6	Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD Conflicts: apps/openmw/mwscript/aiextensions.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-01-03 02:34:31 +01:00
scrawl	ba7086cadf	Use race/class names (instead of ID) in replaced escape sequences	2013-01-03 02:05:05 +01:00
scrawl	1718d735b5	Fix menu/journal/book/scroll buttons when using localised MW-installations This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.	2013-01-03 01:09:03 +01:00
scrawl	ddbe13e569	Workaround for http://bugs.openmw.org/issues/475	2013-01-03 01:07:17 +01:00
Marc Zinnschlag	ff74f687fb	Merge remote-tracking branch 'lazydev/master'	2013-01-02 16:04:44 +01:00
lazydev	04cca2a1ce	fix for http://bugs.openmw.org/issues/517	2013-01-02 18:58:52 +04:00
Marc Zinnschlag	83fe128e87	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2013-01-02 10:05:27 +01:00
scrawl	86f30992d7	fix message boxes not appearing properly when e.g. trading	2013-01-01 22:00:14 +01:00
Emanuel Guevel	2a7336c310	mwiniimporter: handle ini file encodings Use components/to_utf8 to handle encodings. Add an --encoding option for choosing between win1250, win1251 and win1252 encodings for the imported ini file.	2013-01-01 21:59:30 +01:00
Marc Zinnschlag	4a8bf40a83	Merge remote-tracking branch 'lazydev/master'	2013-01-01 20:45:09 +01:00
lazydev	7cd1e87fe8	Merge branch 'master' of git://github.com/zinnschlag/openmw Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp	2013-01-01 22:18:21 +04:00
Emanuel Guevel	e9a464c9f7	mwiniimporter: remove fallback values for Cursors	2012-12-31 16:45:24 +01:00
Emanuel Guevel	e2b348de96	mwiniimporter: fix line ending problem	2012-12-31 16:44:22 +01:00
Marc Zinnschlag	65c7c7f60e	Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'	2012-12-31 14:47:05 +01:00
greye	7e0713f6c4	fix string case update	2012-12-31 11:22:40 +04:00
lazydev	cd5d95ed22	1. Dialogs in Russian version now works. 2. Destination names it travel window are now translated	2012-12-31 04:15:47 +04:00
Marc Zinnschlag	8b2785400b	Merge remote-tracking branch 'trombonecot/comparestring'	2012-12-30 20:11:18 +01:00
eduard	69d9d22579	comparestring	2012-12-30 19:56:38 +01:00
Marc Zinnschlag	e577731a06	Merge remote-tracking branch 'scrawl/master'	2012-12-30 18:31:35 +01:00
scrawl	f56182cac2	fix journal window not rendering any text	2012-12-30 17:06:17 +01:00
Emanuel Guevel	cb71efc427	mwiniimporter: clean up	2012-12-30 16:44:52 +01:00
Emanuel Guevel	38e7dbb970	mwininimporter: add more fallback values	2012-12-30 16:43:05 +01:00
Marc Zinnschlag	714b1924a5	partial dialogue subview implementation	2012-12-30 14:01:52 +01:00
eduard	98103e15eb	conflict resolution	2012-12-30 13:46:07 +01:00
eduard	fb25f407fb	dialoguemanager conflict	2012-12-30 13:37:19 +01:00
eduard	c85400b809	Merge https://github.com/zinnschlag/openmw into comparestring Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwworld/worldimp.cpp components/esm_store/reclists.hpp components/misc/stringops.hpp	2012-12-30 13:09:37 +01:00
Emanuel Guevel	9d043d0193	mwiniimporter: fix string cutting	2012-12-29 18:16:03 +01:00
Emanuel Guevel	b2203d22fc	mwiniimporter: added fallback values Ugly comments included. I will merge it on another branch to clean this up later.	2012-12-29 18:15:32 +01:00
scrawl	1dcc0f10ee	Merge pull request #6 from ChrisKCat/videoplayback Videoplayback	2012-12-28 15:28:58 -08:00
Marc Zinnschlag	8d4afe3bf5	post merge fix	2012-12-28 23:45:13 +01:00
Marc Zinnschlag	e2a8e2107b	Merge branch 'globals'	2012-12-28 23:42:02 +01:00
Marc Zinnschlag	334588bf1c	Merge branch 'editor2'	2012-12-28 23:31:43 +01:00
Tom Mason	bed8fb69e6	added bounty related scripting functions	2012-12-28 22:26:21 +00:00
Chris Robinson	1dd9276ceb	Add missing decoder method declarations	2012-12-28 11:26:41 -08:00
scrawl	ade4ec0453	fix texture edge bleeding due to wrong addressing mode	2012-12-28 19:01:47 +01:00
eduard	c75a5ae212	string compare and tolower	2012-12-28 18:05:52 +01:00
eduard	8545667bbd	string compare and tolower	2012-12-28 17:54:56 +01:00
Tom Mason	ad9b86058b	replaced explicit text with GMST entries, thanks to zinnschlag	2012-12-27 15:28:13 +00:00
Tom Mason	ba2301a156	removed redundant code thanks to scrawl	2012-12-27 00:49:39 +00:00
Tom Mason	299a1f32ed	cleanup	2012-12-26 23:52:16 +00:00
Tom Mason	51fce62b69	Merge branch 'messageboxes'	2012-12-26 23:06:27 +00:00
Tom Mason	716fbbbd74	messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory	2012-12-26 22:57:53 +00:00
Tom Mason	a14b7e4a0f	small fixes on text defines	2012-12-26 18:07:56 +00:00
Marc Zinnschlag	afc2e840ae	renamed namespace TranslationData to Translation	2012-12-26 17:06:33 +01:00
Marc Zinnschlag	206c613b52	moved translation storage from GUI manager to engine	2012-12-26 17:03:37 +01:00
Marc Zinnschlag	2d468fec02	made previous commits naming standard compliant	2012-12-26 16:19:59 +01:00
Marc Zinnschlag	4c28f3211b	Merge remote-tracking branch 'lazydev/master'	2012-12-26 15:50:03 +01:00
Mark Siewert	8ccec17481	- Restore ability for plugins deleting records defined in parent files - Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)	2012-12-26 10:34:59 +01:00
Mark Siewert	049b0e66e0	- Restore ability to generate references in the same cell from multiple plugins - Disable some code related to deleting entries in the store so that it builds again	2012-12-25 20:27:30 +01:00
lazydev	1f71395660	renaming of translation component; removing of C++11 features	2012-12-25 23:20:39 +04:00
lazydev	74ae479780	Cell names localization fix	2012-12-23 23:23:24 +04:00
Tom Mason	8ac8fdff47	implemented all text defines except a few for keybindings that don't exist yet	2012-12-21 18:09:31 +00:00
Tom Mason	f2c6907244	Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work	2012-12-20 23:16:34 +00:00
Chris Robinson	85850c7440	Fix DEFAULT_OUTPUT declaration	2012-12-18 10:43:04 -08:00
scrawl	64210e6efa	Revert "New Game button" This reverts commit `c5dd0e1968`.	2012-12-18 19:09:27 +01:00
scrawl	1c73a3f2fb	Revert "remove commandline switch for new game" This reverts commit `86671096ec`.	2012-12-18 19:09:08 +01:00
Chris Robinson	7b2c3e6cd3	Pass a proper PlayMode enum to playSound and playSound3D	2012-12-18 06:01:21 -08:00

... 15 16 17 18 19 ...

5093 commits