6889 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Marc Zinnschlag	fce9939f83	added missing columns for armor record	2013-05-14 14:33:34 +02:00
Marc Zinnschlag	7c57f2c221	added AI-related actor columns	2013-05-14 13:20:59 +02:00
Chris Robinson	355f653614	Use AnimationAlloc instead of AnimationAllocatedObject	2013-05-14 01:30:01 -07:00
Chris Robinson	47a9a4cdff	Clean up a for loop	2013-05-14 01:29:15 -07:00
kcat	81cf2008d7	Merge pull request #7 from scrawl/animations ... Fix a compile error, OGRE_NEW only works for classes derived from Alloca...	2013-05-14 01:18:05 -07:00
scrawl	96e3b3b7c2	Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject	2013-05-13 21:03:53 +02:00
Marc Zinnschlag	d684120f7a	Merge remote-tracking branch 'scrawl/master'	2013-05-13 20:47:50 +02:00
scrawl	ac4fa1941d	Fix the frame update not getting called on the first frame	2013-05-13 20:08:12 +02:00
Marc Zinnschlag	667b7d94e3	Merge remote-tracking branch 'axujen/master'	2013-05-13 14:56:09 +02:00
Marc Zinnschlag	74d791e207	fixed auto calc column	2013-05-13 14:07:31 +02:00
Axujen	56d8ca8434	Add link to Development Environment Setup in the readme. ... Point people who need to build this from source in the right direction.	2013-05-13 11:40:50 +00:00
Marc Zinnschlag	897e55391d	added columns for tool IDs	2013-05-13 13:36:24 +02:00
Marc Zinnschlag	52d81dc9fa	added columns for enchantments	2013-05-13 13:11:43 +02:00
Chris Robinson	822f130f79	Merge remote-tracking branch 'zini/master' into animations	2013-05-13 04:09:56 -07:00
Chris Robinson	8ec722ac92	Use std::find_if instead of ugly for loops	2013-05-13 04:08:36 -07:00
Marc Zinnschlag	90bae2bead	do not create editors for unused columns	2013-05-13 12:55:28 +02:00