scrawl
f8a18d58a6
re-use the texture across preview instances
12 years ago
scrawl
dd5c083124
fix the race selection escape crash
12 years ago
greye
1339787863
remove underscores from filenames in esm
12 years ago
scrawl
1cb1259e18
fixing some unrelated warnings
12 years ago
greye
807a56c9e4
fix dynamic potion id
12 years ago
scrawl
9d7c35ae48
and go
12 years ago
scrawl
b4db339fd5
everything uses find now
12 years ago
scrawl
9f2668b45b
Task #400 Review GMST access
12 years ago
scrawl
f45a6b71a9
Merge branch 'master' into next
12 years ago
scrawl
b471bef92a
Merge branch 'master' into next
12 years ago
Marc Zinnschlag
39e21a6103
Merge remote-tracking branch 'scrawl/globalmap' into next
12 years ago
scrawl
78b2d51cfc
fix a map crash
12 years ago
Marc Zinnschlag
8da00caaa4
Merge remote-tracking branch 'scrawl/globalmap' into next
12 years ago
scrawl
47d9fae89f
don't use cache
12 years ago
Marc Zinnschlag
3560690660
Merge remote-tracking branch 'scrawl/sleep_wait' into next
12 years ago
scrawl
b91d74d394
fix normalized encumbrance
12 years ago
scrawl
872fcf3e3d
sleeping restoration of health, magicka, and fatigue
12 years ago
Marc Zinnschlag
28e2430f3a
Merge remote-tracking branch 'scrawl/master'
12 years ago
scrawl
f49401bb53
center map on the player, dynamic map size
12 years ago
scrawl
1d012d1680
don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.
12 years ago
scrawl
9106e5307c
moved global map from RenderingManager to gui and removed world method
12 years ago
greye
18cc435aa1
resolving conflicts
12 years ago
greye
2d5ddd104b
Land::loadData rework
12 years ago
greye
e69880f77e
almost perfect byte copies, has redundant data
12 years ago
scrawl
a161b34c67
remove useless member, fix map rendering crash
12 years ago
scrawl
98c1dc1151
ShowMap & FillMap commands, merged next
12 years ago
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
12 years ago
scrawl
451a9fd6ac
don't update world arrow position in interior
12 years ago
scrawl
e5e3d829d0
player arrow & markers
12 years ago
scrawl
5f014f7411
oops, left in a testing assertion
12 years ago
scrawl
86cfc91ef3
global map rendering
12 years ago
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
12 years ago
scrawl
b9a3f8e8d7
gamma slider
12 years ago
scrawl
d9f6072f02
gamma correct rendering & adjustment setting
12 years ago
Marc Zinnschlag
ede9a2b170
fixed an orientation problem
12 years ago
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
12 years ago
Marc Zinnschlag
a3c680d20a
Merge remote-tracking branch 'scrawl/sleep_wait' into next
12 years ago
scrawl
be44810623
implemented GetPCSleep
12 years ago
scrawl
bf5e30b24f
everything done except health/mana restore
12 years ago
scrawl
ab698bb401
date time label
12 years ago
scrawl
4d4ba6698a
fix character preview destruction; don't allow empty names in name dialog
12 years ago
scrawl
0ba996f290
dialog layout
12 years ago
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
Marc Zinnschlag
fcda3b6ca8
fixed some script argument types
12 years ago
Marc Zinnschlag
ea8eab4f34
more cleanup
12 years ago
Marc Zinnschlag
408c5b8bd4
some cleanup
12 years ago
Marc Zinnschlag
4469976be9
Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
gugus
3c1a9061de
Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly
12 years ago
gugus
032ff7c879
Clean-up. There is still a little bug.
12 years ago
greye
7606ebafd6
resolving conflicts, minor update
12 years ago
Jason Hooks
192d634098
Movement keys; View angles
12 years ago
Marc Zinnschlag
2bb400eaa8
Merge remote-tracking branch 'pvdk/datalocalfix'
12 years ago
Marc Zinnschlag
b041a511b6
Merge remote-tracking branch 'mmd/windowswarnings'
12 years ago
Jason Hooks
76f2a82884
More pmove stuff; Turned off broadphase, we could not fall in exteriors
12 years ago
Pieter van der Kloet
4bcc34f4f9
Re-enabled and fixed multiple data directory handling in the launcher
12 years ago
Pieter van der Kloet
97326ffdbf
Fixed data-local directory handling in the launcher
12 years ago
Jason Hooks
f586f53a42
positioning
12 years ago
scrawl
896428c129
enableRestMenu & enableLevelupMenu
12 years ago
scrawl
9cf1cbc89b
remove book skill gain
12 years ago
scrawl
3e5ab069a6
remove the const cast
12 years ago
Jason Hooks
02bca98e9f
Setrotate working
12 years ago
scrawl
cf358fa79d
>= instead of ==
12 years ago
scrawl
0dc242c603
don't increase skill beyond 100
12 years ago
scrawl
f5237ff1a6
skill gain from books
12 years ago
scrawl
234f8fa5d5
added the missing sound & notification for skill increase
12 years ago
scrawl
b34b894d6a
removed some debug stuff
12 years ago
scrawl
76b494100e
finished?
12 years ago
scrawl
95f3a20e2c
Merge branch 'master' into levelup
12 years ago
scrawl
3e794a6087
remove useless member and removed a warning
12 years ago
scrawl
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
12 years ago
Marc Zinnschlag
b7c9285b24
added support for out of world rendering
12 years ago
scrawl
b76a28f69c
beginnings of the gui
12 years ago
scrawl
35f7216f2f
fixed some things
12 years ago
scrawl
7c59b83419
performance optimization
12 years ago
scrawl
a308d2e38a
fixed exception, fixed armor label obscuring the items
12 years ago
scrawl
1f7e044fad
removed some debug stuff
12 years ago
scrawl
6ac2a12296
item selection working on the preview
12 years ago
scrawl
eef750e6b0
race selection preview
12 years ago
scrawl
5155339cb6
character preview working
12 years ago
scrawl
d90af9c524
Merge branch 'master' into characterpreview
12 years ago
Marc Zinnschlag
835c530e06
Merge branch 'ingredients'
12 years ago
Marc Zinnschlag
5706caa141
Issue #356 : added ingredient eating sound effect
12 years ago
Marc Zinnschlag
fe68a252d5
Issue #356 : Implemented ingredient eating
12 years ago
Marc Zinnschlag
2ccd7a480d
Issue #356 : added a missing return
12 years ago
scrawl
7ad80e306b
fixed the disappearing
12 years ago
Marc Zinnschlag
9de7b3bf90
Issue #356 : Properly support ingredients effect in ActiveSpells (hopefully)
12 years ago
Marc Zinnschlag
0af0dc0d5d
Issue #356 : More CreatureStats cleanup
12 years ago
Marc Zinnschlag
2934987f78
Issue #356 : Some CreatureStats cleanup
12 years ago
Marc Zinnschlag
9dcf8939e9
Issue #356 : added function for fatigue term calculation
12 years ago
Marc Zinnschlag
fca3b67507
Issue #356 : basic support for ingredients in ActiveSpells (still using the wrong formula)
12 years ago
scrawl
4f3eb3c34a
character preview WIP
12 years ago
Jason Hooks
a1a7733730
Set scale implemented
12 years ago
scrawl
2f0b47fc38
test
12 years ago
scrawl
a96ed6ac61
splash screens on startup
12 years ago
scrawl
c3966a7c5a
oops, I used a float texture for water reflection. this change should give a little performance boost.
12 years ago
Marc Zinnschlag
e9e30c0fce
fixed a memory leak
12 years ago
scrawl
a8d9aa98b1
some fixes
12 years ago
scrawl
d5a08e31e7
scene does not disappear anymore during load
12 years ago
scrawl
369db182de
actual progress bar, performance optimization
12 years ago
scrawl
2b339f6c0f
loading screen
12 years ago
Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
12 years ago
scrawl
4977c33e4c
fixed a stats window resizing problem that I introduced today
12 years ago
Marc Zinnschlag
6c03d7aec4
documentation fix
12 years ago
scrawl
9448ce5968
implemented "get<Control>Disabled" functions
12 years ago
scrawl
89ad2af1d9
key usage to open doors or containers
...
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
12 years ago
scrawl
fdc2a7433c
remove the wrong container open sound
12 years ago
scrawl
d581ac426e
useless cout message
12 years ago
scrawl
996e6280d8
more spell buying window cleanup
12 years ago
scrawl
ba0acd4056
changed some text colors
12 years ago
scrawl
fde69d0c87
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
12 years ago
scrawl
bc6a1979b0
replaced everything with the new method
12 years ago
Marc Zinnschlag
61c8a627aa
added a missing include
12 years ago
Marc Zinnschlag
273ac0a97f
Merge branch 'spellbuying'
12 years ago
Marc Zinnschlag
f17756712a
fixed spell list handling
12 years ago
Marc Zinnschlag
6c928e93d3
added missing initialisation of NPC/creature spell lists from ESX records
12 years ago
scrawl
b66c8099eb
new system for dynamic sizing of buttons & text boxes
12 years ago
scrawl
35dd49f948
fixed some "using namespace" in headers
12 years ago
scrawl
56061474c4
another 3 unnecessary lines
12 years ago
scrawl
bb267dddf6
some stats window cleanup
12 years ago
scrawl
432c089434
fix the spell tooltips to show the spell target
12 years ago
Marc Zinnschlag
bcf3a81a6c
and a tiny bit more of cleanup
12 years ago
Marc Zinnschlag
9c49ca1468
a bit more random cleanup
12 years ago
Marc Zinnschlag
06677a0fc8
fixed ID handling and some misc cleanup
12 years ago
Marc Zinnschlag
3fad1c0786
fixed a crash
12 years ago
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
12 years ago
Adam Hogan
562df5388f
Merge branch 'master' of git://github.com/zinnschlag/openmw
12 years ago
Adam Hogan
ebf80943a9
Added spell buying window
12 years ago
Lukasz Gromanowski
99c46093dd
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
12 years ago
Jason Hooks
23777033fd
Starting to implement new PhysicActor
13 years ago
Marc Zinnschlag
0879abb948
Merge branch 'actiontarget'
13 years ago
Marc Zinnschlag
da041f902f
Issue #370 : fixed item taking sound
13 years ago
Marc Zinnschlag
482874f99e
Merge remote-tracking branch 'scrawl/cache'
13 years ago
Marc Zinnschlag
6813bafbfc
added missing sound effect for chest opening; minor cleanup
13 years ago
Marc Zinnschlag
fb8aae243d
Issue #370 : replaced custom target handling in talk action with base class implementation
13 years ago
Marc Zinnschlag
8ed8dd649a
Issue #370 : replaced custom target handling in take action with base class implementation
13 years ago
Marc Zinnschlag
ea1c3fe1e4
Issue #370 : replaced custom target handling in open action with base class implementation
13 years ago
Marc Zinnschlag
8c2b4f996c
Issue #370 : replaced custom target handling in equip action with base class implementation
13 years ago
Marc Zinnschlag
b51c42146f
Issue #370 : replaced custom target handling in read action with base class implementation
13 years ago
Marc Zinnschlag
3f181f9a9d
Issue #370 : Support for targets in containers
13 years ago
Marc Zinnschlag
cc55056adf
Issue #370 : replaced custom target handling in apply action with base class implementation
13 years ago
Marc Zinnschlag
733654d730
Issue #370 : implemented target handling in action base class
13 years ago
Marc Zinnschlag
1cecab6e3d
fixed RefData::getHandle
13 years ago
Marc Zinnschlag
ead04e1cc3
Issue #389 : added AI sequence to CreatureStats; execute AI packages during the regular actor update
13 years ago
Marc Zinnschlag
345eec1135
Issue #389 : added AI package base class and AI packages management class
13 years ago
Marc Zinnschlag
ef6f033dd1
Merge branch 'multidata'
13 years ago
Marc Zinnschlag
2284d76307
re-enabled local data directory support in launcher
13 years ago
Jason Hooks
2efceba1fc
Tearing apart PhysicActor
13 years ago
gugus
d261263824
oups forgot vmformat
13 years ago
scrawl
c27ff546e4
shader cache
13 years ago
gugus
95c27723f7
fixed a bug (see commit reverted)
13 years ago
gugus
99885e8ca4
Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p"
...
This reverts commit 165065d378
.
13 years ago
gugus
fa9f2b268b
PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe
13 years ago
scrawl
950bf66334
throw an exception if default value for a setting is not found
13 years ago
Jason Hooks
0697c7f7f4
Finally merged in master
13 years ago
Marc Zinnschlag
e2bf4694cb
Merge remote-tracking branch 'scrawl/master'
13 years ago
scrawl
760f05c454
the HUD can be toggled with F12 key; useful for screenshots
13 years ago
Marc Zinnschlag
bc34fab17f
Merge remote-tracking branch 'greye/aidata'
13 years ago
Michael Mc Donnell
3c3737ed78
Write error message for exception and fix warning
...
Provides details of what went wrong when reading the .esp and also fixes a warning on vs2010.
13 years ago
greye
a90547bbbe
code formatting
13 years ago
Marc Zinnschlag
81463fa23d
Issue #372 : fixed positions in SoundManager
13 years ago
scrawl
6ad08dfd33
added settings for crosshair & subtitles
13 years ago
Artem Kotsynyak
e9b2f4ee74
fix equipment visibility update
13 years ago
scrawl
1c5055c8ac
fix a problem where hovering a marker would render it on top of the fog of war instead of below
13 years ago
scrawl
7eaf5e7f0f
changed the markers to look more like morrowind's (hover effect)
13 years ago
scrawl
d9276ca09d
don't make copy of CellRefList in World::getNorthVector
13 years ago
scrawl
3c39c47e2f
don't make copies of CellRefList & LiveCellRef
13 years ago
scrawl
571d5095d4
removed a cout
13 years ago
scrawl
5834b4baa5
door markers on the local map
13 years ago
Marc Zinnschlag
40d4dad15e
Issue #378 : Fix (record wasn't build fully)
13 years ago
Marc Zinnschlag
160b52162b
Merge remote-tracking branch 'scrawl/quick_keys'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
13 years ago
scrawl
321f7c3419
fix an infinite recursion regression on several dialogs.
13 years ago
scrawl
5c28a67203
broke something in the last commit.
13 years ago
scrawl
4f19b7fb9b
fix leaks.
13 years ago
scrawl
bc36b0e2bd
remove the restriction on the last quick key
13 years ago
scrawl
6161f81c24
last bits of the quick key menu.
13 years ago
Marc Zinnschlag
14b4263143
Merge remote-tracking branch 'scrawl/alttab'
13 years ago
scrawl
dc8f9bd923
workaround for alt tab view mode toggle
13 years ago
scrawl
9af0b48ad6
show/hide crosshair correctly
13 years ago
scrawl
a4c1d979d6
Merge branch 'master' into quick_keys
13 years ago
scrawl
c5e55d3cac
fix screenshot function
13 years ago
greye
61923349e5
resolving conflicts
13 years ago
scrawl
5ebcaeb098
Merge branch 'next' into quick_keys
13 years ago
scrawl
b1a394552d
mouse click sounds
13 years ago
Marc Zinnschlag
d0cebea580
some cleanup
13 years ago
Marc Zinnschlag
450656a890
Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next
13 years ago
Marc Zinnschlag
ef4910293b
Merge remote-tracking branch 'corristo/osx_f_keys_fix' into next
13 years ago
Douglas Diniz
5cbb08fee1
Task 339 - Moving all sounds to actions
13 years ago
scrawl
c0f27bd5ef
magic selection window
13 years ago
scrawl
fab4cfecb1
some unfinished work on quick keys window
13 years ago
Marc Zinnschlag
1fd4d84173
Merge remote-tracking branch 'mmd/windowswarnings' into next
13 years ago
gugus
165065d378
fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p
13 years ago
Nikolay Kasyanov
71a6ce2202
removed cout spam
13 years ago
Nikolay Kasyanov
5395721c26
more appropriate fix for #189
13 years ago
Douglas Diniz
82e7c04c0a
Changing sounds to Action.
...
Adding onActor to Action to choose between playSound and playSound3D.
13 years ago
Lukasz Gromanowski
770f747eec
Added fix for not visible pthreads functions for linker with glibc 2.15
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
scrawl
f7d537cb28
very small correction
13 years ago
scrawl
19ae30ee68
Merge branch 'master' into next
...
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
13 years ago
Lukasz Gromanowski
34513cf16b
Added support for code coverage checking and unittests.
...
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
13 years ago
greye
e6c3e0744e
tvm update and fix
13 years ago
greye
5b2b378f25
tvm script instruction
13 years ago
Marc Zinnschlag
d1656b2f5d
Merge remote-tracking branch 'greye/player_control'
...
Conflicts:
apps/openmw/mwrender/player.cpp
13 years ago
gugus
cc01a5ceed
Merge branch 'next' of https://github.com/zinnschlag/openmw.git into object_movement_creation
13 years ago
gugus
f2d080d091
bugfix
13 years ago
greye
b8e56d61d3
update camera code, add idle time
13 years ago
greye
3f3972eb3b
no vanity in gui mode (thanks scrawl)
13 years ago
greye
d2b451eb7d
entering vanity mode
13 years ago
greye
b6954a4e8d
use the same height on non-1st person modes
13 years ago
scrawl
8817a9634c
don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)
13 years ago
Marc Zinnschlag
1da56e2832
removed some unused variables
13 years ago
greye
14f293882c
still resolving
13 years ago
greye
83356d5505
resolving conflicts
13 years ago
greye
7303d595dd
resolving conflicts
13 years ago
greye
4f10138a04
using real player sight angles on ray cast
13 years ago
greye
0e6e141fd4
camera control related script instructions
13 years ago
greye
60fb1e8df6
fix sky in preview mode movement
13 years ago
greye
6961830efb
using real player eye direction when moving
13 years ago
greye
e8fc942bef
reverse Z-axis rotation to make doors happy
13 years ago
greye
a453a7f035
camera adjustment, fix view mode on start
13 years ago
scrawl
34f796c38e
removed the far clip distance hack which is not needed anymore
13 years ago
scrawl
b97b3d7b71
fix sky position when reflection is enabled, fix delay in sky reflection
13 years ago
greye
575244bd35
fix SkaManager issue
13 years ago
greye
783e81afc3
fix 1st/preview/1st change; 1st invisible model
13 years ago
greye
392e6efcb5
initial player rendering
13 years ago
greye
6f87c0c36d
preview mode, advanced vanity support
13 years ago
greye
fe1a9ac3c5
poor camera with some fixes
13 years ago
greye
db94018865
far better camera movement
13 years ago
greye
a7aeda9a3b
initial vanity mode support
13 years ago
greye
c46eeaa100
initial 3d-person camera support
13 years ago
Jason Hooks
63a40e9ba3
npc xy disabled
13 years ago
Marc Zinnschlag
e97d23e626
Issue #361 : reset skill level in race selection stage
13 years ago
scrawl
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
Marc Zinnschlag
b0506e2220
re-enabling support for multiple data directories
13 years ago
Jason Hooks
8762f4a47a
boxrotation nif field; commented functions
13 years ago
Jason Hooks
7b8b4c366d
Set angle now working for npcs and creatures
13 years ago
Jason Hooks
1f5bc229e0
Separate adjustRigidBody function
13 years ago
scrawl
f9efd543e4
use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1
13 years ago
Michael Mc Donnell
b373d0ec7b
Correct struct to class in forward declarations
...
Fixes http://bugs.openmw.org/issues/362
13 years ago
scrawl
67577c6192
UI cursor & camera sensitivity sliders
13 years ago
scrawl
c7b8787c32
"reset to defaults" button, invert y axis button
13 years ago
scrawl
bc6e4feedc
hotkey window first version
13 years ago
scrawl
c4fe2e4e2a
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
13 years ago
scrawl
976ad7a301
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
13 years ago
scrawl
90f1d9c2f2
OSX suggestion by corristo
13 years ago
scrawl
97c45455fd
fix WindowManager destruction
13 years ago
scrawl
86d6f190bf
Input system rewrite
13 years ago
Marc Zinnschlag
c4bf6214db
Merge remote branch 'scrawl/master'
13 years ago
Marc Zinnschlag
88e70cb5bd
Merge branch 'decouple'
13 years ago
Marc Zinnschlag
6534c2a55a
Issue #107 : WindowManager is accessed only through the interface class from now on
13 years ago
scrawl
b6f427bf5e
fix OpenMW not exiting when the window is closed (alt f4 etc)
13 years ago
Marc Zinnschlag
35a64edf2a
Issue #107 : removed a template from the window manager
13 years ago