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
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
Kyle Cooley b14404e9cc Fix region colors 7 years ago
scrawl 7021d354c6 Merge pull request #1493 from akortunov/regressions 
Regression fixes
 7 years ago
scrawl 2805781542 Fix a crash when exit() already hides the window (Fixes #4148) 7 years ago
Andrei Kortunov ad27e0f945 Fix owned tooltip in the spellwindow 7 years ago
Andrei Kortunov e2afd3690c Remove item by id from InventoryStore 7 years ago
David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
 7 years ago
scrawl 842a42ee66 Fix non-top level Windows accepting key focus 7 years ago
scrawl 8c0790580a Add screen fading for exterior cell transitions 7 years ago
scrawl cd437f094d Fix exiting savegamedialog with 'esc' when no game is running 7 years ago
scrawl d94235e3a7 Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard 7 years ago
scrawl 12510efab7 Fade screen out during loading screen (when travelling) 7 years ago
scrawl a4737d8417 Use MyGUI frame events for ScreenFader 7 years ago
scrawl e4f0f7157a Fix pinned windows not being updated 7 years ago
scrawl 49a0922f1b Remove 'visibility mask' gui feature which did not end up being useful 7 years ago
scrawl 7c68ed04b2 Don't require modal windows to be removed in the same order they were added 7 years ago
scrawl b5c9977a7b Merge pull request #1489 from akortunov/guifixes 
Use an "owned crosshair" feature for items in containers
 7 years ago
Andrei Kortunov 1cb7ed5db1 Use owned tooltips for items in containers correctly 7 years ago
scrawl 433028e8d7 Fix GUI regressions 7 years ago
Marc Zinnschlag dd17f70068 Merge remote-tracking branch 'aesylwinn/landrecords' 7 years ago
Kyle Cooley 2f5449a68c Remove now unnecessary overrides. 7 years ago
Kyle Cooley 137ea872d3 Hide base land textures. 7 years ago
scrawl b24fd77ea2 Merge pull request #1488 from akortunov/equipfix 
AI: Autoequip armor when bound armor spell expires
 7 years ago
scrawl 302e3c8b3d Merge pull request #1486 from akortunov/pickpocketfix 
Fix some issues with pickpocketing (bug #4131)
 7 years ago
Andrei Kortunov 21b6bd176f AI: Autoequip armor when bound armor spell expires 7 years ago
Andrei Kortunov c5fcb9684e Improve owned crosshair feature behaviour 7 years ago
Andrei Kortunov b8fd530ee1 Do not speak with unconscious creatures 7 years ago
Andrei Kortunov f26206b630 Make unconscious actors do not speak and do not track targets 7 years ago
Andrei Kortunov 3ebb18ce18 Make unconscious actors do not report about crimes 7 years ago
Andrei Kortunov 34895157f9 Consider taking items from unconscious NPC as a theft 7 years ago
Andrei Kortunov 04452b0949 Use a pickpocket crime instead of theft when pickpocketing was failed 7 years ago
scrawl 3c62a8c5c2 Fix console selected object persisting on a new game 7 years ago
scrawl 097b9d90bc Fix travel service not showing 7 years ago
Kyle Cooley dfcbee3ab1 Ignore case when comparing textures, also add new textures to lookup map. 7 years ago
scrawl 77ddaa869b Merge pull request #1484 from drummyfish/master 
fix rain ripple bug
 7 years ago
Andrei Kortunov 03daf2b9e3 Fix a failed assert in the getCell() check during a new game start 7 years ago
Miloslav Číž 4999c667b6 fix rain ripple bug 7 years ago
scrawl 5b10e3128e Use first resolution in fullscreen if current is not supported (Fixes #4113) 7 years ago
scrawl 64e27c032b Merge pull request #1481 from scrawl/keyfocus 
WindowManager overhaul & improved keyboard support
 7 years ago
scrawl 05348ab7ed Merge pull request #1483 from drummyfish/master 
water shader improvements plus rain ripple effect (#452)
 7 years ago
scrawl 7bb0a76df2 Fix tooltips showing when cursor isn't visible 7 years ago
Miloslav Číž 8416feaf5b link rain water ripple effect to actual rain 7 years ago
scrawl 14c9e858c8 Check to make sure button is enabled 7 years ago
scrawl 6ec66fa95f Restore keyfocus to goodbye when selecting a topic 7 years ago
David Cernat 44fb7518ee Merge pull request #300 from OpenMW/master 
Add OpenMW commits up to 28 Sep 2017
 7 years ago
scrawl e5d1fd022f Merge pull request #1479 from akortunov/physics 
Make physics framerate configurable
 7 years ago
scrawl 0ae009eb21 Hide message box before deleting it 
Fixes a crash when closing the game window during the 'plugin mismatch' dialog. Modal windows have to be hidden before they are deleted to prevent a dangling pointer in WindowManager.
 7 years ago
scrawl d53e7f8a3c Remove redundant code 
Already worked around in WindowBase::setVisible
 7 years ago
scrawl 0deda69a27 Fix wrong skin for levelup attribute values 7 years ago
scrawl e9d81fdf5a Fix being able to escape interactive messageboxes 7 years ago
scrawl db650df416 Fix 'blocking' messageboxes not handling key focus properly 7 years ago
scrawl a0f5e32113 Fix 'new game' from the main menu not removing menu afterwards 7 years ago
scrawl 0240a6c38b Fix controls window regression 7 years ago
David Cernat b1aacd5028 Merge pull request #299 from OpenMW/master 
Add OpenMW commits up to 27 Sep 2017
 7 years ago
Andrei Kortunov 668a947210 Inherit owner, if an item is in container (regression #4128) 7 years ago
scrawl 2d873a13ac Merge pull request #1469 from drummyfish/master 
water shader improvements (partially fixes #3365)
 7 years ago
scrawl 0ee57effcc Make 'Delete game' button not accept keyfocus, to prevent accidents 7 years ago
scrawl c7a82704c6 Fix key focus resets in SaveGameDialog 7 years ago
scrawl 74e806d974 Additionally use movement keys (default WASD) to navigate GUI buttons 7 years ago
scrawl 3d2ad2d339 Include cleanup 7 years ago
scrawl 87311d86b5 Fix what looks like a copy/paste error 7 years ago
scrawl 7a3fbfb34a Slightly improve journal window keyboard navigation 7 years ago
scrawl 05814c0929 Add key focus handling for WaitDialog 
Default is 'until healed'. Up/Down arrows change the hour slider and implicitely change the button to 'Wait'.
 7 years ago
scrawl 8964fc93d6 Fix dialogue window not being exited properly 7 years ago
scrawl 7a64098da3 Avoid rebuilding the dialogue topics pane unnecessarily 
Also retaining key focus.
 7 years ago
scrawl 22929e53fa Don't ignore my own advice 
Can't wait until MyGUI 3.2.2 is a build dependency, then we can use key focus events to handle the SDL text input.
 7 years ago
scrawl 1714271a76 Improve KeyboardNavigation to better handle modal windows 
It's no longer possible to cycle to widgets that aren't part of the current modal window.

The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).
 7 years ago
scrawl 41fe16013b Select first widget if we can't find the current widget 7 years ago
scrawl 475ac46f3e Workaround keyfocus issues in current versions of MyGUI 7 years ago
scrawl 010a7ea5b3 Fix tooltip widgets being set to accept key focus 7 years ago
scrawl 2514cc5cc8 Workaround key focus being reset in BookWindow when next/prev are hidden 7 years ago
scrawl fce9a14986 Hide the mouse cursor until it's used 7 years ago
scrawl 09e93319f5 Restrict the 'fake mouse movement' workaround to where it's actually required (Fixes #3978) 7 years ago
David Cernat ddf0dfed55 Merge pull request #298 from OpenMW/master 
Add OpenMW commits up to 26 Sep 2017
 7 years ago
Andrei Kortunov 62177ebb30 Move physics framerate from setting to environment variable 7 years ago
scrawl 9b91ea5d34 Exit drag-and-drop if dragged item is deleted (Fixes #3097) 7 years ago
Andrei Kortunov 6062cd4b9c Make physics framerate configurable 7 years ago
Miloslav Číž cde2c13900 make water depth independent of view frustum 7 years ago
scrawl 2ce79e07a4 Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways. 
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
 7 years ago
scrawl 476bec41c5 Remove redundant code 7 years ago
scrawl c5613e384e Remove duplicate disposition code 7 years ago
scrawl e8c6a3b225 Fix crash in dialogue filter if local variables are not configured 
This could happen e.g. by 'some_npc_in_remote_cell->forcegreeting'
 7 years ago
scrawl 36c192a1dd Undo the console portion of 84657271c7 because it results in the console forgetting its object on opening 7 years ago
scrawl 717e68fab2 Remove redundant resetHistory argument 7 years ago
scrawl e14573fa8c Add missing null check 7 years ago
scrawl 19e07fad30 Remove redundant Services enum 7 years ago
scrawl f8ffd85146 Topic passed to keywordSelected() no longer has to be lower case 
Remove redundant mDialogueMap
 7 years ago
scrawl b7752ec52d Make TradeWindow not depend on DialogueWindow 7 years ago
scrawl 82a211ba03 Fix duplicate code 7 years ago
scrawl d78e822833 Add 'delay' argument for screen fading operations 7 years ago
scrawl c035548f37 Make Tab work if selected widget is marked as not needing keyfocus 7 years ago
scrawl ad8d0c5302 Use keypad to control the camera 7 years ago
scrawl 94b538ac82 Fix crash due to not calling WindowModal::onClose() 7 years ago
scrawl ca3b08b852 Make Activate key accept GUI buttons 7 years ago
scrawl 67dc4e019a Make Enter on trade window price attempt the trade 7 years ago
scrawl 8ae7e4c958 Make Enter on a name edit accept the dialog 7 years ago
scrawl 843106fc61 Handle the wait progress bar as part of the GUI mode 7 years ago
scrawl 9ed1b16553 Extend code that detects whether a key was consumed by the GUI (Fixes #4016) 7 years ago
scrawl 0e57f1317b Remove redundant setVisible(false) 7 years ago
scrawl 331192f2d6 Improve keyboard navigation of book/scroll windows 7 years ago
scrawl d58ff4a736 Remove obsolete Container GUI keyboard handling 7 years ago