krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,518 Commits
35 Branches
0 Tags
65 MiB
fix/skillcap
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 '0.6.1-openmw-updates'
${ noResults }
Commit Graph

15403 Commits (0.6.1-openmw-updates)

Author SHA1 Message Date
Grigorii Latyshev 6e4f6c4bd5 Change abs to std::abs 7 years ago
David Cernat 2ba1c84cf7 Merge pull request #335 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
 7 years ago
scrawl a7fd27f413
Merge pull request #1544 from rexelion/archerrangefix 
use fProjectileMaxSpeed for ranged weapons distance (fixes #4192)
 7 years ago
scrawl 98b4f9c596
Merge pull request #1549 from akortunov/itemmodels 
Item models reworking
 7 years ago
scrawl dc016059c3 Disable Activate key when textinput is active (Bug #4151) 7 years ago
scrawl 3b9e1e8c1b Make movement keys not function in text input mode 7 years ago
Andrei Kortunov 8c0dcd8b2b Do not track a nearest actor during combat and pursue (bug #4179) 7 years ago
rexelion f0649849b8 changed variable name to be more descriptive 7 years ago
Andrei Kortunov 9943bd4d74 AiWander fast forwarding improvements (bug #3638) 7 years ago
Andrei Kortunov 03f129b53c remove redundant allowedToInsertItems() function from ItemModel 7 years ago
Andrei Kortunov 99517d83ea Bound items detection refactoring 7 years ago
Andrei Kortunov a02124f884 Handle item owners during pickpocketing 7 years ago
David Cernat 01db219de4
Merge pull request #333 from OpenMW/master 
Add OpenMW commits up to 11 Nov 2017
 7 years ago
scrawl f1aeb416ec Disable Activate key when textinput is active (Bug #4151) 7 years ago
scrawl b06512a60d Fix error message that referred to the wrong file (Bug #4159) 7 years ago
scrawl 1afbf99f74 Make movement keys not function in text input mode 7 years ago
rexelion 69a56eaea3 don't initialise rangeAttackOfTarget 7 years ago
Kyle Cooley 1cd539bad2 Fix render order for markers 7 years ago
Andrei Kortunov 3694b6ec90 Move onClose() check to item models 7 years ago
Andrei Kortunov ac33ff9482 Move onDropItem() check to item models 7 years ago
Andrei Kortunov 3604b73d60 Move onTakeItem() to item models 7 years ago
Kyle Cooley 556117f6e6 Update marker transparency when changed. 7 years ago
David Cernat f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 7 years ago
Kyle Cooley de214db8d4 Use configured transparency. 7 years ago
Kyle Cooley 197ea95646 Prevent arrows for move/scale markers from intersecting. 7 years ago
rexelion 983c33c4c8 don't use a pointer for ActionWeapon 7 years ago
scrawl 41ecbdbe6c Add missing WaitDialog::clear() (Fixes #4196) 7 years ago
scrawl 9ecdcc187f Clarify a warning message refers to inventory objects 7 years ago
scrawl 95b3c1181a Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects (Fixes #4190) 7 years ago
scrawl e42bd71081 Add missing WaitDialog::clear() (Fixes #4196) 7 years ago
rexelion cab0002461 Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents 7 years ago
rexelion a1d9f11b04 use fProjectileMaxSpeed for ranged weapons distance 7 years ago
Kyle Cooley 492b99b008 Transparent object markers 7 years ago
scrawl 801f2d42d5
Merge pull request #1537 from drummyfish/guardfix 
Check the real distance to target in AIPursue (issue #4184)
 7 years ago
Miloslav Číž f98a821482 fix possible bug in aipursue 7 years ago
scrawl 87c79d7102
Merge pull request #1536 from rexelion/knockoutfix 
Wait a few seconds before getting up (fixes #3884)
 7 years ago
scrawl 45993d3da2
Merge pull request #1529 from drummyfish/animfix 
Stop character landing animation when turning (issue #4177)
 7 years ago
Miloslav Číž 430d01a39a additional animation refactor 7 years ago
rexelion de7a7d842b mTimeUntilWake is initialised in the constructor 7 years ago
scrawl e6303c578c
Merge pull request #1530 from rexelion/curseitemfix 
Trigger OnActivate when item is picked up through the inventory (Issue #3726)
 7 years ago
rexelion 48ec680f23 use game time instead of real time 7 years ago
Miloslav Číž f34223fce9 check the real distance to target in aipursue 7 years ago
rexelion ab66034ed1 use uniform_int_distribution instead of rand() 7 years ago
rexelion ee2f3db9a8 fixed randomness 7 years ago
rexelion 8c2cc0f42f break invisibility first 7 years ago
rexelion bcbfa5fe1e prevent activation, leave the rest to the script 7 years ago
rexelion de83ad0116 use real time; wait random number of seconds 7 years ago
rexelion 5b8610b34b knocked out characters wait some time before getting up 7 years ago
rexelion a9e5e19482 OnActivate is triggered when the item is picked up 7 years ago
Miloslav Číž ff1265c0e7 refactor jump animation 7 years ago
David Cernat a31d43965f
Merge pull request #328 from OpenMW/master 
Add OpenMW commits up to 31 Oct 2017
 7 years ago
rexelion e8743f3f79 check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords 7 years ago
Miloslav Číž 3c65bdaf14 weapon cycle fix 7 years ago
Miloslav Číž 7bc512974f use mcurrentjump instead of custom attrib 7 years ago
rexelion 4e6f53d6f1 item added to the player and OnActivate is triggered when the inventory is closed 7 years ago
rexelion 1ee5dcff77 added a function to determine if a script contains OnActivate 7 years ago
Miloslav Číž 5c8f491441 move animation disabling code to a better place 7 years ago
Miloslav Číž f9c396e0ea stop landing animation when turning 7 years ago
Miloslav Číž 03401bb5df remove redundant condition 7 years ago
David Cernat 37304655da Merge pull request #326 from OpenMW/master 
Add OpenMW commits up to 25 Oct 2017
 7 years ago
scrawl f9397ce933 Merge branch 'master' into openmw-43 7 years ago
Alexander "Ace" Olofsson 3e51c9e6b3 Missed the OpenCS config file 7 years ago
scrawl 4a7be0ffda Don't reset journal index to a lower value (Fixes #4172) 7 years ago
David Cernat dd25c7db4e Merge pull request #324 from OpenMW/master 
Add OpenMW commits up to 24 Oct 2017
 7 years ago
David Cernat a94d4ce6f5 Merge pull request #323 from TES3MP/0.6.1 
Add hotfix commit for 0.6.1 from 23 Oct 2017
 7 years ago
scrawl 4437a72e47 Merge pull request #1519 from drummyfish/rainfix 
fix rain ripple regression (bug #4169)
 7 years ago
Miloslav Číž 3731e20228 fix rain ripple regression 7 years ago
scrawl 0c6ef17fb5 Add explicit variant of 'OnActivate' 7 years ago
scrawl e564dd842e Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response (Fixes #4166) 
Don't delete Link objects prematurely (Fixes #4171)
 7 years ago
scrawl 2a0b2c4e24 Hide modal window before deleting it (Fixes #4168) 7 years ago
David Cernat 3aedc2e5bc [Server] Don't automatically share PlayerTopic packets between players 7 years ago
David Cernat 360cf2ead7 Merge pull request #321 from OpenMW/master 
Add OpenMW commits up to 22 Oct 2017
 7 years ago
scrawl 8b19a8b7f6 Merge pull request #1513 from lukago/feature4082b 
Feature #4082: use many ingredients/potions instantly
 7 years ago
scrawl 3d0094bd2e Fix behavior of 'journal' command when invoked with already seen entry 7 years ago
scrawl 768da57da2 Fix dialogue topics displayed in lower case 7 years ago
David Cernat 3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwworld/worldimp.hpp
 7 years ago
lukago b6cb3b445c use getIndex to handle other windows, nullsafe fixes 7 years ago
scrawl bb4ffb7743 Merge pull request #1514 from akortunov/ringfix 
Do not replace an equpped ring of the same value
 7 years ago
scrawl 075a7fee20 Merge pull request #1515 from akortunov/guifixes 
Fix a 'Good Beast' companion window
 7 years ago
scrawl 5b2fe01375 Merge pull request #1508 from AnyOldName3/shut-up-travis 
Mark worldimp functions as override to stop distracting Travis CI war…
 7 years ago
Andrei Kortunov eaff7e30aa Fix a 'Good Beast' companion window 7 years ago
Andrei Kortunov e64f14b7ce Do not replace an equpped ring of the same value 7 years ago
lukago a3225364ff refactor, use dragItem method 7 years ago
AnyOldName3 03fc3353b9 Tidy up indentation 2 7 years ago
AnyOldName3 f3e6b26e6b Tidy up indentation 7 years ago
scrawl 9be27193a3 Merge pull request #1512 from Rhiyo/patch-1 
fixed new clothing replacing old clothing of same value
 7 years ago
lukago 43f94a8890 simplify drag and drop on avatar for potions and ingredients 7 years ago
Marc Zinnschlag 0b163f0a50 Merge remote-tracking branch 'aesylwinn/forceNewProject' 7 years ago
Marc Zinnschlag bdabace7e2 Merge remote-tracking branch 'aesylwinn/LLmerge' 7 years ago
Rhiyo d9fe3aac99 fixed new clothing replacing old clothing of same value 
Found on the bug http://bugs.openmw.org/issues/4165.

In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind. 

In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
 7 years ago
Kyle Cooley 6d8666d80d Force new project file when creating new project 7 years ago
AnyOldName3 2abff22c08 Make MWWorld::World final to enable compiler optimisations 7 years ago
AnyOldName3 7440cf37bc Remove redundant virtual keywords implied by override keywords 7 years ago
David Cernat 260b3411c3 Merge pull request #317 from OpenMW/master 
Add OpenMW commits up to 18 Oct 2017
 7 years ago
AnyOldName3 69da89be39 Mark a method I missed out the first time as override 7 years ago
scrawl 33ceddc58b Merge pull request #1506 from akortunov/swimanimations 
Use SwimTurnLeft/Right animations correctly
 7 years ago
scrawl 21a705fb75 Merge pull request #1507 from AnyOldName3/data-local-fix 
Fix the loading of 'data-local' lines which I broke
 7 years ago
scrawl 7328de6c50 Merge pull request #1505 from drummyfish/master 
Make snow create water ripples (fixes #4156)
 7 years ago
AnyOldName3 2aad5bed7a Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos 7 years ago
AnyOldName3 43e9e955c8 Do the same for the CS 7 years ago
AnyOldName3 1f77f9654b Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path) 7 years ago
Andrei Kortunov 4d4d247565 Use SwimTurnLeft/Right animations correctly 7 years ago
Miloslav Číž a7cad65aab fix water shader switching bug 7 years ago
Miloslav Číž 8a1e0e74fd update uniform from one place 7 years ago
Miloslav Číž 797e407269 make snow create water ripples 7 years ago
Miloslav Číž da47653625 move rain intensity uniform to water node 7 years ago
David Cernat 184c5f2b29 Merge pull request #315 from OpenMW/master 
Add OpenMW commits up to 17 Oct 2017
 7 years ago
Kyle Cooley 6d7a24224b Add documentation. 7 years ago
AnyOldName3 654bd401fb Switch openmw-cs to the escape versions of option types 7 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 7 years ago
scrawl 03554b2f4b Fix some style issues flagged by cppcheck 7 years ago
scrawl 64d02f577e Fix missing null check 7 years ago
scrawl 624046c558 Fix unused event handler 7 years ago
scrawl bbf9b0c0a7 Merge pull request #1503 from akortunov/regressions 
Handle Trespassing crime differently from Theft
 7 years ago
scrawl 97ec38affb Merge pull request #1492 from drummyfish/master 
fix rain/snow moving with player (issue #2698)
 7 years ago
Andrei Kortunov 8f255a6b72 Handle Trespassing crime differently from Theft (bug #4158) 7 years ago
Miloslav Číž af6eeddbe5 use operator instead of drawcallback 7 years ago
Miloslav Číž 65977b910e wrap weather around in all directions 7 years ago
Miloslav Číž 380a5799dd use bbox as wrap range & apply to all particle systems 7 years ago
Miloslav Číž 38bfa64100 transform weather particles to world space 7 years ago
Miloslav Číž 8114126a62 make use of renderinfo 7 years ago
Miloslav Číž 33a1459b11 search for particle system by class name 7 years ago
Miloslav Číž b95c9ba483 rain independent from camera plus wrap-around 7 years ago
Kyle Cooley 11eae16645 Get rid of duplicate function, fix flag checking 7 years ago
Kyle Cooley d27071f06a Fix LTEX import bug. 7 years ago
Kyle Cooley 98c38ad7d1 Merge cleanup. 7 years ago
Kyle Cooley 6d9d98c02c Merge Land/LandTextures 7 years ago
scrawl 548af6dbfb Fix jail screen fading 7 years ago
scrawl f3ca9832b0 Merge pull request #1500 from akortunov/extraspell 
Implement ExtraSpell magic effect
 7 years ago
Andrei Kortunov 30b05b557b ExtraSpell magic effect: a basic implementation 7 years ago
scrawl 09d7681254 Merge pull request #1499 from lukago/bug4155 
Bugfix #4155: NPCs don't equip a second ring in some cases
 7 years ago
glbwsk 83a5c7c3d8 removed unnecessary comments, added gitignore for clion cmake 7 years ago
scrawl 548e90a7bc Set cursor active when moving by controller 7 years ago
glbwsk ff9cb22a58 npc swap cheaper ring during auto equip 7 years ago
glbwsk e6e482ea98 added some comments for autoEquip 7 years ago
glbwsk a25903b075 fixed autoequiping rings by npc - now checks if right hand is free 7 years ago
David Cernat ec2c964ae1 Merge pull request #311 from TES3MP/0.6.1 
Add hotfix commit for 0.6.1 from 10 Oct 2017
 7 years ago
David Cernat f532ab241d [Server] Avoid duplicates of the same player in a cell's loaders 7 years ago
David Cernat c35101cc36 [Client] Don't use message box call boolean for regular message boxes 7 years ago
David Cernat 4f112ba3d7 [Client] Use regular message boxes where expected to do so 
This helps us move towards using the same terminology as OpenMW for GUI elements, leading to less confusion.
 7 years ago
David Cernat 41ff3fee89 Merge pull request #310 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 7 years ago
scrawl 479f9535b4 Allow training window exit() 7 years ago
scrawl 9cde3e4408 Merge pull request #1495 from akortunov/regressions 
Add showsInInventory() check to the ContainerItemModel
 7 years ago
Andrei Kortunov ea3729790f Add showsInInventory() check to the ContainerItemModel 7 years ago
David Cernat 182f8c1f06 [General] Print client version on startup 7 years ago
David Cernat 3d38da0e85 [Server] Put includes in a specific order 7 years ago
David Cernat 61b1a59814 [General] Move server's version printing method to Utils 7 years ago
David Cernat 08f34e5356 [Client] Fix recent problems with password window 7 years ago
David Cernat 711c4d83da [Client] Fix build after recent OpenMW changes to GUI 7 years ago
David Cernat 3e8d7c8416 Merge pull request #306 from OpenMW/master 
Add OpenMW commits up to 7 Oct 2017
 7 years ago