Commit Graph
595 Commits
Author SHA1 Message Date
Jan-Peter Nilsson a94de76801 Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson 2e2d490c78 Remove unused variable (compiler warning) 2011-04-03 13:20:18 +02:00
Pieter van der Kloet 833a61dd82 Fixed Boost errors with 1.46 caused by the deprecated name file_string() 2011-03-28 17:36:05 +02: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
gugus 3ad2b9986e fix actors not beeing deleted. Need the latest OEngine. 2011-03-23 19:16:51 +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
gugus 773b7635a4 decrease the range of the raycast, and modifie the gravity/speed of the player. 2011-03-22 21:30:46 +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 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 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
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 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
Marc Zinnschlag 72ce493123 non-unique NPC ID workaround 2011-03-18 10:20:14 +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
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
Marc Zinnschlag eb93ef68f1 fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class 2011-03-13 22:33:55 +01:00
Jan-Peter Nilsson 0f2152903e Get rid of deprecated warning for eventWindowChangeCoord 2011-03-12 13:54:00 +01:00
Jan-Peter Nilsson f83c5327f3 Move eventDone to WindowBase and make it tell which window is done 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 54fc64cb6a Decrease number of classes that need to know about other components 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 67b4243a7f Use one instead of five state variables to keep track of character creation progress 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 183ccad872 Move ClassPoint struct definition from source to header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 53b85eaaa9 Stat setValue, use the enum values all the way through instead of converting enum->string->same enum 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 0695e8d8b2 Move HUD implementation out of the header file 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 2a53afc2bf Move StatsWindow class to it's own file. 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 5342bd77f1 Use one event with a parameters instead of four events to tell with dialog we want to see 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson a0ee11c51b Don't care about the widget 2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson 03158f4b62 Change indentation to four spaces 2011-03-12 10:56:10 +01:00
Nikolay Kasyanov edcac879d7 Oops. Used tabs instead of 4 spaces. Fixed. 2011-03-12 03:00:42 +03:00
Marc Zinnschlag a14db99aa8 Merge remote branch 'gus/collisions' into collision 2011-03-11 22:09:01 +01:00
gugus 9b606be4b8 fix direction bug 2011-03-11 19:39:45 +01:00
Marc Zinnschlag 8ed1c59059 Merge remote branch 'jpn/collision' into collision 2011-03-09 19:31:18 +01:00
gugus 00de2e6d98 correct some stuff with the physic implementation 2011-03-09 19:09:11 +01:00
gugus 40193253b0 fix some time bug 2011-03-09 18:29:57 +01:00