Marc Zinnschlag
8788dcebcf
Merge remote branch 'gus/collisions' into collision
14 years ago
gugus
8aeefd2af8
fix the fall bug when using ToggleCollision. Require lastest change with OEngine.
14 years ago
Marc Zinnschlag
647e88003e
build and activation fix
14 years ago
gugus
21c224af25
add gravity change to the ToggleCollisionMode function.
14 years ago
gugus
102f1ee5dc
filled the toggleCollisionMode function. It needs the lastest change in OEngine
14 years ago
gugus
2aee958789
Not sure about this commit: the PhysicEngine was initialized twice...
14 years ago
Marc Zinnschlag
72ce493123
non-unique NPC ID workaround
14 years ago
gugus
98b27813b7
change raycasting
14 years ago
Marc Zinnschlag
72a84356e2
added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)
14 years ago
Marc Zinnschlag
8ebdd77772
Merge branch 'collision' into script
14 years ago
gugus
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
Marc Zinnschlag
4100a72e8d
don't do physics calculations while the GUI is up
14 years ago
Marc Zinnschlag
f1bfca7c7c
player class cleanup
14 years ago
Marc Zinnschlag
eb93ef68f1
fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class
14 years ago
Jan-Peter Nilsson
0f2152903e
Get rid of deprecated warning for eventWindowChangeCoord
14 years ago
Jan-Peter Nilsson
f83c5327f3
Move eventDone to WindowBase and make it tell which window is done
14 years ago
Jan-Peter Nilsson
54fc64cb6a
Decrease number of classes that need to know about other components
14 years ago
Jan-Peter Nilsson
67b4243a7f
Use one instead of five state variables to keep track of character creation progress
14 years ago
Jan-Peter Nilsson
183ccad872
Move ClassPoint struct definition from source to header file
14 years ago
Jan-Peter Nilsson
53b85eaaa9
Stat setValue, use the enum values all the way through instead of converting enum->string->same enum
14 years ago
Jan-Peter Nilsson
0695e8d8b2
Move HUD implementation out of the header file
14 years ago
Jan-Peter Nilsson
2a53afc2bf
Move StatsWindow class to it's own file.
14 years ago
Jan-Peter Nilsson
5342bd77f1
Use one event with a parameters instead of four events to tell with dialog we want to see
14 years ago
Jan-Peter Nilsson
a0ee11c51b
Don't care about the widget
14 years ago
Jan-Peter Nilsson
03158f4b62
Change indentation to four spaces
14 years ago
Nikolay Kasyanov
edcac879d7
Oops. Used tabs instead of 4 spaces. Fixed.
14 years ago
Marc Zinnschlag
a14db99aa8
Merge remote branch 'gus/collisions' into collision
14 years ago
gugus
9b606be4b8
fix direction bug
14 years ago
Marc Zinnschlag
8ed1c59059
Merge remote branch 'jpn/collision' into collision
14 years ago
gugus
00de2e6d98
correct some stuff with the physic implementation
14 years ago
gugus
40193253b0
fix some time bug
14 years ago
Nikolay Kasyanov
768c9bdf07
On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root
14 years ago
Nikolay Kasyanov
943eea8104
.app bundle finally works
14 years ago
Nikolay Kasyanov
3d75eea377
Merge remote-tracking branch 'upstream/master'
14 years ago
Jan-Peter Nilsson
12db15d9a2
Reset arm position changed by commit 27f69d0f5b
14 years ago
Jan-Peter Nilsson
d68141d203
Remove unused variables
14 years ago
Jan-Peter Nilsson
6840e2c42f
Fix mising of signed/unsigned types in WindowManager::showClassQuestionDialog
14 years ago
Nikolay Kasyanov
4028600768
Builds on OS X now
14 years ago
Jan-Peter Nilsson
fb2f6f3c02
Delete mPhysicEngine when we are done with it
14 years ago
Jan-Peter Nilsson
1ce77229c0
Don't create physics before we have initialized ogre
14 years ago
Marc Zinnschlag
1e9dc4b435
de-Windownizing and some build-fixes
14 years ago
gugus
33f22fd68b
fix camera bug
14 years ago
gugus
903f39cb50
change the rayCasting system. It use bullet now. NOT TESTED!
14 years ago
gugus
d3c1640723
add physic support
14 years ago
gugus
7386fd0442
solve error with min/max macro for windows
14 years ago
gugus
84dce2eb36
add physic and solve a problem with window.h macro min/max
14 years ago
gugus
ff941b5963
add physic
14 years ago
sergoz
53ac8776ec
added box for fps counter and changed font colour to white
14 years ago
gugus
ee0d73e142
Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions
14 years ago
gugus
746cf3a45a
add physic.
14 years ago
sergoz
5132531f73
added fps counter
14 years ago
Marc Zinnschlag
ef7a06dea5
player was not registered at mwscene (for physics)
14 years ago
Marc Zinnschlag
9807e7dadc
simplified actor-related physics interface to mwscene
14 years ago
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
14 years ago
Marc Zinnschlag
9c6bc4975c
attached camera to a scene node
14 years ago
Marc Zinnschlag
151560b882
added missing run flag for NPCs
14 years ago
Marc Zinnschlag
9a3158675a
reworked cell changing mechanism
14 years ago
Marc Zinnschlag
f773cf27cb
replaced old movement input system
14 years ago
Marc Zinnschlag
3cd1088695
crash bug fix
14 years ago
Marc Zinnschlag
65232008a5
fixed a crash bug in NPC rendering
14 years ago
Marc Zinnschlag
8a3445beec
collect movement vectors from all actors
14 years ago
Marc Zinnschlag
4468a2b6a8
added movement data to MW references; added movement interface to MWWorld::Class
14 years ago
Marc Zinnschlag
ca44b3640a
pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug
14 years ago
Marc Zinnschlag
7449de22b1
removed a leftover debugging breadcrumb
14 years ago
Marc Zinnschlag
8b2252e7a1
first attempt at building with bullet
14 years ago
Marc Zinnschlag
40d772b33a
call doPhysics function once per frame
14 years ago
Marc Zinnschlag
88b0908104
adding physics when insertering objects into the OGRE scene
14 years ago
Marc Zinnschlag
6a14ea8ec3
handle physics during player changing cells
14 years ago
Marc Zinnschlag
5486c70edf
connected object-manipulator functions in world to physics interface
14 years ago
Marc Zinnschlag
9a5a6eac2b
stop reporting changes originating from physics system back to physics system
14 years ago
Marc Zinnschlag
ec88aee581
added a missing function
14 years ago
Marc Zinnschlag
843a0288c3
added more physics interface to MWScene
14 years ago
Marc Zinnschlag
162db31a5f
physics interface
14 years ago
Marc Zinnschlag
36cb10572a
fixed tab problem
14 years ago
Marc Zinnschlag
eb5e4427c1
Merge remote branch 'star/master' into movement
14 years ago
Star-Demon
588e6e9995
Fixed a syntax error! Oops!
14 years ago
Marc Zinnschlag
b48a5084be
added NPC stances
14 years ago
Star-Demon
09023bb853
Toggle now toggles, conventions...
14 years ago
Star-Demon
962b8c9781
Cleaned up inputmanager, tightened up player.exectueAutoMove()
14 years ago
Star-Demon
1bc9a46c6b
Cleaned up and changed executeAutoMove()
14 years ago
Marc Zinnschlag
18b8cdce29
added GetInterior script function
14 years ago
Star-Demon
90e6029bad
Fixed object reference error in player gets
14 years ago
Star-Demon
81c0909dbf
Player constructor now inits new variables.
14 years ago
Star-Demon
1a56ef9a67
More AutoMove, now including walking - ready for a look and then test
14 years ago
Star-Demon
5aec3815fd
The player should now be able to run AND walk...
14 years ago
Star-Demon
f96f53484c
More AutoMove stuff, Sneak bools, cleaning
14 years ago
Jan-Peter Nilsson
a724de2429
Follow the 'XDG Base Directory Specification' instead of putting the configfile in ~/.openmw/
...
Also updated based on feedback from athile:
Fix broken Linux elif.
Use boost:filesystem instead of mkdir for increased future portability.
Break appart class definition and implementation.
14 years ago
Star-Demon
60c9c31c7a
Silly error Fixed in binding
14 years ago
Star-Demon
bfcfcecab6
Most of AutoMove finished - just needs some speed in Player class.
14 years ago
Marc Zinnschlag
d865c3cfc6
backend for tab completion: identifiers
14 years ago
Marc Zinnschlag
6848115c18
backend for tab completion: keywords
14 years ago
Star-Demon
3ab4a4487f
Sneak State, Bound Sneak and AutoMove, began outlining AutoMove
14 years ago
Star-Demon
d4dccc0b54
Merge remote branch 'zinnschlag/master'
14 years ago
Jan-Peter Nilsson
851385d989
Allow override of OpenMW user configuration path with OPENMW_HOME environment variable
14 years ago
Jan-Peter Nilsson
8cb8481b37
Use a local plugins.cfg if available (allow us to run without installing)
14 years ago
Jan-Peter Nilsson
4221824681
Build debian package using cpack if dpkg is available
...
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
14 years ago
Jan-Peter Nilsson
0b1f18cc12
plugins.cfg is global config
14 years ago
Jan-Peter Nilsson
429775d485
Store configuration in /etc/openmw/ and ~/.openmw/ on linux
...
Requires new openengine version.
14 years ago
Marc Zinnschlag
bb2bc0b518
getting rid of the nullptr compatibility nonsense. Hopefully once and for all
14 years ago
athile
27f69d0f5b
Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp.
14 years ago
athile
75f77e9659
Add 'm' prefix to member variables in ExteriorCell
14 years ago
athile
c459eb7c55
Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010.
14 years ago
Star-Demon
43c33ee85f
Merge remote branch 'zinnschlag/master'
14 years ago
Star-Demon
e98eef8cd3
corrected grammar for merge
14 years ago
Marc Zinnschlag
46a8ccc2ff
changed collision mode instruction from enable/disable to toggle
14 years ago
Marc Zinnschlag
42ef7a61a0
Merge branch 'script'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/world.cpp
apps/openmw/mwworld/world.hpp
14 years ago
Marc Zinnschlag
bb34f6e7fc
added Enable/DisableCollision instructions
14 years ago
Marc Zinnschlag
0a832f2d23
Merge branch 'playerpos' into script
14 years ago
Marc Zinnschlag
f01a3d5e35
split Player class into a MWWorld and a MWRender component
14 years ago
Marc Zinnschlag
4f51391003
general player class cleanup
14 years ago
Marc Zinnschlag
4dd8616f87
Merge remote branch 'pvdk/master'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwsound/soundmanager.cpp
14 years ago
Pieter van der Kloet
dd4d022301
Converted all tabs to four spaces
14 years ago
Jan-Peter Nilsson
ba18dc46ef
Don't try to play random tunes when sound is disabled
14 years ago
Jan-Peter Nilsson
d38f2f0a00
See if we have an instance of mData before trying to use it otherwise we get a crash when starting with --nosound
14 years ago
Marc Zinnschlag
4a12be11bf
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
14 years ago
Star-Demon
fec90122c3
Added enumerated States to inputmanager to handle future standard actions.
14 years ago
Jason Hooks
f3ae1ea737
NPC leg appearance changed
14 years ago
Jason Hooks
ba168b22e9
cleanupandupdate
14 years ago
Jason Hooks
11406ae6f3
cleanupandupdate
14 years ago
Marc Zinnschlag
2ffe1206a6
merged opcode classes that came in explicit and implicit variants
14 years ago
Marc Zinnschlag
67a745cdf6
workaround for NPC activation crash
14 years ago
Marc Zinnschlag
2628b5143c
Merge remote branch 'jpn/dialouge'
14 years ago
Marc Zinnschlag
5336b90149
music player and NPC rendering branch
14 years ago
Marc Zinnschlag
e404d71e4f
fixes for class selection merge
14 years ago
Jason Hooks
60601682cd
Beast races fixed
14 years ago
Jason Hooks
1896a6a2e8
Preliminary npcs4
14 years ago
Jason Hooks
467988455c
Preliminary npcs3
14 years ago
Jason Hooks
dfe20033ea
Preliminary npcs2
14 years ago
Jason Hooks
6aaedff86a
Preliminary NPCs
14 years ago
Jason Hooks
a9892161af
MP3 functions moved to soundmanager
14 years ago
Jason Hooks
be1582a88f
Regional Sounds
14 years ago
Jason Hooks
a038c67e5a
Preliminary region sound framework2
14 years ago
Jason Hooks
cab2341259
Preliminary region sound framework
14 years ago
Jan-Peter Nilsson
d9d626cc95
Make DialogueWindow use the new WindowBase
14 years ago
Jan-Peter Nilsson
180164b2f3
Remove unnecessary includes
14 years ago
Jan-Peter Nilsson
770b490539
Make CreateClassDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
6fc0e4d6d6
Make DescriptionDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
12dee62307
Make SelectSkillDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
8f334d1df2
Make SelectAttributeDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
037c1021e3
Make SelectSpecializationDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
4e8f55b630
Make PickClassDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
ed05c5752b
Make GenerateClassResultDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
0d97200e18
Make InfoBoxDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
6c7f59725f
Make StatsWindow use the new WindowBase
14 years ago
Jan-Peter Nilsson
2e7e79f596
Make ReviewDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
5db021e99b
Make TextInputDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
e551c60e75
Make RaceDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
933af72d60
Make BirthDialog use the new WindowBase
14 years ago
Jan-Peter Nilsson
6bf10c93c8
Create a base class for dialog windows
14 years ago
Jan-Peter Nilsson
1ff81354eb
Remove unused variables
14 years ago