teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
7,528 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ae183cb3e4'
${ noResults }
Commit Graph

5404 Commits (ae183cb3e4808834c5a5704ee7f24103aa14f06a)

Author SHA1 Message Date
Marc Zinnschlag ed83e2e70a added creator to bottom box; more cleanup 12 years ago
Marc Zinnschlag 6c4bdc0101 minor cleanup; less pointer usage 12 years ago
Marc Zinnschlag ba5ca5beed replaced createAndDelete flag with a new class hierarhy (Creator) 12 years ago
Emanuel Guevel aa14656ff2 esmtool: fix swapped comparison operators 12 years ago
Marc Zinnschlag 3fbbbdc64b Merge remote-tracking branch 'scrawl/master' 12 years ago
Chris Robinson a569ae367e Fix hit chance calculation 12 years ago
Chris Robinson 6195062d72 Try to figure out what gets hit 
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
 12 years ago
Chris Robinson b3a057d679 Handle hit chance and damage calculation 
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
 12 years ago
Marc Zinnschlag 4327b81bc3 fixed column handling in table (had problems with filtered out columns before) 12 years ago
Marc Zinnschlag 55e7e71c11 added optional per-subview status bar 12 years ago
Chris Robinson 1dcc893703 Merge remote-tracking branch 'zini/master' into combat 12 years ago
Chris Robinson 4ad28ed369 Don't play a weapon-down sound when unreadying a spell 12 years ago
Chris Robinson 92cc566fdc Rename the Class::attack method to Class::hit 12 years ago
Chris Robinson 0db02af807 Set up the weapon state in the CharacterController constructor 12 years ago
Chris Robinson d9a9c3d6bd Handle the "land" soundgen type 12 years ago
Chris Robinson 705498ec24 Play a swish sound when attacking 12 years ago
Chris Robinson d8ec813939 Say something from the "hit" dialog topic when losing health 12 years ago
Chris Robinson 59f1bc7542 Use time values for the aniamtion's start, stop, and loop points 
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
 12 years ago
Chris Robinson bf1d907d07 Don't play casting animations for enchantments 12 years ago
Chris Robinson cc8e8c1272 Use the attack strength as determined by how long the attack was held 12 years ago
Chris Robinson 0c8d4d9be2 Add beginnings of melee hits 12 years ago
Chris Robinson 45302f9e25 Handle controllers in the NPC's bound object parts 12 years ago
Marc Zinnschlag a80e80dd94 added layout to table sub view 12 years ago
Chris Robinson 11b094559f Play the appropriate casting animation sound 12 years ago
Emanuel Guevel 70a5a83419 Change the formula used to calculate initial NPC health 12 years ago
Chris Robinson 17282c69b1 Handle spell-casting animation sequences 12 years ago
Chris Robinson 4d157cb19a Handle marksmen weapon attack sequences 12 years ago
Chris Robinson fecb8c1cc4 Fix the completion amount for 0-length anims 12 years ago
Chris Robinson d5d832846e Rename the follow-up upper character state enum 12 years ago
Chris Robinson 537d5c4934 Avoid trying to play animations without any animation sources 12 years ago
Chris Robinson ad6d663e09 Remove some unnecessary debug messages 12 years ago
Chris Robinson 24567294ff Move NPC state update handling into a separate method 12 years ago
Chris Robinson 22e07968af Store the current weapon group name 12 years ago
Chris Robinson 0240efa6cf Improve weapon attack logic to better handle picks, probes, and h2h 12 years ago
Chris Robinson ef17fdeb15 Remove some unused methods 12 years ago
Marc Zinnschlag ec575200e3 Merge remote-tracking branch 'gus/MeleeCombat2' 
Conflicts:
	apps/openmw/mwrender/animation.cpp
 12 years ago
Marc Zinnschlag 66534a45da replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality 12 years ago
Emanuel Guevel 48f0e64ec3 Fix health calculation at character creation 12 years ago
Emanuel Guevel 1c330fc899 Use the correct formula for NPC health initialization 12 years ago
Emanuel Guevel 2356e6218e Complete health increase on level up 12 years ago
Emanuel Guevel 2a0644a7c3 Move some levelup logic from mwgui to mwmechanics 12 years ago
Emanuel Guevel 7837dcdc19 Calculate NPC health on loading instead of updating it continually 
Only NPC with auto-calculated stats are concerned.
 12 years ago
Emanuel Guevel 074e241c32 MWMechanics::DynamicStat: fix members initialization 12 years ago
Marc Zinnschlag a8168c58c2 Merge remote-tracking branch 'kolek/thirdpersonzoom' 12 years ago
Kolzi d12bac2d9e Third person zoom - fixed code review issues. 12 years ago
Marc Zinnschlag 0fad2e7f40 restructured main menu 12 years ago
Marc Zinnschlag 2497c18702 replaced settings change notifications for columns with a more robust implementation 12 years ago
Kolzi 1b7966ca27 Can zoom in and out in third person view. 12 years ago
Chris Robinson 0cb7d186e7 Use Play_TypeFoot for 'left' and 'right' soundgen keys 12 years ago
Chris Robinson 14e0c182f3 Allow specifying the sound type to playSound and playSound3D 12 years ago
Chris Robinson ac4dfd3b39 Play the appropriate foot sound based on footwear 12 years ago
scrawl bf332b633e Make VideoPlayer::playVideo block until the video finishes 12 years ago
Marc Zinnschlag 365ea11e86 Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 12 years ago
Marc Zinnschlag fdd47e5b73 silenced a warning 12 years ago
graffy76 0ae254f6a8 Fixed segfault opening tables 12 years ago
Chris Robinson 9c13568bb7 Remove idles from the state list and rename it 12 years ago
Chris Robinson e803cdbe7f Handle swimdeath and missing death animations 12 years ago
Chris Robinson f01b0b48cc Don't start with an idle state if dead 12 years ago
Chris Robinson e78bdd2a5d Clear 'swim' from the animation name as a backup instead of 'sneak' 12 years ago
Chris Robinson 9ea6b22a83 Handle soundgen animation keys 12 years ago
Chris Robinson d6324d71bf Ensure mechanics actors/objects are cleared before adding them 12 years ago
Chris Robinson c7692acb79 Update the player's Ptr in mwrender when changing cells 12 years ago
graffy76 6486f342b5 Fixed setting synchronization issue 
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
 12 years ago
Marc Zinnschlag 1b4cd787a5 Merge remote-tracking branch 'kcat/animation-state' 12 years ago
Chris Robinson 0cd4df3edf Stop playing idles on death 12 years ago
Chris Robinson 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
scrawl dfe912dcab Enum renaming 12 years ago
scrawl 91e95e1404 Use the correct slash, chop or thrust animation 12 years ago
gugus 9043fe427f Merge pull request #4 from scrawl/melee 
Fixes weapon input to use A_Use instead of hardcoding to mouse button
 12 years ago
scrawl 9536b5050b Fixes weapon input to use A_Use instead of hardcoding to mouse button 12 years ago
gus 66e3eacace fix bows 12 years ago
gus 701ff94887 bugfix for lockpick 12 years ago
gus 20341ae8b7 simplification + taking into account weapon speed. Seems too fast, but i'm not sure 12 years ago
gus 8fc6e73649 post-merge fix 12 years ago
gus 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
Marc Zinnschlag 47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 12 years ago
gus f6e3445414 Jittering gone + bugfix: chop animation works! 
TODO: fix this unequip stuff
 12 years ago
Chris Robinson e5e9c83ed5 Merge remote-tracking branch 'zini/master' into animation-state 12 years ago
Chris Robinson a932a89e02 Specify the velocity-based animation speed multiplier when playing it 12 years ago
Chris Robinson f296d13c20 Add a speed multiplier to the animation state 12 years ago
Chris Robinson 3a1facefdf Store a pointer to the character controller for non-actor objects 12 years ago
Chris Robinson 06e631f213 Track death separately in the character controller 12 years ago
Chris Robinson 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
scrawl 94d45e1518 Fix twohanded weapons not unequipping when equipping a torch 12 years ago
scrawl daf9dca121 Fix exception when starting a new game 12 years ago
gus f7f23ac5d8 improvement of the chop animation. Still some jittering. 12 years ago
gus f7b711aabe bugfix 12 years ago
gus 076f98cbba change way animations keys are handled (thanks KittyCat!) 12 years ago
Marc Zinnschlag fd9cc1c282 Merge remote-tracking branch 'vorenon/container' 12 years ago
Marc Zinnschlag a0022e711b Merge remote-tracking branch 'scrawl/raycast' 12 years ago
vorenon 66eb82b363 oops again 12 years ago
vorenon 33779ae23c oops 12 years ago
vorenon d4739a451a added ability to close container windows with the activation key 12 years ago
scrawl c81b852071 Fixes inaccurate ray casts; rely on getCameraToViewportRay 12 years ago
scrawl 8407e2b3aa Fixes the console sometimes receiving text after it was closed 12 years ago
Marc Zinnschlag 1bc343f363 Merge remote-tracking branch 'kcat/first-person' 12 years ago
scrawl fa5198d7b2 Fix an assertion 12 years ago
scrawl 61661c8653 Fix first person meshes casting shadows 12 years ago
scrawl a049638e7f Fixes character previews getting shadowed randomly 12 years ago
Marc Zinnschlag 6a5ab34971 Merge branch 'region' 12 years ago
Chris Robinson 3771e5839e Allow some more third person fallbacks in first person 12 years ago
Chris Robinson 5ee889e8b6 Attach the camera to the Head node in first-person 12 years ago
gus 3947f44aa3 Porting old work 12 years ago
Chris Robinson 2d7620e774 Rotate the neck when looking up and down in first-person 12 years ago
Marc Zinnschlag 4cce466dc7 inverted region map y-axis 12 years ago
Chris Robinson 4df1f198a7 Avoid a map lookup for every skin body part when updating 12 years ago
Chris Robinson 6de56615aa Avoid casting shadows in first-person view 12 years ago
Chris Robinson 025fa4e0d5 Use a multimap for the bodypart map 12 years ago
Chris Robinson 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
Chris Robinson 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
Chris Robinson 7883087586 Store a pointer to the character controller in the map 12 years ago
Marc Zinnschlag c26a6f884f added region map tooltips 12 years ago
greye 29b7734b52 add qualifiers for names in templates to make gcc 4.7+ happy 12 years ago
Marc Zinnschlag c808bf2b23 updating region map on changes to region and cell records 12 years ago
Marc Zinnschlag b17f383c6d Merge remote-tracking branch 'graffy76/RefIdTypeDelegate' 
Conflicts:
	apps/opencs/view/world/table.cpp
 12 years ago
graffy76 11178cc470 Repo permissions commit fix #3 12 years ago
graffy76 bb049806df Repo permissions commit fix #2 12 years ago
graffy76 ae4e3181d9 Fixing repo permissions commit #1 12 years ago
scrawl bbb5d2b98a Change tooltip positioning to resemble vanilla 12 years ago
Marc Zinnschlag d389b70ec4 added missing case folding 12 years ago
Marc Zinnschlag 121978a69e some cleanup; added handling of deleted cells (now displayed instead of ignored) 12 years ago
Marc Zinnschlag 116320cc0d dealing with invalid regions and cells without regions 12 years ago
Marc Zinnschlag 6159724b04 build region map from records (only initial build; updates not implemented yet) 12 years ago
Marc Zinnschlag 4f05f2bddf basic region map; non-interactive for now and working with dummy data instead of real cell/region records 12 years ago
Marc Zinnschlag 71a6955182 Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl 91f6d87126 Fix an uninitialized variable 12 years ago
Marc Zinnschlag 602e40e19d Merge remote-tracking branch 'greye/coc' 12 years ago
greye e553f285b8 update player position on engine start 12 years ago
greye f3d54a7ba4 move finding default cell positions to World 12 years ago
greye 0c303aa285 fix fading on cell transition when cell is loaded 12 years ago
greye 6bb3942288 use Land height data for position in coc 12 years ago
greye a3094b808e update coc behaviour for interior cells 12 years ago
scrawl 744c5804ed Simplified doors, now they will stop after hitting an obstacle instead of trying to back off. 12 years ago
Marc Zinnschlag de5898c953 post merge fixes 12 years ago
Marc Zinnschlag 4986b7d65d Merge branch 'master' into ref 12 years ago
Marc Zinnschlag 1c4b70805b added missing reference table columns 12 years ago
Marc Zinnschlag 9a39f32c32 store ID of cell in reference struct 12 years ago
Marc Zinnschlag 9a49125281 added references table 12 years ago
scrawl 72600a16cf Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea 12 years ago
scrawl 58fce74620 Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders 12 years ago
scrawl 5c8950f91c Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Marc Zinnschlag f9d7c7574e Merge remote-tracking branch 'swick/scrollbar' 12 years ago
Marc Zinnschlag 3dc42fb948 Merge remote-tracking branch 'greye/master' 12 years ago
greye 76d95dffb6 special case for loading StartScript records 12 years ago
Sebastian Wick 26bd2a5301 use the new scrollbar; range dependent step size; fix 12 years ago
Sebastian Wick b43f41c2bd use a mygui controller for scrollbar repeat 12 years ago
Sebastian Wick e3d8bdbafe autorepeat scrollbar 12 years ago
graffy76 9f6d250463 QDebug reference removal 12 years ago
Marc Zinnschlag 847ec9fa56 Merge remote-tracking branch 'swick/master' 12 years ago
Sebastian Wick 8bdc9ff3ae set position of the window for multiple monitors 12 years ago
graffy76 55b115935a Implemented RefRecordTypeDelegate 
Added accessor functions to CSMWorld::UniversalId for static const
sIdArg[]
 12 years ago
graffy76 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
Marc Zinnschlag 56637a39a3 Merge remote-tracking branch 'vheuken/master' 12 years ago
Marc Zinnschlag cd538538b5 fixed weather code 12 years ago
Vincent Heuken f43b48015e remove actor's collisionbox on death 12 years ago
Vincent Heuken b095c24854 resize actor collision boxes on death 12 years ago
scrawl 123a60581f Only link to SDL2main on windows 12 years ago
Marc Zinnschlag e88040662e Merge remote-tracking branch 'glorf/master' 12 years ago
Marc Zinnschlag afb120d5ce Merge remote-tracking branch 'graffy76/recordStatusDelegate' 12 years ago
graffy76 6deddf7229 Fixed code conventions in user settings, changed top-level page names 12 years ago
Glorf 88f8637145 Bugfix #795 12 years ago
Glorf 5b81d124bb Catched another exception 12 years ago
Glorf f4d302501e Bugfix #826 12 years ago
Marc Zinnschlag 623200b50e Merge remote-tracking branch 'pakanek/libav_headers' 12 years ago
Marc Zinnschlag 8ffea60b72 some cleanup 12 years ago
Marc Zinnschlag 12cfe1fdfe Merge remote-tracking branch 'graffy76/recordStatusDelegate' 12 years ago
Miroslav Puda 743b3dec99 Correction of libavutil version 12 years ago
graffy76 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
Alexander "Ace" Olofsson 0a2ed8b0d7 Make OpenMW able to initialize SDL in windows builds 12 years ago
eroen 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
Marc Zinnschlag 05649a1654 Merge remote-tracking branch 'swick/master' 12 years ago
Vincent Heuken 09cca0bf80 more detailed error message when SDL fails to initialize 12 years ago
Marc Zinnschlag 99508a6eaa minor cleanup 12 years ago
Sebastian Wick 20e591fe18 use index instead of string manipulation 12 years ago
Sebastian Wick 357974a429 more minor stuff 12 years ago
mckibbenta 1f4d1d3b57 Merge branch 'master' of https://github.com/zinnschlag/openmw 12 years ago
mckibbenta 5803726233 modified gmst addition during creation of new base file 12 years ago
Sebastian Wick c97fac8116 use QMessageBox to show errors 12 years ago
Sebastian Wick 89dee80dcf simpler remove of duplicates 12 years ago
Sebastian Wick 6abb5d5f75 small fixes 12 years ago
Sebastian Wick dbfc39468b better workaround 12 years ago
Marc Zinnschlag 0829548106 Merge remote-tracking branch 'swick/multimonitor' 
Conflicts:
	apps/launcher/graphicspage.cpp
 12 years ago
Sebastian Wick 6f7a7b4714 remove old code 12 years ago
Sebastian Wick bb39a85f16 remove double entries 12 years ago
Sebastian Wick 14d074e3e7 select first screen if none is in the setting 12 years ago
Sebastian Wick a1fea97c3b use SDL for resolution -> multimonitor support 12 years ago
mckibbenta 16a27e28f7 inluded gmsts with default values to creation of new base files 12 years ago
Marc Zinnschlag d61c12ccfc minor cleanup 12 years ago
Sebastian Wick d364fd8561 Merge branch 'master' of https://github.com/zinnschlag/openmw 12 years ago
Sebastian Wick 0e29286856 fix custom resolution maximum 12 years ago
graffy76 62e164b2aa Fixed load file error if no file is found 12 years ago
graffy76 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
Marc Zinnschlag f5ba2b37e7 Merge remote-tracking branch 'vorenon/fixes' 12 years ago
vorenon efdcd9649c Fading for Exterior->Interior cell transitions 12 years ago
Marc Zinnschlag 8b909ff838 killed a stray srand 12 years ago
graffy76 b3d185e421 Unsaved changes missed in previous commits 12 years ago
graffy76 f4a2cf64c2 Removed CSVSettings::SamplePage class files 12 years ago
graffy76 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
Miroslav Puda 8da3494d74 Revert "Type of weather changed from string to enum." 
This reverts commit 04d90b4c47.

Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/weather.hpp
 12 years ago
Miroslav Puda 26a6bdb27d Correction of sigsegv. 12 years ago