Marc Zinnschlag
|
8446619ac4
|
Merge branch 'components_namespaces' into next
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
|
2011-06-19 20:22:29 +02:00 |
|
Lukasz Gromanowski
|
e9ff9a446b
|
Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/nifogre into NifOgre namespace.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2011-06-19 19:14:14 +02:00 |
|
Marc Zinnschlag
|
bc92b7b1fa
|
Merge branch 'directories' into next
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
|
2011-06-15 22:40:24 +02:00 |
|
Marc Zinnschlag
|
0f2df4e2b8
|
more cleanup
|
2011-06-15 22:33:31 +02:00 |
|
Marc Zinnschlag
|
7d2956329a
|
some cleanup
|
2011-05-30 14:27:04 +02:00 |
|
Marc Zinnschlag
|
bed45a936e
|
fixed cell change crash
|
2011-05-30 14:21:55 +02:00 |
|
Jason Hooks
|
51b74c2f05
|
starting
|
2011-05-23 19:01:36 -04:00 |
|
Jason Hooks
|
b945ce61a5
|
Merge remote branch 'upstream/master'
|
2011-05-23 15:01:47 -04:00 |
|
gugus
|
c7fb27e801
|
Clean up wasn't done properly when deleting a Cell.
|
2011-05-23 20:22:12 +02:00 |
|
gugus
|
faaa08d6d0
|
removed this stupide methode to generate unique ID.
|
2011-05-23 19:47:27 +02:00 |
|
gugus
|
4546ca3863
|
static Objects goes inside the static geometry
|
2011-05-23 19:39:10 +02:00 |
|
gugus
|
cd79df1d8b
|
Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation
Conflicts:
apps/openmw/mwrender/exterior.cpp
|
2011-05-23 19:27:40 +02:00 |
|
Marc Zinnschlag
|
7192bc4f89
|
added static flag
|
2011-05-23 19:12:28 +02:00 |
|
gugus
|
41d283a3aa
|
very experimental: static geometry.
|
2011-05-23 15:00:01 +02:00 |
|
Marc Zinnschlag
|
f52e6bd5ef
|
made toggle-type script instructions more verbose
|
2011-04-26 21:38:21 +02:00 |
|
Jason Hooks
|
92509d3b70
|
Trying to animate creatures
|
2011-04-13 20:35:44 -04:00 |
|
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 |
|
Marc Zinnschlag
|
c571148bef
|
Merge branch 'collision'
|
2011-03-23 22:57:56 +01:00 |
|
gugus
|
3ad2b9986e
|
fix actors not beeing deleted. Need the latest OEngine.
|
2011-03-23 19:16:51 +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 |
|
gugus
|
7a28c9f3aa
|
fix the door bug
|
2011-03-22 20:15:19 +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
|
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
|
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 |
|
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 |
|
Marc Zinnschlag
|
1e9dc4b435
|
de-Windownizing and some build-fixes
|
2011-02-26 16:37:47 +01:00 |
|
gugus
|
33f22fd68b
|
fix camera bug
|
2011-02-23 12:28:13 +01:00 |
|
gugus
|
903f39cb50
|
change the rayCasting system. It use bullet now. NOT TESTED!
|
2011-02-22 20:52:05 +01:00 |
|
gugus
|
d3c1640723
|
add physic support
|
2011-02-22 14:11:53 +01:00 |
|
gugus
|
84dce2eb36
|
add physic and solve a problem with window.h macro min/max
|
2011-02-19 19:18:03 +01:00 |
|
gugus
|
746cf3a45a
|
add physic.
|
2011-02-19 11:36:57 +01:00 |
|
Marc Zinnschlag
|
9807e7dadc
|
simplified actor-related physics interface to mwscene
|
2011-02-11 09:24:59 +01:00 |
|
Marc Zinnschlag
|
5c1aae3e26
|
added object movement code in mwscene (will be replaced by physics code later); does not work well, because OpenEngine manipulates camera instead of player node
|
2011-02-10 13:32:34 +01:00 |
|
Marc Zinnschlag
|
9c6bc4975c
|
attached camera to a scene node
|
2011-02-10 12:56:19 +01:00 |
|
Marc Zinnschlag
|
ca44b3640a
|
pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug
|
2011-02-01 10:11:41 +01:00 |
|
Marc Zinnschlag
|
88b0908104
|
adding physics when insertering objects into the OGRE scene
|
2011-01-29 17:33:48 +01:00 |
|
Marc Zinnschlag
|
9a5a6eac2b
|
stop reporting changes originating from physics system back to physics system
|
2011-01-27 09:29:55 +01:00 |
|