4205 commits

Author	SHA1	Message	Date
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
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
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
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
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
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