Glorf
09cc57381a
Bugfix #809
2013-06-18 00:43:31 +02:00
Thoronador
d26e721d10
no const for int and bool
2013-06-17 18:47:12 +02:00
Thoronador
9313b2b3fe
better const correctness for MwIniImporter
2013-06-17 17:44:40 +02:00
Marc Zinnschlag
f0718c477f
Merge remote-tracking branch 'darkf/issue-812'
2013-06-17 15:02:18 +02:00
graffy76
f87eb67968
Fixed conflicts
...
Merge branch 'cs-windows' of https://github.com/Glorf/openmw
Conflicts:
apps/opencs/model/settings/usersettings.cpp
apps/opencs/model/settings/usersettings.hpp
apps/opencs/view/settings/usersettingsdialog.cpp
2013-06-17 06:45:44 -05:00
darkf
43455129d0
launcher: Instead of killing config writing due to no master files being selected, instead display a warning when Play is pressed.
2013-06-17 08:58:48 +00:00
Marc Zinnschlag
b5926257f5
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 21:23:35 +02:00
scrawl
b16bc69479
Removed the no longer needed --debug switch
2013-06-16 20:39:40 +02:00
Marc Zinnschlag
57ce87bf12
Merge remote-tracking branch 'scrawl/sdl_input2'
2013-06-16 20:37:15 +02:00
scrawl
4fd7891d2c
Fix a message box issue
2013-06-16 20:26:27 +02:00
vorenon
76a2abcbe3
added missing line break in front of multiple choice questions
2013-06-16 19:46:55 +02:00
scrawl
b16c92c2f5
Better handle SDL_TEXTINPUT events
2013-06-16 19:43:59 +02:00
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
scrawl
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
2013-06-16 18:06:55 +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
graffy76
700d55f1fb
Fixed / implemented missing features for RecordStatusDelegate
...
Implemented updating editor application from preferences menu, loading
settings when editor loads, adding Record Status Display prefernce.
Fixed multiple bugs, made changes to CSM(V)Settings classes to make
implementing new prefrences easier.
Rewrote CSMSettings::UserSettings to retain last-loaded settings.
Adjusted icon position in Record Status column
Capitalized status text
Added delegate to referenceables table
2013-06-15 06:40:18 -05: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
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
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
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
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
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
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
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
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
Miroslav Puda
b40e24c50c
Refactorization
2013-05-27 20:23:04 +02:00
Miroslav Puda
4e17bc1499
Fix for display of cast cost decimal value
2013-05-27 20:16:57 +02:00
Marc Zinnschlag
7927ac818c
Merge remote-tracking branch 'torben/aiwanderpatchpotential'
2013-05-27 18:29:15 +02:00
Miroslav Puda
9a9b075a02
Correct cast cost for enchantments.
2013-05-27 18:08:12 +02:00
Torben Carrington
ebc1fdd017
AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens.
2013-05-27 09:05:42 -07:00
scrawl
0c7f48ec8a
Implement movement for creatures (formula is a stub)
2013-05-27 18:03:06 +02:00
Miroslav Puda
1c7b94e94f
Switching in nextCastStyle() is now based on enum CastingStyle.
2013-05-27 16:08:58 +02:00
Miroslav Puda
252a1d9223
Replacement of some magical constants
2013-05-27 15:50:47 +02:00
Miroslav Puda
9e1eb8b3b1
Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics
2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226
Better formula for enchantment cost and code refactorization.
2013-05-27 14:42:08 +02:00
Miroslav Puda
56edc1b213
Correction of getting spell range "Target".
2013-05-27 12:26:06 +02:00
Torben Carrington
bd6d54cc8f
AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still.
2013-05-27 03:24:41 -07:00
Marc Zinnschlag
86dd6d0847
Merge remote-tracking branch 'eroen/libcxx'
2013-05-27 10:27:31 +02:00
Marc Zinnschlag
fa63ebce78
Merge remote-tracking branch 'scrawl/master'
2013-05-27 10:19:02 +02:00
Marc Zinnschlag
bd8344b387
Merge remote-tracking branch 'torben/aiwander'
2013-05-27 10:16:37 +02:00
Torben Carrington
3b43ee751e
AI Execute Fix - May as well not create the object either to save extra time.
2013-05-26 19:54:59 -07:00
Torben Carrington
feb180724c
AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior.
2013-05-26 19:33:45 -07:00
scrawl
3a6e54c4f5
Sell owned items in the cell
2013-05-27 02:18:36 +02:00
Torben Carrington
fd96d47fe4
AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research.
2013-05-26 11:30:42 -07:00
Torben Carrington
96daad7a22
AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value."
2013-05-26 09:31:56 -07:00
Torben Carrington
e37324b967
AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm.
2013-05-26 08:49:44 -07:00
eroen
2850032d9e
libc++ fixes: avcodec/avformat workaround
...
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.
Moving the string inclusion after that eyesore shouldn't break anything.
2013-05-26 12:01:01 +02:00
Marc Zinnschlag
5fac75845c
Merge remote-tracking branch 'torben/aiescortclean'
2013-05-25 15:35:56 +02:00
Torben Carrington
ddf28ca201
AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem.
2013-05-25 04:36:21 -07:00
Marc Zinnschlag
94474e8952
Merge remote-tracking branch 'torben/checkidlecomplete'
2013-05-25 12:35:34 +02:00
Marc Zinnschlag
81cd1c6e30
Merge remote-tracking branch 'torben/aitravelcleanup'
2013-05-25 12:35:00 +02:00