2457 commits

Author	SHA1	Message	Date
gugus	557e114992	clean-up + getScale/Angle script instructions	2012-07-09 19:28:44 +02:00
gugus	0a67f60a6e	Clean-up	2012-07-09 18:47:59 +02:00
gugus	e6716c25c3	little correction.	2012-07-09 15:41:19 +02:00
gugus	feec67094f	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwworld/physicssystem.cpp	2012-07-09 15:23:26 +02:00
gugus	03f7740474	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp	2012-07-09 10:39:57 +02:00
Jason Hooks	b5edad790d	merge	2012-07-07 15:27:04 -04:00
Marc Zinnschlag	fe86ce5a2c	DrawState workaround	2012-07-07 20:53:19 +02:00
Marc Zinnschlag	6277e39216	Merge branch 'master' into skillgain	2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson	113457d934	Fixed some windows issues and got rid of a few tiny warnings while at it.	2012-07-07 01:14:18 +02:00
Marc Zinnschlag	0f41cc499d	Issue #324: Added skill gain calculation function	2012-07-06 21:07:04 +02:00
Marc Zinnschlag	10723a149b	Issue #324: Change a forward declartion to avoid potential problems with pesky MSVC	2012-07-06 18:25:16 +02:00
Marc Zinnschlag	d30ba14a17	Issue #324: Finished turning NpcStats into a proper class	2012-07-06 18:23:48 +02:00
Marc Zinnschlag	771863e73b	Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue	2012-07-06 15:50:26 +02:00
scrawl	1a5203749f	fix "error in framelistener" when trying to pick up lights that can't be picked up	2012-07-05 17:13:23 +02:00
scrawl	78efc31641	different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308), fixed some windows not centering when resolution change	2012-07-03 16:51:29 +02:00
scrawl	085891879c	fixed another resolution change bug introduced recently	2012-07-03 16:44:20 +02:00
Marc Zinnschlag	205ed0ce5b	post merge fix	2012-07-03 15:53:42 +02:00
Marc Zinnschlag	cc7c6aa0ad	Merge branch 'decouple'	2012-07-03 15:47:57 +02:00
Marc Zinnschlag	c85aaafac2	more include cleanup (most removing Ogre.h)	2012-07-03 15:32:38 +02:00
Marc Zinnschlag	87667ab57e	Issue #107: Ptr related include cleanup	2012-07-03 13:55:53 +02:00
Marc Zinnschlag	5a7b95bf7a	Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp	2012-07-03 13:15:20 +02:00
Marc Zinnschlag	4c39fefd1e	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
scrawl	d27863bf8e	rename layout files to .layout to get them recognized by layout editor	2012-07-03 11:34:20 +02:00
Marc Zinnschlag	035c1c4b6e	added World interface class; cleanup of World interface	2012-07-03 01:06:38 +02:00
Marc Zinnschlag	efb95e2f83	Issue #317: check if spell actually exist in AddSpell	2012-07-02 14:25:46 +02:00
Pieter van der Kloet	2db6e4f4cf	Second try: added aspect ratios to the resolution combobox	2012-06-29 19:13:12 +02:00
Marc Zinnschlag	7fcd41c69d	Issue #107: Detemplateised CellStore; some include cleanup	2012-06-29 18:54:23 +02:00
Marc Zinnschlag	76174098c7	Issue #107: CellStore moved from ESMS to MWWorld	2012-06-29 16:48:50 +02:00
Marc Zinnschlag	fc063472d0	Revert "Added aspect ratio info to the list of resolutions" ... This reverts commit be5e047106.	2012-06-29 14:41:19 +02:00
Marc Zinnschlag	e5cdc988a6	Merge remote branch 'pvdk/launcher'	2012-06-28 10:14:03 +02:00
Pieter van der Kloet	dded604eca	Improved launcher images made by serpentine	2012-06-28 05:16:26 +02:00
Pieter van der Kloet	be5e047106	Added aspect ratio info to the list of resolutions	2012-06-28 02:06:42 +02:00
Marc Zinnschlag	70ac1c818d	Merge remote branch 'scrawl/settingswindow'	2012-06-27 09:02:29 +02:00
scrawl	b73b39f3c6	launcher bugfix, settings was not written when "Play" was selected	2012-06-27 00:55:25 +02:00
scrawl	232fe0be8c	fix for the directx crash	2012-06-26 18:03:52 +02:00
scrawl	c37b14f5f7	Merge pull request #5 from pvdk/master ... Sorting of graphics values	2012-06-26 06:47:39 -07:00
scrawl	30e86e1b9d	settings window resolution sorting, aspect ratio	2012-06-26 15:41:13 +02:00
Pieter van der Kloet	e5159a1950	Modified sorting of the values in the Graphics Page	2012-06-26 15:37:40 +02:00
Pieter van der Kloet	77ac8760d1	Cleaned up the GUI of the Graphics page	2012-06-26 03:07:54 +02:00
Pieter van der Kloet	6fe471c1c6	Resolutions are now sorted descendingly and removed some debug stuff	2012-06-26 02:41:54 +02:00
Marc Zinnschlag	83c3972a89	Issue #314: added return value to addSpell function	2012-06-24 16:23:43 +02:00
Marc Zinnschlag	aa827442e8	Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too	2012-06-24 11:39:21 +02:00
scrawl	797c2c538d	fix some settings bugs	2012-06-23 12:25:28 +02:00
Marc Zinnschlag	2b68e4d489	Merge remote branch 'scrawl/trianglebatchcount'	2012-06-22 14:30:00 +02:00
scrawl	63ce143a04	fix triangle / batch counts with compositors	2012-06-22 12:56:04 +02:00
scrawl	98f13ebcc0	Merge branch 'misc' of github.com:scrawl/openmw into misc	2012-06-21 12:15:43 +02:00
Marc Zinnschlag	ad251065f4	removed more cout spam	2012-06-21 12:00:56 +02:00
Marc Zinnschlag	89ac0fa232	Issue #312: Implemented ID-search caching to speed up some badly written scripts	2012-06-21 11:43:18 +02:00
Pieter van der Kloet	6a2bcddef5	Changed the way the launcher exits and polished the error handling code	2012-06-20 23:25:22 +02:00
Jason Hooks	5c51674070	update	2012-06-20 13:14:27 -04:00
Marc Zinnschlag	1b368506d4	Merge remote branch 'pvdk/filedialog'	2012-06-20 16:05:20 +02:00
Pieter van der Kloet	d162445e68	Got rid of some unwanted warnings and did some cleanup on the launcher	2012-06-20 13:35:05 +02:00
Marc Zinnschlag	95d9c99d0d	Merge remote branch 'pvdk/filedialog'	2012-06-20 09:28:43 +02:00
Pieter van der Kloet	e21442f6cc	Fix for Bug #306: launcher now creates the config dir and returns proper error codes	2012-06-20 02:28:49 +02:00
Jason Hooks	86d8a07fc7	Switching back to old scaling	2012-06-19 13:28:06 -04:00
Marc Zinnschlag	1f0efa9f7d	Merge remote branch 'scrawl/guifixes'	2012-06-19 19:06:18 +02:00
scrawl	15e959868c	make some of the gui mode changes a bit safer	2012-06-19 17:07:00 +02:00
Marc Zinnschlag	590dfe8d63	fixed the container fill problem on cell load	2012-06-19 16:42:10 +02:00
Marc Zinnschlag	511d0c0e1c	Merge remote branch 'scrawl/rendererselection'	2012-06-19 16:04:48 +02:00
scrawl	61ec56debc	don't add duplicate resolutions	2012-06-19 16:02:28 +02:00
scrawl	c9e76d3e90	remove extra tokens at the end of the resolution string, if present	2012-06-19 15:57:58 +02:00
scrawl	ff278ab4ec	chargen generate class: fix result not being shown in review dialog	2012-06-19 15:25:04 +02:00
scrawl	0aa01b93e2	don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter)	2012-06-19 15:24:52 +02:00
Marc Zinnschlag	9a6f012578	Merge branch 'script'	2012-06-19 11:07:47 +02:00
Jason Hooks	4d55ecfdbe	Deleting scaled shapes; scaleObject()	2012-06-18 13:03:00 -04:00
Marc Zinnschlag	09057daac5	Merge remote branch 'scrawl/containerunlocking'	2012-06-18 09:57:22 +02:00
Jason Hooks	33fe80723c	btScaledBvhTriangleMeshShapes	2012-06-17 20:56:10 -04:00
scrawl	de3daf3dc1	allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind	2012-06-18 00:21:55 +02:00
Marc Zinnschlag	4a726f272b	Merge remote branch 'pvdk/filedialog'	2012-06-17 09:58:39 +02:00
Marc Zinnschlag	badb20e5df	Merge remote branch 'scrawl/rendererselection'	2012-06-17 09:54:18 +02:00
Pieter van der Kloet	f81e127701	Created custom directory dialog which only accepts Data Files dirs	2012-06-17 06:48:32 +02:00
scrawl	b831c3313d	render system was not written on launcher exit	2012-06-17 00:47:45 +02:00
Marc Zinnschlag	3c42a71dae	removed some cout spam	2012-06-16 16:42:35 +02:00
Marc Zinnschlag	e2a77037eb	fixed a type in a script instruction	2012-06-16 16:38:54 +02:00
Marc Zinnschlag	8283f5f135	added setHello/Fight/Flee/Alarm instructions	2012-06-16 16:31:32 +02:00
Marc Zinnschlag	ea29b74bb4	added per NPC/creature basic AI-settings (hello, fight, flee, alarm)	2012-06-16 16:17:42 +02:00
Marc Zinnschlag	7454713a9b	addet provisional implementation of AiWander (doesn't do anything yet)	2012-06-16 16:06:15 +02:00
Marc Zinnschlag	b16157a618	documentation fix	2012-06-16 15:49:39 +02:00
Marc Zinnschlag	3167ae9473	added force/clearforce instructions for run and sneak	2012-06-16 15:49:03 +02:00
Marc Zinnschlag	0795730a19	Merge branch 'xdoty' into script	2012-06-16 14:57:13 +02:00
Marc Zinnschlag	10b27e582b	Issue #181: various fixed to member variable access	2012-06-16 13:51:13 +02:00
Marc Zinnschlag	6c5b21fa42	Issue #181: Member variable access in expressions; error reporting fix for the previous commit	2012-06-16 13:06:23 +02:00
Marc Zinnschlag	6a89d76321	Issue #181: Improved script error reporting for local and global scripts	2012-06-16 11:52:35 +02:00
gugus	5397b9dba6	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling	2012-06-16 11:38:07 +02:00
gugus	974585d357	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling	2012-06-15 14:53:58 +02:00
gugus	01fefca0a3	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-06-15 14:53:19 +02:00
scrawl	584ae30213	don't show diseases and curses in the spell list	2012-06-15 10:09:46 +02:00
Marc Zinnschlag	0f71439991	Merge remote branch 'garvek/master'	2012-06-15 08:22:56 +02:00
Jason Hooks	897a331244	NPC activation	2012-06-13 12:21:51 -04:00
Jason Hooks	20288de685	Post merge	2012-06-11 15:39:57 -04:00
Jason Hooks	b14c132a31	Merging in the latest master	2012-06-11 13:25:06 -04:00
Jason Hooks	595b0729da	Few things changed	2012-06-10 21:08:58 -04:00
Pieter van der Kloet	0bcec32c70	Changed launcher logo to the new one done by Necrod	2012-06-11 02:50:29 +02:00
Jason Hooks	fb0a52809d	Changing transformation processing	2012-06-09 15:19:15 -04:00
scrawl	447158e9d6	shutdown crash fix	2012-06-09 19:15:11 +02:00
Sylvain THESNIERES	fc3a3fc173	MSVC build compliance: ... - static const float member is not ISO - callback do not match DLL signature	2012-06-08 19:55:39 +02:00
Marc Zinnschlag	eb0be10e80	Merge branch 'script' into xdoty	2012-06-07 13:00:01 +02:00
Marc Zinnschlag	ff84fbbfa7	Added DontSaveObject script instruction ... We are ignoring it for now and unless users protest we will probably keep it that way.	2012-06-07 12:36:51 +02:00
Marc Zinnschlag	72fca40090	Issue #181: member variable access in interpreter context	2012-06-07 11:59:45 +02:00
scrawl	42e44ac1b5	fixed some leaks	2012-06-06 21:08:20 +02:00