mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:19:54 +00:00
Code Issues Releases Wiki Activity
7022 commits 38 branches 54 tags 122 MiB
Commit graph

4380 commits

Author SHA1 Message Date
vorenon
ed6098388f return false instead of std::exit 2013-06-16 18:13:14 +02:00
vorenon
b97a051dc6 Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813 2013-06-16 18:12:09 +02:00
Marc Zinnschlag
3e29506d5c Merge remote-tracking branch 'vorenon/dialogue' 2013-06-16 17:03:50 +02:00
vorenon
9ac4a9c5eb Don't start OpenMW if no master file is selected. This fixes bug #813 2013-06-16 04:59:34 +02:00
vorenon
4c0086b54c Workaround for bug #820 2013-06-16 01:09:03 +02:00
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
scrawl
5252ffa104 More cleanup 2013-06-15 17:06:27 +02:00
scrawl
289587b1a9 Cleanup 2013-06-15 16:29:25 +02:00
scrawl
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 2013-06-15 15:33:47 +02:00
scrawl
9331a6380c Merge remote-tracking branch 'corristo/sdl_input2' into sdl_input2 2013-06-15 13:25:27 +02:00
scrawl
4fb32f7f05 Moved window resize messages to sdlinputwrapper 2013-06-15 13:22:29 +02:00
Nikolay Kasyanov
9807eacb58 Removed obsolete OIS workaround 2013-06-15 15:17:29 +04:00
Nikolay Kasyanov
5984a15846 We don't need Carbon on OS X anymore 2013-06-15 14:47:33 +04:00
Rohit Nirmal
e5ddaaf676 Fix wrong indenting from my last commits. 2013-06-13 11:17:34 -05:00
Marc Zinnschlag
df016778be Merge remote-tracking branch 'rohitnirmal/journal-open-sound' 2013-06-13 18:04:38 +02:00
scrawl
0880805559 Minor cleanup 2013-06-13 12:13:40 +02:00
Rohit Nirmal
9d4ecc3e73 replace tabs with spaces. 2013-06-13 00:52:26 -05:00
Rohit Nirmal
aac3ada14b Use mousewheel to turn book pages. 2013-06-13 00:50:07 -05:00
scrawl
fcf35d3871 Removed the UI cursor sensitivity slider 2013-06-12 20:27:55 +02:00
scrawl
ab3634d692 Removed some remains of OIS 2013-06-12 20:13:19 +02:00
scrawl
14a2a26a56 Fullscreen resizing fix 2013-06-12 20:08:55 +02:00
scrawl
403704b92a Use openmw.png for SDL_SetWindowIcon 2013-06-12 16:15:04 +02:00
scrawl
705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 2013-06-12 16:07:46 +02:00
scrawl
cc077eaba6 Fix mouse wheel triggering a click event in mygui 2013-06-12 15:10:04 +02:00
scrawl
918a1655bb Restored HW cursor rotation and resolution/fullscreen switching 2013-06-12 14:58:07 +02:00
scrawl
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
 2013-06-12 12:34:33 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
darkf
fc0f04324c Remove some superfluous mSkyManager NULL checks 2013-06-11 20:56:40 -07:00
Rohit Nirmal
fdeac21f22 Merge branch 'master' of https://github.com/zinnschlag/openmw into journal-open-sound 2013-06-11 21:36:00 -05:00
Rohit Nirmal
b5caa25e5c Just move check if player owns journal to inputmanagerimp.cpp - prevents playing sound when going to main menu. 2013-06-10 19:42:38 -05:00
fstp
98e5cb6d7b Added ifdef to keep backward compatibility with the FFmpeg library. 2013-06-10 15:10:39 +02:00
Rohit Nirmal
4eede86ce6 Moved journal open/close sound effect playback to JournalWindowImpl, and have opening sound play only if the player has the journal. 2013-06-09 23:27:47 -05:00
fstp
a3b2a76e60 Added virtual destructors to classes LocalMapBase and EffectEditorBase. 2013-06-09 23:08:57 +02:00
Marc Zinnschlag
48496a644f Merge remote-tracking branch 'scrawl/master' 2013-06-06 23:42:21 +02:00
scrawl
daab4f55a3 Use Morrowind's fonts 2013-06-06 22:26:06 +02:00
Marc Zinnschlag
f586eef604 Merge remote-tracking branch 'torben/pathfindingoverhaul' 2013-06-01 10:44:23 +02:00
Torben Carrington
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). 2013-05-31 17:49:52 -07:00
Torben Carrington
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). 2013-05-31 17:01:42 -07:00
scrawl
8bd712cc95 Fix being able to move slowly when over encumbered 2013-05-31 04:08:44 +02:00
Torben Carrington
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. 2013-05-29 20:05:17 -07:00
Torben Carrington
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!). 2013-05-29 19:26:45 -07:00
Torben Carrington
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. 2013-05-29 17:33:33 -07:00
Torben Carrington
96fdaf7410 Pathfinding Overhaul - More cleanup. 2013-05-29 16:10:15 -07:00
Torben Carrington
4838678944 Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding. 2013-05-29 15:59:23 -07:00
Miroslav Puda
dc17fa1636 Removal of duplicit enumeration and unnecessary conditions. 2013-05-29 00:01:18 +02:00
Marc Zinnschlag
bbec3680c6 Merge remote-tracking branch 'pakanek/enchanting-mechanics' 2013-05-28 10:02:03 +02:00
Marc Zinnschlag
6e7416d8c5 Merge remote-tracking branch 'scrawl/master' 2013-05-28 09:59:41 +02:00
scrawl
9a43927078 Fix weapons not appearing in Enchantable filter 2013-05-28 03:15:13 +02:00
Miroslav Puda
7a4a386cbe Removal of tab characters. 2013-05-27 20:47:53 +02:00
Torben Carrington
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. 2013-05-27 11:44:46 -07:00