Marc Zinnschlag
|
5b6ec405e3
|
Merge branch 'script'
|
14 years ago |
|
Marc Zinnschlag
|
58cbdfd762
|
Merge branch 'journal'
|
14 years ago |
|
Marc Zinnschlag
|
8b9ee30924
|
user/global mixup
|
14 years ago |
|
Marc Zinnschlag
|
bdfd28f44d
|
adjusted components/files namespace; some related cleanup
|
14 years ago |
|
Marc Zinnschlag
|
7131c08ca4
|
moved path.hpp/path.cpp to a new component
|
14 years ago |
|
Marc Zinnschlag
|
125319c441
|
splitting off console output from messageBox channel
|
14 years ago |
|
Marc Zinnschlag
|
f52e6bd5ef
|
made toggle-type script instructions more verbose
|
14 years ago |
|
Marc Zinnschlag
|
e18dde4571
|
added topic tracking
|
14 years ago |
|
Marc Zinnschlag
|
7a1b215b6a
|
splitting of topic class from quest class
|
14 years ago |
|
Marc Zinnschlag
|
3406d2fa89
|
removed redundant data from quest class
|
14 years ago |
|
Marc Zinnschlag
|
944291d34f
|
added quest tracking to the journal
|
14 years ago |
|
Marc Zinnschlag
|
fc2d659925
|
Merge remote branch 'jpn/config' into config
|
14 years ago |
|
Marc Zinnschlag
|
65e43c448a
|
splitted StampedJournalEntry class off from JournalEntry
|
14 years ago |
|
Marc Zinnschlag
|
f4f12e885f
|
all program options (except help) can now be used from a cfg file
|
14 years ago |
|
Marc Zinnschlag
|
8915e8a751
|
change in multi_es branch broke fps switch; fixed now
|
14 years ago |
|
Marc Zinnschlag
|
9ea99a46ee
|
Merge branch 'multi_es'
|
14 years ago |
|
Marc Zinnschlag
|
f3fecdc627
|
quest entries are added to main journal now
|
14 years ago |
|
Marc Zinnschlag
|
792de880cf
|
another constness fix
|
14 years ago |
|
Marc Zinnschlag
|
717b5e1784
|
fixed a constness problem
|
14 years ago |
|
Marc Zinnschlag
|
23464e4035
|
added interface and container for main journal
|
14 years ago |
|
Marc Zinnschlag
|
5851e0a28c
|
added journal entry struct
|
14 years ago |
Jason Hooks
|
92509d3b70
|
Trying to animate creatures
|
14 years ago |
|
Jason Hooks
|
2ac1cc8aee
|
Trying to animate creatures
|
14 years ago |
Jan-Peter Nilsson
|
f2faa34bd9
|
If there is an openmw.cfg in the current path, use it as global config
|
14 years ago |
|
Marc Zinnschlag
|
53e0e38862
|
added missing TCL instruction
|
14 years ago |
|
Marc Zinnschlag
|
f321e549a4
|
added instruction GetPCCell
|
14 years ago |
|
Marc Zinnschlag
|
e4a0702bb4
|
added journal-related script instructions
|
14 years ago |
|
Marc Zinnschlag
|
b40117449a
|
added journal script interface
|
14 years ago |
|
Marc Zinnschlag
|
190f77f6c9
|
added journal class
|
14 years ago |
|
Jan-Peter Nilsson
|
dc4e6216c3
|
Initialize member variables in the same order they are defined to avoid compiler warning
|
14 years ago |
|
Jan-Peter Nilsson
|
a94de76801
|
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
|
14 years ago |
|
Jan-Peter Nilsson
|
2e2d490c78
|
Remove unused variable (compiler warning)
|
14 years ago |
|
Marc Zinnschlag
|
beb1422c77
|
allow multiple --master and --plugin command line arguments
|
14 years ago |
Pieter van der Kloet
|
833a61dd82
|
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
|
14 years ago |
|
Marc Zinnschlag
|
53e1d0e7e7
|
more cleanup
|
14 years ago |
|
Marc Zinnschlag
|
a70e582ae2
|
removed debugging leftovers from the tab_complition branch
|
14 years ago |
|
Marc Zinnschlag
|
c571148bef
|
Merge branch 'collision'
|
14 years ago |
|
Marc Zinnschlag
|
5661dc27c2
|
removed a leftover from physics debugging
|
14 years ago |
gugus
|
3ad2b9986e
|
fix actors not beeing deleted. Need the latest OEngine.
|
14 years ago |
|
Marc Zinnschlag
|
d7226fc9c2
|
Merge branch 'tab_completion'
|
14 years ago |
|
Marc Zinnschlag
|
7144657cfc
|
Merge branch 'script'
|
14 years ago |
|
gugus
|
773b7635a4
|
decrease the range of the raycast, and modifie the gravity/speed of the player.
|
14 years ago |
|
Marc Zinnschlag
|
0866e4d4fe
|
fix: NPCs were not added to physics system
|
14 years ago |
|
Marc Zinnschlag
|
9946bb36f7
|
Merge remote branch 'gus/collision' into collision
|
14 years ago |
|
gugus
|
7a28c9f3aa
|
fix the door bug
|
14 years ago |
|
Marc Zinnschlag
|
7653caea27
|
Merge branch 'master' into collision
Conflicts:
apps/openmw/mwclass/npc.cpp
|
14 years ago |
|
gugus
|
0cc94c81d4
|
Merge remote branch 'upstream/collision' into collision
|
14 years ago |
|
Marc Zinnschlag
|
7b5d24c853
|
fixed a bug in phyiscs update code
|
14 years ago |
|
gugus
|
3dddcbd958
|
fix a camera problem and increase player speed
|
14 years ago |
|
Marc Zinnschlag
|
91ea36509d
|
gus' fly mode fix; manually applied
|
14 years ago |
|
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 |