10657 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nikolay Kasyanov	5845e71dd8	Fixed indentation in README_Mac	2011-03-24 14:29:26 +03:00
Nikolay Kasyanov	db34640d75	Merge remote-tracking branch 'upstream/master'	2011-03-24 14:26:49 +03:00
Nikolay Kasyanov	bac457a232	Updated README_Mac	2011-03-24 14:25:38 +03:00
Marc Zinnschlag	53e1d0e7e7	more cleanup	2011-03-23 23:05:15 +01:00
Marc Zinnschlag	a70e582ae2	removed debugging leftovers from the tab_complition branch	2011-03-23 23:03:41 +01:00
Marc Zinnschlag	c571148bef	Merge branch 'collision'	2011-03-23 22:57:56 +01:00
Marc Zinnschlag	5661dc27c2	removed a leftover from physics debugging	2011-03-23 22:56:58 +01:00
Marc Zinnschlag	57c3414fcd	OpenEngine update (bug-fix)	2011-03-23 22:56:11 +01:00
gugus	32b475432f	fix the bug when changing cell.	2011-03-23 22:49:23 +01:00
Marc Zinnschlag	c99bdcd33b	Merge remote branch 'gus/collision' into collision	2011-03-23 19:26:31 +01:00
gugus	1cada5032e	fix delete actor	2011-03-23 19:17:45 +01:00
gugus	3ad2b9986e	fix actors not beeing deleted. Need the latest OEngine.	2011-03-23 19:16:51 +01:00
Marc Zinnschlag	07c6e9271e	Merge branch 'next'	2011-03-23 17:10:32 +01:00
Marc Zinnschlag	d7226fc9c2	Merge branch 'tab_completion'	2011-03-23 17:08:52 +01:00
Marc Zinnschlag	7144657cfc	Merge branch 'script'	2011-03-23 17:07:05 +01:00
Marc Zinnschlag	bd55cfdcf9	Merge remote branch 'gus/collision' into collision	2011-03-23 14:07:29 +01:00
gugus	b2194398a4	fixed a bug in loading. Every collision mesh is correctly loaded now.	2011-03-23 13:42:28 +01:00
Marc Zinnschlag	615f10b8c0	OpenEngine update	2011-03-22 21:52:27 +01:00
gugus	773b7635a4	decrease the range of the raycast, and modifie the gravity/speed of the player.	2011-03-22 21:30:46 +01:00
gugus	1ce6405e2b	fix the raycasting bug	2011-03-22 21:28:18 +01:00
Marc Zinnschlag	0866e4d4fe	fix: NPCs were not added to physics system	2011-03-22 20:31:33 +01:00
Marc Zinnschlag	9946bb36f7	Merge remote branch 'gus/collision' into collision	2011-03-22 20:20:49 +01:00
gugus	7a28c9f3aa	fix the door bug	2011-03-22 20:15:19 +01:00
Marc Zinnschlag	7653caea27	Merge branch 'master' into collision ... Conflicts: apps/openmw/mwclass/npc.cpp	2011-03-22 20:02:03 +01:00
gugus	0cc94c81d4	Merge remote branch 'upstream/collision' into collision	2011-03-22 14:14:56 +01:00
Marc Zinnschlag	bd08e308f8	mangle update	2011-03-22 14:12:45 +01:00
Marc Zinnschlag	590f9e83d8	Windows-fix for gus	2011-03-22 14:12:25 +01:00
Marc Zinnschlag	7b5d24c853	fixed a bug in phyiscs update code	2011-03-22 13:48:31 +01:00
gugus	3dddcbd958	fix a camera problem and increase player speed	2011-03-22 13:01:23 +01:00
Marc Zinnschlag	91ea36509d	gus' fly mode fix; manually applied	2011-03-21 14:08:56 +01:00
Marc Zinnschlag	68004630e9	OpenEngine update	2011-03-20 22:42:17 +01:00
Marc Zinnschlag	8788dcebcf	Merge remote branch 'gus/collisions' into collision	2011-03-20 22:38:42 +01:00
gugus	8aeefd2af8	fix the fall bug when using ToggleCollision. Require lastest change with OEngine.	2011-03-20 21:52:31 +01:00
gugus	8f9b8749d4	fix the fall bug when using ToggleCollision	2011-03-20 21:51:40 +01:00
Marc Zinnschlag	3012822ea1	Merge branch 'collision' into next ... Conflicts: apps/openmw/mwclass/npc.cpp	2011-03-20 15:08:21 +01:00
Marc Zinnschlag	647e88003e	build and activation fix	2011-03-19 19:54:37 +01:00
gugus	21c224af25	add gravity change to the ToggleCollisionMode function.	2011-03-18 13:32:42 +01:00
gugus	25b3cf9359	OEngine doesn't rely anymore on OpenMW+ some change for the toggleCollisionMode function.	2011-03-18 13:24:47 +01:00
gugus	102f1ee5dc	filled the toggleCollisionMode function. It needs the lastest change in OEngine	2011-03-18 13:23:26 +01:00
gugus	2aee958789	Not sure about this commit: the PhysicEngine was initialized twice...	2011-03-18 13:22:51 +01:00
gugus	9d4cda6510	OEngine doesn't rely on OpenMW anymore	2011-03-18 13:22:09 +01:00
Marc Zinnschlag	72ce493123	non-unique NPC ID workaround	2011-03-18 10:20:14 +01:00
gugus	d872d09081	add no gravity, no collision and remove debug messages.	2011-03-17 11:00:46 +01:00
gugus	98b27813b7	change raycasting	2011-03-17 10:54:38 +01:00
Marc Zinnschlag	72a84356e2	added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)	2011-03-16 09:09:45 +01:00
Marc Zinnschlag	8ebdd77772	Merge branch 'collision' into script	2011-03-16 08:48:13 +01:00
gugus	0fb2107265	Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions ... Conflicts: apps/openmw/mwclass/npc.cpp	2011-03-15 13:36:25 +01:00
gugus	b03dec4ad4	Merge branch 'collision' of git://github.com/zinnschlag/openmw.git into collisions	2011-03-15 13:33:43 +01:00
Marc Zinnschlag	4100a72e8d	don't do physics calculations while the GUI is up	2011-03-13 22:39:44 +01:00
Marc Zinnschlag	f1bfca7c7c	player class cleanup	2011-03-13 22:37:54 +01:00