1b4cd787a5
Merge remote-tracking branch 'kcat/animation-state'
12 years ago
0cd4df3edf
Stop playing idles on death
12 years ago
e2e278d06d
Fix some animations not playing properly
...
Default movement animation speed multiplier should be 1, not 0. Only
randomize death1...death5 for NPCs.
12 years ago
dfe912dcab
Enum renaming
12 years ago
91e95e1404
Use the correct slash, chop or thrust animation
12 years ago
9043fe427f
Merge pull request #4 from scrawl/melee
...
Fixes weapon input to use A_Use instead of hardcoding to mouse button
12 years ago
9536b5050b
Fixes weapon input to use A_Use instead of hardcoding to mouse button
12 years ago
66e3eacace
fix bows
12 years ago
701ff94887
bugfix for lockpick
12 years ago
20341ae8b7
simplification + taking into account weapon speed. Seems too fast, but i'm not sure
12 years ago
8fc6e73649
post-merge fix
12 years ago
ee47e99dad
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
12 years ago
47f7bbd48a
fixed OpenCS crash during cell loading when loading multiple ESX files
12 years ago
f6e3445414
Jittering gone + bugfix: chop animation works!
...
TODO: fix this unequip stuff
12 years ago
e5e9c83ed5
Merge remote-tracking branch 'zini/master' into animation-state
12 years ago
a932a89e02
Specify the velocity-based animation speed multiplier when playing it
12 years ago
f296d13c20
Add a speed multiplier to the animation state
12 years ago
3a1facefdf
Store a pointer to the character controller for non-actor objects
12 years ago
06e631f213
Track death separately in the character controller
12 years ago
4ae65c20e6
Separate movement and idle states
...
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
12 years ago
94d45e1518
Fix twohanded weapons not unequipping when equipping a torch
12 years ago
daf9dca121
Fix exception when starting a new game
12 years ago
f7f23ac5d8
improvement of the chop animation. Still some jittering.
12 years ago
f7b711aabe
bugfix
12 years ago
076f98cbba
change way animations keys are handled (thanks KittyCat!)
12 years ago
fd9cc1c282
Merge remote-tracking branch 'vorenon/container'
12 years ago
a0022e711b
Merge remote-tracking branch 'scrawl/raycast'
12 years ago
66eb82b363
oops again
12 years ago
33779ae23c
oops
12 years ago
d4739a451a
added ability to close container windows with the activation key
12 years ago
c81b852071
Fixes inaccurate ray casts; rely on getCameraToViewportRay
12 years ago
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
12 years ago
1bc343f363
Merge remote-tracking branch 'kcat/first-person'
12 years ago
fa5198d7b2
Fix an assertion
12 years ago
61661c8653
Fix first person meshes casting shadows
12 years ago
a049638e7f
Fixes character previews getting shadowed randomly
12 years ago
6a5ab34971
Merge branch 'region'
12 years ago
3771e5839e
Allow some more third person fallbacks in first person
12 years ago
5ee889e8b6
Attach the camera to the Head node in first-person
12 years ago
3947f44aa3
Porting old work
12 years ago
2d7620e774
Rotate the neck when looking up and down in first-person
12 years ago
4cce466dc7
inverted region map y-axis
12 years ago
4df1f198a7
Avoid a map lookup for every skin body part when updating
12 years ago
6de56615aa
Avoid casting shadows in first-person view
12 years ago
025fa4e0d5
Use a multimap for the bodypart map
12 years ago
a5e4faaed2
Show arms and body parts in first person
...
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
12 years ago
908f010c74
Reset the NPC object root when switching POV
...
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
12 years ago
7883087586
Store a pointer to the character controller in the map
12 years ago
c26a6f884f
added region map tooltips
12 years ago
29b7734b52
add qualifiers for names in templates to make gcc 4.7+ happy
12 years ago
c808bf2b23
updating region map on changes to region and cell records
12 years ago
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
12 years ago
11178cc470
Repo permissions commit fix #3
12 years ago
bb049806df
Repo permissions commit fix #2
12 years ago
ae4e3181d9
Fixing repo permissions commit #1
12 years ago
bbb5d2b98a
Change tooltip positioning to resemble vanilla
12 years ago
d389b70ec4
added missing case folding
12 years ago
121978a69e
some cleanup; added handling of deleted cells (now displayed instead of ignored)
12 years ago
116320cc0d
dealing with invalid regions and cells without regions
12 years ago
6159724b04
build region map from records (only initial build; updates not implemented yet)
12 years ago
4f05f2bddf
basic region map; non-interactive for now and working with dummy data instead of real cell/region records
12 years ago
71a6955182
Merge remote-tracking branch 'scrawl/master'
12 years ago
91f6d87126
Fix an uninitialized variable
12 years ago
602e40e19d
Merge remote-tracking branch 'greye/coc'
12 years ago
e553f285b8
update player position on engine start
12 years ago
f3d54a7ba4
move finding default cell positions to World
12 years ago
0c303aa285
fix fading on cell transition when cell is loaded
12 years ago
6bb3942288
use Land height data for position in coc
12 years ago
a3094b808e
update coc behaviour for interior cells
12 years ago
744c5804ed
Simplified doors, now they will stop after hitting an obstacle instead of trying to back off.
12 years ago
de5898c953
post merge fixes
12 years ago
4986b7d65d
Merge branch 'master' into ref
12 years ago
1c4b70805b
added missing reference table columns
12 years ago
9a39f32c32
store ID of cell in reference struct
12 years ago
9a49125281
added references table
12 years ago
72600a16cf
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
12 years ago
58fce74620
Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders
12 years ago
5c8950f91c
Merge branch 'master' of git://github.com/zinnschlag/openmw
12 years ago
f9d7c7574e
Merge remote-tracking branch 'swick/scrollbar'
12 years ago
3dc42fb948
Merge remote-tracking branch 'greye/master'
12 years ago
76d95dffb6
special case for loading StartScript records
12 years ago
26bd2a5301
use the new scrollbar; range dependent step size; fix
12 years ago
b43f41c2bd
use a mygui controller for scrollbar repeat
12 years ago
e3d8bdbafe
autorepeat scrollbar
12 years ago
9f6d250463
QDebug reference removal
12 years ago
847ec9fa56
Merge remote-tracking branch 'swick/master'
12 years ago
8bdc9ff3ae
set position of the window for multiple monitors
12 years ago
55b115935a
Implemented RefRecordTypeDelegate
...
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
12 years ago
9d95a38934
Implementing delegate for referenceables table Type column
...
Added delegate skeleton class
Added delegate creation code in ViewManager
Added Display_RefRecordType enum to columnbase.hpp
Changed Type column'sDisplay type to Display_RefRecordType in
refidcollection.cpp
modified OpenCS CMakeLists.txt to incorporate RefRecordTypeDelegate
class
12 years ago
56637a39a3
Merge remote-tracking branch 'vheuken/master'
12 years ago
cd538538b5
fixed weather code
12 years ago
f43b48015e
remove actor's collisionbox on death
12 years ago
b095c24854
resize actor collision boxes on death
12 years ago
123a60581f
Only link to SDL2main on windows
12 years ago
e88040662e
Merge remote-tracking branch 'glorf/master'
12 years ago
afb120d5ce
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
12 years ago
6deddf7229
Fixed code conventions in user settings, changed top-level page names
12 years ago
88f8637145
Bugfix #795
12 years ago
5b81d124bb
Catched another exception
12 years ago
f4d302501e
Bugfix #826
12 years ago
623200b50e
Merge remote-tracking branch 'pakanek/libav_headers'
12 years ago
8ffea60b72
some cleanup
12 years ago
12cfe1fdfe
Merge remote-tracking branch 'graffy76/recordStatusDelegate'
12 years ago
743b3dec99
Correction of libavutil version
12 years ago
f0f895ad10
Fixed settings file error message
...
Errors only occur if both global and local settings files are not found.
All other file read errors fail silently.
12 years ago
0a2ed8b0d7
Make OpenMW able to initialize SDL in windows builds
12 years ago
d75391de8e
libav-9 - fix missing includes
...
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
12 years ago
05649a1654
Merge remote-tracking branch 'swick/master'
12 years ago
09cca0bf80
more detailed error message when SDL fails to initialize
12 years ago
99508a6eaa
minor cleanup
12 years ago
20e591fe18
use index instead of string manipulation
12 years ago
357974a429
more minor stuff
12 years ago
1f4d1d3b57
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
5803726233
modified gmst addition during creation of new base file
12 years ago
c97fac8116
use QMessageBox to show errors
12 years ago
89dee80dcf
simpler remove of duplicates
12 years ago
6abb5d5f75
small fixes
12 years ago
dbfc39468b
better workaround
12 years ago
0829548106
Merge remote-tracking branch 'swick/multimonitor'
...
Conflicts:
apps/launcher/graphicspage.cpp
12 years ago
6f7a7b4714
remove old code
12 years ago
bb39a85f16
remove double entries
12 years ago
14d074e3e7
select first screen if none is in the setting
12 years ago
a1fea97c3b
use SDL for resolution -> multimonitor support
12 years ago
16a27e28f7
inluded gmsts with default values to creation of new base files
12 years ago
d61c12ccfc
minor cleanup
12 years ago
d364fd8561
Merge branch 'master' of https://github.com/zinnschlag/openmw
12 years ago
0e29286856
fix custom resolution maximum
12 years ago
62e164b2aa
Fixed load file error if no file is found
12 years ago
a73b97d125
Fixed broken references and other bugs
...
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
12 years ago
f5ba2b37e7
Merge remote-tracking branch 'vorenon/fixes'
12 years ago
efdcd9649c
Fading for Exterior->Interior cell transitions
12 years ago
8b909ff838
killed a stray srand
12 years ago
b3d185e421
Unsaved changes missed in previous commits
12 years ago
f4a2cf64c2
Removed CSVSettings::SamplePage class files
12 years ago
101c147217
Final changes for record status icon feature, incl. window size user
...
preference
1. Included updated status icons, added base.png
2. Added doxygen comments CSV / CSM Settings classes
3. Implemented Glorf's code for window size preference
4. Minor changes code that searches maps in CSV / CSM Settings classes
5. Removed CSVSettings::SamplePage class
6. Other minor code maintenance / improvements
12 years ago
8da3494d74
Revert "Type of weather changed from string to enum."
...
This reverts commit 04d90b4c47
12 years ago
26a6bdb27d
Correction of sigsegv.
12 years ago
f9940413fd
Static for nextWeather()
12 years ago
bf31e5385c
Removal of duplicit exterior checking and unneded string copiing.
12 years ago
8a45686e0a
WeatherResult added as member variable.
12 years ago
f01aa8f55e
Simpler statistical calculation of next weather; minus before parens.
12 years ago
04d90b4c47
Type of weather changed from string to enum.
12 years ago
4e8e048968
Added missing click sounds to dialogue
12 years ago
94ec05c2c6
Revert "simplifying CSMWorld::CellRef"
...
With the refactored collection class we can now handle the more complex load function
This reverts commit 97f421df8a
12 years ago
9c6fa29938
Merge remote-tracking branch 'glorf/bugfix2'
12 years ago
09cc57381a
Bugfix #809
12 years ago
d26e721d10
no const for int and bool
12 years ago
9313b2b3fe
better const correctness for MwIniImporter
12 years ago
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
12 years ago
5b3d2f5da1
gave Collection class its own header file and removed an unsed cpp file
12 years ago
8f167a603c
split IdCollection into Collection and IdCollection class
12 years ago
4b2d920f9d
rewrote IdCollection::load (not using private members of IdCollection anymore)
12 years ago
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
12 years ago
2968b96882
added a bit more documentation
12 years ago
f4e7916ec4
moved IdCollection base into its own source file pair and renamed it to Collection
12 years ago
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
12 years ago
b5926257f5
Merge remote-tracking branch 'scrawl/sdl_input2'
12 years ago
b16bc69479
Removed the no longer needed --debug switch
12 years ago
57ce87bf12
Merge remote-tracking branch 'scrawl/sdl_input2'
12 years ago
4fd7891d2c
Fix a message box issue
12 years ago
76a2abcbe3
added missing line break in front of multiple choice questions
12 years ago
b16c92c2f5
Better handle SDL_TEXTINPUT events
12 years ago
ed6098388f
return false instead of std::exit
12 years ago
b97a051dc6
Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813
12 years ago
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
12 years ago
3e29506d5c
Merge remote-tracking branch 'vorenon/dialogue'
12 years ago
9ac4a9c5eb
Don't start OpenMW if no master file is selected. This fixes bug #813
12 years ago
4c0086b54c
Workaround for bug #820
12 years ago
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
12 years ago
5252ffa104
More cleanup
12 years ago
289587b1a9
Cleanup
12 years ago
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
12 years ago
700d55f1fb
Fixed / implemented missing features for RecordStatusDelegate
...
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table
12 years ago
9331a6380c
Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2
12 years ago
4fb32f7f05
Moved window resize messages to sdlinputwrapper
12 years ago
9807eacb58
Removed obsolete OIS workaround
12 years ago
5984a15846
We don't need Carbon on OS X anymore
12 years ago
e5ddaaf676
Fix wrong indenting from my last commits.
12 years ago
df016778be
Merge remote-tracking branch 'rohitnirmal/journal-open-sound'
12 years ago
0880805559
Minor cleanup
12 years ago
9d4ecc3e73
replace tabs with spaces.
12 years ago
aac3ada14b
Use mousewheel to turn book pages.
12 years ago
fcf35d3871
Removed the UI cursor sensitivity slider
12 years ago
ab3634d692
Removed some remains of OIS
12 years ago
14a2a26a56
Fullscreen resizing fix
12 years ago
403704b92a
Use openmw.png for SDL_SetWindowIcon
12 years ago
705488ddfb
Fix mouse movement events being discarded when there's more than one event in a frame
12 years ago
cc077eaba6
Fix mouse wheel triggering a click event in mygui
12 years ago
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
12 years ago
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
12 years ago
df1f1bd5c8
Merge remote-tracking branch 'glorf/cs-windows'
12 years ago
548f4d683f
Globalization of user settings
12 years ago
bd08677a7f
Merge branch 'openmw24'
12 years ago
c891e529f3
Merge remote-tracking branch 'rohitnirmal/launcher-fix-rohit'
12 years ago
2fd4d71774
trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.
12 years ago
fc0f04324c
Remove some superfluous mSkyManager NULL checks
12 years ago
fb462f1b1a
launcher: Throw error if no data files are selected
12 years ago
fd25616cab
launcher: Properly quit if settings write fails.
12 years ago
fdeac21f22
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound
12 years ago
b5caa25e5c
Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu.
12 years ago
98e5cb6d7b
Added ifdef to keep backward compatibility with the FFmpeg library.
12 years ago
4eede86ce6
Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal.
12 years ago
a3b2a76e60
Added virtual destructors to classes LocalMapBase and EffectEditorBase.
12 years ago
10165d3c6b
Feature #468
12 years ago
97f421df8a
simplifying CSMWorld::CellRef
12 years ago
1e60ad3cd6
Promoted references to a top level record internally.
...
Note: This does not change the structure of the ESX format.
12 years ago
48496a644f
Merge remote-tracking branch 'scrawl/master'
12 years ago
daab4f55a3
Use Morrowind's fonts
12 years ago
b3595a6a2e
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
12 years ago
f586eef604
Merge remote-tracking branch 'torben/pathfindingoverhaul'
12 years ago
09beafd044
Pathfinding Overhaul - Master cleanup! Cleaned pathfinding entirely, all AI packages that are implemented as well, Increased buffer! This makes the intro guard no longer walk into you or go to far into the room (not tested against vanilla distances but it seems accurate enough until the next itteration of pathfinding fixes).
12 years ago
a4caec56cf
Pathfinding Overhaul - Fixed selecting cells that are inaccessable from AIWander and pathfinding in general (sadly requires minor effort on the AI Packages implementation but it is the quickest way I can see), minor cleanup again (there is a lot to cleanup, this will prolly be in every commit).
12 years ago
8bd712cc95
Fix being able to move slowly when over encumbered
12 years ago
73a9671742
Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes.
12 years ago
1d93cf09bc
Cell formatting and code optimization changes
12 years ago
c080785235
Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!).
12 years ago
7b465ae4f1
Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM.
12 years ago
96fdaf7410
Pathfinding Overhaul - More cleanup.
12 years ago
4838678944
Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding.
12 years ago
35fb9b669a
Final details implemented
...
Png icons, alignments fixed.
12 years ago
dc17fa1636
Removal of duplicit enumeration and unnecessary conditions.
12 years ago
bbec3680c6
Merge remote-tracking branch 'pakanek/enchanting-mechanics'
12 years ago
6e7416d8c5
Merge remote-tracking branch 'scrawl/master'
12 years ago
9a43927078
Fix weapons not appearing in Enchantable filter
12 years ago
7a4a386cbe
Removal of tab characters.
12 years ago
dbbc96f600
AIWander Segmentation Fault Fix - Fixes the segmentation fault that used to occur when there was no pathgrid in the cell and a range was passed to AIWander.
12 years ago
b40e24c50c
Refactorization
12 years ago
4e17bc1499
Fix for display of cast cost decimal value
12 years ago
7927ac818c
Merge remote-tracking branch 'torben/aiwanderpatchpotential'
12 years ago
9a9b075a02
Correct cast cost for enchantments.
12 years ago
ebc1fdd017
AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens.
12 years ago
0c7f48ec8a
Implement movement for creatures (formula is a stub)
12 years ago
1c7b94e94f
Switching in nextCastStyle() is now based on enum CastingStyle.
12 years ago
252a1d9223
Replacement of some magical constants
12 years ago
9e1eb8b3b1
Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics
12 years ago
4788b5e226
Better formula for enchantment cost and code refactorization.
12 years ago
56edc1b213
Correction of getting spell range "Target".
12 years ago
bd6d54cc8f
AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still.
12 years ago
86dd6d0847
Merge remote-tracking branch 'eroen/libcxx'
12 years ago
fa63ebce78
Merge remote-tracking branch 'scrawl/master'
12 years ago
bd8344b387
Merge remote-tracking branch 'torben/aiwander'
12 years ago
3b43ee751e
AI Execute Fix - May as well not create the object either to save extra time.
12 years ago
feb180724c
AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior.
12 years ago
3a6e54c4f5
Sell owned items in the cell
12 years ago
fd96d47fe4
AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research.
12 years ago
96daad7a22
AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value."
12 years ago
e37324b967
AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm.
12 years ago
2850032d9e
libc++ fixes: avcodec/avformat workaround
...
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.
Moving the string inclusion after that eyesore shouldn't break anything.
12 years ago
5fac75845c
Merge remote-tracking branch 'torben/aiescortclean'
12 years ago
ddf28ca201
AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem.
12 years ago
Marc Zinnschlag
Chris Robinson
scrawl
gugus
vorenon
greye
graffy76
Sebastian Wick
Vincent Heuken
Glorf
Miroslav Puda
Alexander "Ace" Olofsson
eroen
mckibbenta
Thoronador
darkf
Nikolay Kasyanov
Rohit Nirmal
fstp
pvdk
Torben Carrington