6855 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Zinnschlag	c626e2b257	Merge branch 'ref' ... Conflicts: apps/opencs/view/doc/view.hpp	2013-05-19 14:59:01 +02:00
Marc Zinnschlag	ca33d66ed9	added missing columns for weapon records	2013-05-19 14:44:41 +02:00
Marc Zinnschlag	2123900db5	added missing columns for NPC records	2013-05-19 13:53:47 +02:00
scrawl	c7805e7dd2	Fix sun glare persisting after changing to an interior cell	2013-05-18 23:10:37 +02:00
scrawl	4983d08fe4	Fix a problem with statics disappearing sometimes on the map ... Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)	2013-05-18 22:55:30 +02:00
Marc Zinnschlag	8d78bea4aa	added missing column for misc record	2013-05-18 18:55:23 +02:00
Marc Zinnschlag	862e568f9b	added missing columns for Light record	2013-05-18 18:46:41 +02:00
scrawl	60563afc10	Fix a new game crash, reset camera	2013-05-17 22:53:43 +02:00
Chris Robinson	53d1c3939c	Merge remote-tracking branch 'zini/master' into animations	2013-05-17 06:26:34 -07:00
Chris Robinson	e8bbb755c3	Play the left-arm torch animation when it's equipped	2013-05-17 06:21:59 -07:00
Marc Zinnschlag	749fd418b5	added missing columns for door record	2013-05-17 15:10:41 +02:00
Marc Zinnschlag	e2b8f9ea6d	Merge remote-tracking branch 'scrawl/master'	2013-05-17 14:37:41 +02:00
scrawl	d096b19307	Fix not being able to equip arrows/bolts	2013-05-17 14:11:19 +02:00
scrawl	3cadb5918f	Fix containers showing random items from my commit earlier	2013-05-17 14:11:02 +02:00
Chris Robinson	ee585046ac	Don't show weapons in first-person	2013-05-17 01:56:16 -07:00
Chris Robinson	4b9a888d74	Use the PickProbe animation group as appropriate	2013-05-17 01:46:51 -07:00
Marc Zinnschlag	f8c675a638	Merge remote-tracking branch 'graffy76/usersettings'	2013-05-17 10:24:52 +02:00
graffy76	3ce35e691c	Commented out sample editor settings page	2013-05-16 20:43:05 -05:00
scrawl	ca81335319	Fix bug loading attribute values	2013-05-16 21:45:49 +02:00
Marc Zinnschlag	cc42b1ef48	Merge remote-tracking branch 'riothamus/riothamus-b752'	2013-05-16 20:07:48 +02:00
riothamus	d89dbde940	Bug 752, spacing fix	2013-05-16 14:05:22 -04:00
Marc Zinnschlag	ef9abda754	Merge remote-tracking branch 'glorf/weather'	2013-05-16 19:53:28 +02:00
Marc Zinnschlag	9fe5ff46cd	Merge remote-tracking branch 'riothamus/riothamus-b752'	2013-05-16 19:52:14 +02:00
riothamus	36f1197b51	Bug 752, cleanup	2013-05-16 13:51:54 -04:00
Glorf	19ce233667	Workaround for MOC compiler problem	2013-05-16 19:46:04 +02:00
riothamus	db981a72fe	Bug 752	2013-05-16 13:40:00 -04:00
Marc Zinnschlag	2c8a511179	Merge remote-tracking branch 'scrawl/persistence'	2013-05-16 19:37:41 +02:00
scrawl	8a3d3f954b	NPC/creature persistence flag	2013-05-16 18:50:26 +02:00
Marc Zinnschlag	54f56b0515	Merge remote-tracking branch 'graffy76/usersettings' ... Conflicts: apps/opencs/view/doc/view.cpp apps/opencs/view/doc/view.hpp	2013-05-16 18:04:55 +02:00
graffy76	13242c2bd5	Eliminated code centering the initial view in the middle of the screen	2013-05-16 10:14:13 -05:00
Marc Zinnschlag	889a87982e	added missing columns for creatures	2013-05-16 16:27:33 +02:00
Chris Robinson	6201cb0093	Add a method to clear the animation queue	2013-05-16 06:59:41 -07:00
Glorf	af28be915f	Use fallback video name	2013-05-16 13:47:27 +02:00
Glorf	0539ca6a9c	Bugfix #778	2013-05-16 13:35:28 +02:00
Chris Robinson	6c6200efef	Merge remote-tracking branch 'zini/master' into animations	2013-05-15 16:34:51 -07:00
Marc Zinnschlag	9fee99d56c	Merge remote-tracking branch 'scrawl/master'	2013-05-15 22:43:00 +02:00
scrawl	aaa9aba999	Some fixes	2013-05-15 22:38:53 +02:00
scrawl	c41f119ba6	Added new game button	2013-05-15 17:54:18 +02:00
Marc Zinnschlag	d794a62d19	added missing columns for container record	2013-05-15 17:02:34 +02:00
Chris Robinson	71d39c2fa0	Merge remote-tracking branch 'zini/master' into animations	2013-05-15 06:36:06 -07:00
Chris Robinson	e069215583	Don't clear the last queued animation when it stops	2013-05-15 06:32:20 -07:00
Marc Zinnschlag	28f2a7d2b4	added missing column for clothing records	2013-05-15 11:37:46 +02:00
Chris Robinson	66f55b3178	Play the item up/down sound when readying/unreadying weapons	2013-05-15 01:45:47 -07:00
Chris Robinson	b459a010b0	Fix vec.z being applied while not in the air	2013-05-14 23:03:28 -07:00
Chris Robinson	3c5c10144a	Remove a duplicate showWeapons call	2013-05-14 19:38:57 -07:00
Marc Zinnschlag	56b2b05f9a	Merge remote-tracking branch 'glorf/weather'	2013-05-14 22:56:26 +02:00
Glorf	39c7bc8363	Corrected celestical object sizes	2013-05-14 20:34:40 +02:00
Glorf	9fa2dd5277	Playing with moons part 2	2013-05-14 19:58:08 +02:00
Chris Robinson	e8661794fe	Avoid trying to find a state for non-actors. ... They're only ever play idles, unless PlayGroup is called.	2013-05-14 07:29:07 -07:00
Marc Zinnschlag	eba9d3e3ee	added missing columns for book record	2013-05-14 14:40:06 +02:00