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
|
c29699487f
|
forgot to add file
|
2013-06-12 17:08:02 +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
|
df1f1bd5c8
|
Merge remote-tracking branch 'glorf/cs-windows'
|
2013-06-12 10:58:08 +02:00 |
|
Glorf
|
548f4d683f
|
Globalization of user settings
|
2013-06-12 12:36:35 +02:00 |
|
Marc Zinnschlag
|
bd08677a7f
|
Merge branch 'openmw24'
|
2013-06-12 10:37:33 +02:00 |
|
Marc Zinnschlag
|
c891e529f3
|
Merge remote-tracking branch 'rohitnirmal/launcher-fix-rohit'
|
2013-06-12 10:32:53 +02:00 |
|
Rohit Nirmal
|
2fd4d71774
|
trim whitespace from key and value while reading settings file - stops ugly buildup in settings.cfg, and correctly reads settings from it.
|
2013-06-11 23:00:12 -05:00 |
|
darkf
|
fc0f04324c
|
Remove some superfluous mSkyManager NULL checks
|
2013-06-11 20:56:40 -07:00 |
|
darkf
|
fb462f1b1a
|
launcher: Throw error if no data files are selected
|
2013-06-11 20:28:38 -07:00 |
|
darkf
|
fd25616cab
|
launcher: Properly quit if settings write fails.
|
2013-06-11 20:28:36 -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 |
|
Marc Zinnschlag
|
9d6d200d22
|
updated credits file
|
2013-06-10 10:25:02 +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 |
|
Nikolay Kasyanov
|
d13430e2b8
|
Fix for CMake > 2.8.9 on OS X
|
2013-06-09 20:59:31 +04:00 |
|
Glorf
|
10165d3c6b
|
Feature #468
|
2013-06-09 00:34:27 +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
|
68bef59d89
|
updated changelog again
|
2013-06-03 10:15:19 +02:00 |
|
pvdk
|
b3595a6a2e
|
Fix for duplicate key/value pairs being written to settings.cfg, Bug #755
|
2013-06-02 21:43:22 +02:00 |
|
Marc Zinnschlag
|
512dcdc735
|
updated changelog
|
2013-06-02 09:50:29 +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 |
|
Marek Kochanowicz
|
09ab541102
|
Colored status icons. Hopefully everybody loves watercolors!
|
2013-05-31 11:50:03 +02:00 |
|
scrawl
|
8bd712cc95
|
Fix being able to move slowly when over encumbered
|
2013-05-31 04:08:44 +02:00 |
|
Marek Kochanowicz
|
e403773e95
|
Simply removed background from status icons.
|
2013-05-30 13:33:49 +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 |
|
graffy76
|
1d93cf09bc
|
Cell formatting and code optimization changes
|
2013-05-29 21:55:19 -05: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 |
|
graffy76
|
94db7cdcfe
|
Added png's of icons
|
2013-05-29 12:45:15 -05:00 |
|
graffy76
|
35fb9b669a
|
Final details implemented
Png icons, alignments fixed.
|
2013-05-29 06:38:35 -05:00 |
|
Miroslav Puda
|
dc17fa1636
|
Removal of duplicit enumeration and unnecessary conditions.
|
2013-05-29 00:01:18 +02:00 |
|