Commit Graph

15364 Commits (07f0cc2b0ee0dfae77171077633a374e0d0d997c)

Author SHA1 Message Date
Andrei Kortunov 4dcaf040e6 A Russian journal index 7 years ago
Andrei Kortunov 60d0c83cca Handle 128px Tx_menubook_topics textures 7 years ago
Miloslav Číž ea2bbce68a Fix memory leak in WindowManager 7 years ago
David Cernat 28e1947f23 Merge pull request #339 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/engine.cpp
7 years ago
scrawl 36f4f0ef85 Don't increase simulationTime while the game is minimized (Fixes #4211) 7 years ago
David Cernat 5aff515d3f
Merge pull request #337 from OpenMW/master
Add OpenMW commits up to 15 Nov 2017
7 years ago
scrawl cf40d19d7d
Merge pull request #1551 from thegriglat/abs
Change abs to std::abs
7 years ago
scrawl 35d68f038d Update dialogue topics list after result script is run
Regression from 0.42.
7 years ago
scrawl 60fba7acd8 Fix reorder warning 7 years ago
scrawl c36d250044 Parse dialogue text for keywords after the resultscript runs (Fixes #4210) 7 years ago
scrawl 7c5d2a1ac4 Update dialogue topics list after result script is run
Regression from 0.42.
7 years ago
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