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

5221 commits

Author SHA1 Message Date
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
97f421df8a simplifying CSMWorld::CellRef 2013-06-08 15:50:36 +02:00
Marc Zinnschlag
1e60ad3cd6 Promoted references to a top level record internally. 
Note: This does not change the structure of the ESX format.
 2013-06-08 12:45:13 +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
Torben Carrington
c8c1ddd927 Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 2013-05-24 20:10:07 -07:00
scrawl
1e7cf4ae1c GLES2 experiment 2013-05-25 04:15:24 +02:00
Torben Carrington
56b1384c90 AITravel Cleanup - Removed unnecessary includes and other varius cleanups. 2013-05-24 18:16:35 -07:00
riothamus
d9350be8da Console Object Selection Fix 2013-05-24 09:31:56 -04:00
Marc Zinnschlag
b1a8dc35e0 minor adjustments 2013-05-24 15:03:46 +02:00
Marc Zinnschlag
62479cd885 Merge remote-tracking branch 'torben/aiwanderrepeat' 2013-05-24 14:58:10 +02:00
Torben Carrington
1cfe037d6b AIWander - Added support for the Repeat parameter to mimic vanilla. 2013-05-24 04:49:20 -07:00
scrawl
32e90bb733 Fix chargen statssheet 2013-05-23 17:28:45 +02:00
Marc Zinnschlag
2d894fde57 Merge remote-tracking branch 'riothamus/riothamus-b788' into openmw24 2013-05-23 16:08:58 +02:00
riothamus
7187f50c40 Bug 788 2013-05-23 09:13:21 -04:00
Miroslav Puda
00866ef246 Merge branch 'master' of https://github.com/zinnschlag/openmw into esmtool_plain_script 2013-05-22 20:25:47 +02:00
Miroslav Puda
8a9ddcaa32 Plain output moved at the end of records output. 2013-05-22 20:24:23 +02:00
Miroslav Puda
d3d5cb4edf New command line option --plain to print contents of scripts, books, dialogs. 2013-05-22 20:09:11 +02:00
Marc Zinnschlag
c40e753ea9 Merge remote-tracking branch 'pakanek/master' 2013-05-22 14:07:49 +02:00
Marc Zinnschlag
6d0b8f7bc8 added missing include 2013-05-22 10:14:12 +02:00
Miroslav Puda
3cebb41459 missing break 2013-05-21 21:04:15 +02:00
Edmondo Tommasina
f0482dd796 dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘" 
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
 2013-05-20 23:51:01 +02:00
Marc Zinnschlag
5d4c311de7 Merge remote-tracking branch 'scrawl/master' 2013-05-20 15:01:25 +02:00
scrawl
d3effdf34c Fix exception when trying to equip a shield while a lockpick is equipped 2013-05-20 13:32:38 +02:00
scrawl
d9dd02c610 Security fixes 2013-05-20 12:42:11 +02:00
Marc Zinnschlag
c1ceb32b28 Merge remote-tracking branch 'scrawl/master' 2013-05-20 12:10:51 +02:00
scrawl
2715520d6f Cleanup Security class 2013-05-19 23:19:48 +02:00
scrawl
5173779f4b Add sounds for security skill 2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce Security skill 2013-05-19 18:40:37 +02:00
Marc Zinnschlag
c626e2b257 Merge branch 'ref' 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2013-05-19 14:59:01 +02:00
Marc Zinnschlag
ca33d66ed9 added missing columns for weapon records 2013-05-19 14:44:41 +02:00
Marc Zinnschlag
2123900db5 added missing columns for NPC records 2013-05-19 13:53:47 +02:00
scrawl
c7805e7dd2 Fix sun glare persisting after changing to an interior cell 2013-05-18 23:10:37 +02:00
scrawl
4983d08fe4 Fix a problem with statics disappearing sometimes on the map 
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
 2013-05-18 22:55:30 +02:00
Marc Zinnschlag
8d78bea4aa added missing column for misc record 2013-05-18 18:55:23 +02:00
Marc Zinnschlag
862e568f9b added missing columns for Light record 2013-05-18 18:46:41 +02:00
scrawl
60563afc10 Fix a new game crash, reset camera 2013-05-17 22:53:43 +02:00
Chris Robinson
53d1c3939c Merge remote-tracking branch 'zini/master' into animations 2013-05-17 06:26:34 -07:00
Chris Robinson
e8bbb755c3 Play the left-arm torch animation when it's equipped 2013-05-17 06:21:59 -07:00
Marc Zinnschlag
749fd418b5 added missing columns for door record 2013-05-17 15:10:41 +02:00
Marc Zinnschlag
e2b8f9ea6d Merge remote-tracking branch 'scrawl/master' 2013-05-17 14:37:41 +02:00
scrawl
d096b19307 Fix not being able to equip arrows/bolts 2013-05-17 14:11:19 +02:00
scrawl
3cadb5918f Fix containers showing random items from my commit earlier 2013-05-17 14:11:02 +02:00
Chris Robinson
ee585046ac Don't show weapons in first-person 2013-05-17 01:56:16 -07:00
Chris Robinson
4b9a888d74 Use the PickProbe animation group as appropriate 2013-05-17 01:46:51 -07:00
Marc Zinnschlag
f8c675a638 Merge remote-tracking branch 'graffy76/usersettings' 2013-05-17 10:24:52 +02:00
graffy76
3ce35e691c Commented out sample editor settings page 2013-05-16 20:43:05 -05:00
Marc Zinnschlag
cc42b1ef48 Merge remote-tracking branch 'riothamus/riothamus-b752' 2013-05-16 20:07:48 +02:00
riothamus
d89dbde940 Bug 752, spacing fix 2013-05-16 14:05:22 -04:00
Marc Zinnschlag
ef9abda754 Merge remote-tracking branch 'glorf/weather' 2013-05-16 19:53:28 +02:00
Marc Zinnschlag
9fe5ff46cd Merge remote-tracking branch 'riothamus/riothamus-b752' 2013-05-16 19:52:14 +02:00
riothamus
36f1197b51 Bug 752, cleanup 2013-05-16 13:51:54 -04:00
Glorf
19ce233667 Workaround for MOC compiler problem 2013-05-16 19:46:04 +02:00
riothamus
db981a72fe Bug 752 2013-05-16 13:40:00 -04:00
Marc Zinnschlag
2c8a511179 Merge remote-tracking branch 'scrawl/persistence' 2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Marc Zinnschlag
54f56b0515 Merge remote-tracking branch 'graffy76/usersettings' 
Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp
 2013-05-16 18:04:55 +02:00
graffy76
13242c2bd5 Eliminated code centering the initial view in the middle of the screen 2013-05-16 10:14:13 -05:00
Marc Zinnschlag
889a87982e added missing columns for creatures 2013-05-16 16:27:33 +02:00
Chris Robinson
6201cb0093 Add a method to clear the animation queue 2013-05-16 06:59:41 -07:00
Glorf
af28be915f Use fallback video name 2013-05-16 13:47:27 +02:00
Glorf
0539ca6a9c Bugfix #778 2013-05-16 13:35:28 +02:00
Chris Robinson
6c6200efef Merge remote-tracking branch 'zini/master' into animations 2013-05-15 16:34:51 -07:00
Marc Zinnschlag
9fee99d56c Merge remote-tracking branch 'scrawl/master' 2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999 Some fixes 2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Marc Zinnschlag
d794a62d19 added missing columns for container record 2013-05-15 17:02:34 +02:00
Chris Robinson
71d39c2fa0 Merge remote-tracking branch 'zini/master' into animations 2013-05-15 06:36:06 -07:00
Chris Robinson
e069215583 Don't clear the last queued animation when it stops 2013-05-15 06:32:20 -07:00
Marc Zinnschlag
28f2a7d2b4 added missing column for clothing records 2013-05-15 11:37:46 +02:00
Chris Robinson
66f55b3178 Play the item up/down sound when readying/unreadying weapons 2013-05-15 01:45:47 -07:00
Chris Robinson
b459a010b0 Fix vec.z being applied while not in the air 2013-05-14 23:03:28 -07:00
Chris Robinson
3c5c10144a Remove a duplicate showWeapons call 2013-05-14 19:38:57 -07:00
Marc Zinnschlag
56b2b05f9a Merge remote-tracking branch 'glorf/weather' 2013-05-14 22:56:26 +02:00
Glorf
39c7bc8363 Corrected celestical object sizes 2013-05-14 20:34:40 +02:00
Glorf
9fa2dd5277 Playing with moons part 2 2013-05-14 19:58:08 +02:00
Chris Robinson
e8661794fe Avoid trying to find a state for non-actors. 
They're only ever play idles, unless PlayGroup is called.
 2013-05-14 07:29:07 -07:00
Marc Zinnschlag
eba9d3e3ee added missing columns for book record 2013-05-14 14:40:06 +02:00
Marc Zinnschlag
fce9939f83 added missing columns for armor record 2013-05-14 14:33:34 +02:00
Marc Zinnschlag
7c57f2c221 added AI-related actor columns 2013-05-14 13:20:59 +02:00
Chris Robinson
355f653614 Use AnimationAlloc instead of AnimationAllocatedObject 2013-05-14 01:30:01 -07:00
Chris Robinson
47a9a4cdff Clean up a for loop 2013-05-14 01:29:15 -07:00
scrawl
96e3b3b7c2 Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject 2013-05-13 21:03:53 +02:00
Marc Zinnschlag
d684120f7a Merge remote-tracking branch 'scrawl/master' 2013-05-13 20:47:50 +02:00
scrawl
ac4fa1941d Fix the frame update not getting called on the first frame 2013-05-13 20:08:12 +02:00
Marc Zinnschlag
74d791e207 fixed auto calc column 2013-05-13 14:07:31 +02:00
Marc Zinnschlag
897e55391d added columns for tool IDs 2013-05-13 13:36:24 +02:00
Marc Zinnschlag
52d81dc9fa added columns for enchantments 2013-05-13 13:11:43 +02:00
Chris Robinson
822f130f79 Merge remote-tracking branch 'zini/master' into animations 2013-05-13 04:09:56 -07:00
Chris Robinson
8ec722ac92 Use std::find_if instead of ugly for loops 2013-05-13 04:08:36 -07:00
Marc Zinnschlag
90bae2bead do not create editors for unused columns 2013-05-13 12:55:28 +02:00
Marc Zinnschlag
929b38ff6a added missing columns for apparati records 2013-05-13 12:51:27 +02:00
Chris Robinson
f83ee5d316 Play ready/unready animations on the upper body 2013-05-13 03:32:00 -07:00
Torben Carrington
4d10a1c407 Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris) 2013-05-13 02:57:52 -07:00
Marc Zinnschlag
af191c7382 fixed AiWander arguments 2013-05-13 11:27:36 +02:00
Chris Robinson
a9928bb842 Split up the UpperBody group 
Also recognize the [un]equip start and stop text keys.
 2013-05-13 02:09:22 -07:00
Chris Robinson
70dc2f77ad Move the priority enum to MWMechanics 2013-05-13 00:54:44 -07:00
Chris Robinson
7ba2508556 add a priority for death animations, and store it in the state list 2013-05-12 19:19:21 -07:00
graffy76
c71d921f09 Moved signalUpdateEditorSettings from UserSettingsDialog to 
UserSettings.

UserSettings is now derived from QObject.
 2013-05-12 15:15:57 -05:00
graffy76
144be59735 Changed enum names to match OpenMW naming conventions 2013-05-12 14:28:36 -05:00
Marc Zinnschlag
7fd277b87a added missing column for potions 2013-05-12 15:50:29 +02:00
Chris Robinson
4e389b5a8f Store whether a given animation loops in the state table 2013-05-12 05:59:39 -07:00
Chris Robinson
bbb38c61cc Fix queued animations 2013-05-12 05:08:01 -07:00
Chris Robinson
3988866ecd Make sure active groups are updated after a state is auto-disabled 2013-05-12 04:34:37 -07:00
Chris Robinson
2c556e4036 Be smarter about handling non-moving animations 
Don't rely on being told by the play method, so the animation can
automatically change without impacting the character controller.
 2013-05-12 04:29:42 -07:00
Marc Zinnschlag
9835c6df11 Merge remote-tracking branch 'scrawl/tradefix' 2013-05-12 12:58:32 +02:00
Chris Robinson
4ea347ac52 Use shared pointers to store animation sources 
This ensures references to the sources stay valid as long it the object
is, rather than becoming invalidated whenever one is added or removed.
 2013-05-11 19:38:23 -07:00
graffy76
88df3b980f Implemented UserSettings as a singleton. 2013-05-11 20:55:36 -05:00
scrawl
b56d50287e Barter mechanic fix 2013-05-11 22:56:36 +02:00
Marc Zinnschlag
e14cb6853f Merge remote-tracking branch 'scrawl/containerui' 2013-05-11 19:23:02 +02:00
Marc Zinnschlag
da92921387 added columns related to items in inventories 2013-05-11 19:21:16 +02:00
Marc Zinnschlag
ee2bc94698 added script column 2013-05-11 18:57:23 +02:00
Marc Zinnschlag
e24ecfd5d2 added name column 2013-05-11 18:43:16 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
Marc Zinnschlag
318ebe0cb6 added model column 2013-05-11 18:35:48 +02:00
Marc Zinnschlag
8ef2d04007 added type column 2013-05-11 17:49:38 +02:00
Marc Zinnschlag
c22f773f72 load all types of referenceable IDs 2013-05-11 17:45:28 +02:00
Marc Zinnschlag
d715cf5431 replaced static adapter with a template 2013-05-11 17:34:18 +02:00
Marc Zinnschlag
9426eda47a small test with statics and two columns 2013-05-11 17:01:16 +02:00
Marc Zinnschlag
02ace69511 fixed RefID search 2013-05-11 16:55:10 +02:00
graffy76
d0b23a4786 Relocated "User Settings" to Edit->Preferences 
Removed <QDebug> reference from view.hpp
 2013-05-11 07:40:10 -05:00
graffy76
a8b45e0a13 Three primary changes: 
1.  Declared QStringPair::isEmpty() const
2.  Split the CsSettings namespace into two: CSMSettings and
CSVSettings. (Required splitting the support.hpp file)
3.  Declared several classes as _noqt in CMakeLists.txt for OpenCS
 2013-05-11 05:55:46 -05:00
Chris Robinson
6b8a687a79 Add methods to disable an animation 
And rename WeaponState to WeaponType
 2013-05-10 22:22:39 -07:00
Chris Robinson
6605aa7dec Create three bone groups 
This still won't work as expected. Currently there is only one priority level,
and only one animation state per priority level can be active at a time.

It's close, though.
 2013-05-10 20:45:09 -07:00
Chris Robinson
abc676eedd Allow specifying which bone groups to play an animation on 2013-05-10 20:05:09 -07:00
Chris Robinson
56eede2610 Search more aggressively for an animation velocity 2013-05-10 19:31:33 -07:00
Chris Robinson
5a9c1e1245 Don't explicitly track the last position 2013-05-10 18:58:14 -07:00
Chris Robinson
7c3b014193 Figure out which animations to play based on priority 
Bone group will also be taken into account later.
 2013-05-10 18:37:44 -07:00
Chris Robinson
921f534980 Parameterize the number of bone groups 2013-05-10 16:35:43 -07:00
Chris Robinson
8a9b0eb5f7 Store the AnimSource in the animation state 2013-05-10 15:27:29 -07:00
Glorf
6aaa8d6dc0 Fixed fading problem 2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81 Playing with moons part 1 2013-05-10 18:55:56 +02:00
graffy76
8d0f350446 New file structure separating view classes from model classes. Deleted 
.ui file.
 2013-05-10 10:00:58 -05:00
Chris Robinson
58efce5008 Rename animation layers to animation states 2013-05-10 04:01:30 -07:00
Chris Robinson
ccff364b52 Use a map of active layers instead of an array 
A bit of an upheaval. Each animation is now a "layer", instead of each layer
having an animation. Incidentally, this is much closer to how Ogre handles
animation states.

In the future, each layer will have a priority, which will be used to determine
which one affects a given bone group (which we currently only have one of).
 2013-05-10 03:08:07 -07:00
kpp
24d619d6b4 Changes the logic of WindowManager::messageBox() 
Fixes removeItem
Fixes addItem
 2013-05-10 14:06:25 +04:00
Chris Robinson
d5490b0f8f Fix an outdated comment 2013-05-09 23:07:50 -07:00
Chris Robinson
74ed1f73b4 Merge remote-tracking branch 'zini/master' into animations 2013-05-09 13:53:38 -07:00
Marc Zinnschlag
5c99f15ad3 Merge remote-tracking branch 'torben/aiescort' 2013-05-09 14:27:22 +02:00
Glorf
6417fa504e Fixed constness 2013-05-09 13:56:13 +02:00
Torben Carrington
4928c9d079 Removed sqrt function call (minor optimization thanks to Chris) 2013-05-08 20:47:31 -07:00
Torben Carrington
d20178dd56 Removed unnecessary std::cout messages 2013-05-08 20:05:45 -07:00
Torben Carrington
133964f0e4 AIEscort complete 2013-05-08 20:02:24 -07:00
Torben Carrington
c03dca47f5 AIEscort implemented and working - only touchups are needed. 2013-05-08 17:19:47 -07:00
Glorf
c605f15a15 Another weather cleanup 2013-05-09 00:36:58 +02:00
Torben Carrington
10840765d9 Framework - duration and pathing implemented, no waiting for follower yet. 2013-05-08 15:27:20 -07:00
Marc Zinnschlag
51067698a8 minor cleanup 2013-05-08 21:26:39 +02:00
Marc Zinnschlag
c80ffa0a16 Merge remote-tracking branch 'gus/AIFix' 2013-05-08 20:31:57 +02:00
scrawl
90b7df439f Fix image buttons 2013-05-08 13:55:15 +02:00
graffy76
cb9c82324c UserSettings system 2013-05-07 20:36:34 -05:00
graffy76
f6203cac2a update for master 2013-05-07 20:33:42 -05:00
Chris Robinson
8e38dc410f Allow loading multiple animation sources 
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
 2013-05-07 16:59:32 -07:00
gus
603af21715 little interface improvement 2013-05-07 19:42:21 +01:00
gus
a328a03bd3 more fix. Fargoth quest almost work as in vanilla now. 2013-05-07 19:35:10 +01:00
scrawl
301efb411e Fix exit crash 2013-05-07 19:15:28 +02:00
scrawl
8845c0cee1 Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera. 2013-05-07 17:38:24 +02:00
Marc Zinnschlag
0f29ab8cf9 fixed the interface of the adapter class 2013-05-07 14:19:02 +02:00
Marc Zinnschlag
f7f56a1a1f added a RefIdCollection to Data 2013-05-07 11:23:18 +02:00
Glorf
68f249e8f4 Small weather cleanup 2013-05-07 10:27:37 +02:00
Chris Robinson
e85bc8b2cd Only load one Nif for Animation objects 
This breaks quite a bit, but it's needed for the transition to using the
.kf files.
 2013-05-06 23:11:26 -07:00
Chris Robinson
6a3ba41170 Don't store camera nodes, we don't need them. 2013-05-06 21:46:11 -07:00
Chris Robinson
90e29c83c0 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2013-05-06 19:17:39 -07:00
scrawl
007a3cf9bd rename IInterface to Interface 2013-05-06 16:05:56 +02:00
scrawl
b5071ced23 Removed using namespace 2013-05-06 16:04:28 +02:00
scrawl
757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-06 15:35:38 +02:00
scrawl
c6edb0288a Remove unused file 2013-05-06 15:30:23 +02:00
scrawl
1315432322 Handle @# links in journal 2013-05-06 15:14:39 +02:00
Marc Zinnschlag
e9f1aac7bd added data structures for referenceable records 2013-05-06 14:11:55 +02:00
scrawl
d43adbaa7c Topic link fixes for russian version, thanks to greye for testing 2013-05-06 13:13:14 +02:00
scrawl
166eac2e25 Cleanup 2013-05-06 11:31:34 +02:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
scrawl
38c399a698 Fix duplicate sounds 2013-05-05 10:51:17 +02:00
scrawl
062ff189a2 Merge branch 'master' into memory 2013-05-04 23:04:33 +02:00