krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
5515 commits 35 branches 0 tags 65 MiB
Commit graph

3915 commits

Author SHA1 Message Date
Nathan Jeffords
44031ec3d7 fleshed out BSAArchive and DirArchive. 
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
 2013-01-09 08:53:27 -08:00
Chris Robinson
be74859f05 Avoid some unnecessary copying when calling addPartGroup 2013-01-09 08:03:28 -08:00
Marc Zinnschlag
6567bf38f8 Merge remote-tracking branch 'wheybags/master' 2013-01-09 17:01:47 +01:00
Chris Robinson
9fedaf18d6 Make some methods private 2013-01-09 07:55:55 -08:00
Chris Robinson
625a538f03 Combine part selection into a single loop 2013-01-09 07:43:10 -08:00
Emanuel Guevel
3e41a1118a GetDisposition: return calculated disposition instead of base disposition 2013-01-09 15:14:17 +01:00
Tom Mason
375961fe5e small fix 2013-01-09 13:27:12 +00:00
Tom Mason
b035a5aa4a beast races cannot equip anything they oughtn't to be able to equip 2013-01-09 13:18:05 +00:00
Chris Robinson
1e38e381a4 Use text keys for each animation 2013-01-09 03:30:55 -08:00
Marc Zinnschlag
649ae645f3 Merge remote-tracking branch 'blunted2night/bug_495_v2' 2013-01-09 12:12:41 +01:00
Chris Robinson
bb98542c5a Build separate animations for each group 2013-01-09 01:40:38 -08:00
Chris Robinson
e44729cd43 Make the text keys lower-case when extracting them 
I think it's safe to assume all text keys are treated in a case-insensitive
manner. So far the only known NiTextKeyExtraData records are for animation
keys, which effectively are.
 2013-01-09 00:17:42 -08:00
Jordan Milne
857bb42297 Create a separate scenemanager for each CharacterPreview instance 2013-01-09 01:44:15 -04:00
Nathan Jeffords
719663d86e added option to override the activation distance 
The command line option '--activate-dist <int>' can be used to override
the in game activation distance.
 2013-01-08 20:00:06 -08:00
Tom Mason
62a2ba1cc6 beast races cannot equip shoes/boots 2013-01-09 03:03:14 +00:00
Tom Mason
135f0870f7 in actionequip, was ignoring actor param, and always using player 2013-01-09 02:16:17 +00:00
Nathan Jeffords
39d27b87c9 fixed build error with Audiere coded enabled 2013-01-08 09:14:56 -08:00
Marc Zinnschlag
d4a9236ae5 hocking up dialogue sub view to a widget mapper 2013-01-08 14:59:40 +01:00
Marc Zinnschlag
c0fb46384c Merge branch 'master' into globals 2013-01-08 11:32:53 +01:00
Chris Robinson
9675a6d04a Merge remote-tracking branch 'zini/master' into animation2 2013-01-08 02:25:37 -08:00
Marc Zinnschlag
c6ff58d5b5 Merge remote-tracking branch 'scrawl/videoplayback' 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-08 11:17:19 +01:00
Nathan Jeffords
b3932e3dea added a separate activation distance for NPCs 2013-01-07 23:40:17 -08:00
Nathan Jeffords
b9fbd6ae4b Factored faced object lookups into MWRender::World 
* Renamed MWWorld::World::getFacedHandle to getFacedObject.
 * Changed it to return an object pointer
 * Updated clients to use return object directly.
 2013-01-07 23:38:08 -08:00
Nathan Jeffords
05dad29005 update MWWord::World to track distances while performing occlusion queries. 
This allows checking the activation distance against what is stored in GameSettings. Experimentation suggests that a second distance is required for NPCs.
 2013-01-07 23:11:15 -08:00
Nathan Jeffords
0108be2e4f updated MWWorld::PhysicsSystem::getFacedXXX functions 
* changed the names and return values to be consistent
 * made the distance to search a parameter
 * change the distance returned to world units instead of percentage of query distance
 2013-01-07 23:00:00 -08:00
Nathan Jeffords
86f691d3d5 split MWWord::World::update into multiple functions 2013-01-07 22:48:24 -08:00
Chris Robinson
2a9dc5ad94 Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist 2013-01-07 21:00:21 -08:00
Tom Mason
9ee823d8f8 fixed typo in vmformat.txt 2013-01-07 21:09:03 +00:00
Tom Mason
4c5ed43cc9 added removesoulgem, and fixed addsoulgem 2013-01-07 21:08:04 +00:00
Tom Mason
c2901fe6cc added addsoulgem scripting function 2013-01-07 18:16:50 +00:00
Chris Robinson
d8dbd5e206 Store text key iterators for the start and stop times 2013-01-07 05:56:03 -08:00
Chris Robinson
d3e949f5c6 Make the animation text keys lower case to help lookup 2013-01-07 05:23:44 -08:00
Chris Robinson
05dfafa777 Avoid an unnecessary lookup when moving the scene node 2013-01-07 05:09:15 -08:00
Chris Robinson
5f668976a8 Improve resetting the animation position 2013-01-07 04:48:59 -08:00
scrawl
f1b138d0a8 Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-07 13:25:15 +01:00
scrawl
c2b75e28e9 Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback 2013-01-07 13:20:50 +01:00
scrawl
282601d6e9 support the allowSkipping extra parameter for playBink command. 2013-01-07 13:19:52 +01:00
scrawl
35f4d09288 swscale handled better (cmake) 2013-01-07 13:06:16 +01:00
Marc Zinnschlag
2557ef4d7d post merge fixes and some misc clean up 2013-01-07 12:17:46 +01:00
Marc Zinnschlag
41767f8dfa Merge remote-tracking branch 'blunted2night/better_flicker' 2013-01-07 12:06:21 +01:00
Chris Robinson
648e3331f5 Don't try to move objects that aren't in a cell 2013-01-06 23:20:20 -08:00
Chris Robinson
921ae76ea9 Merge remote-tracking branch 'zini/master' into animation2 2013-01-06 21:20:49 -08:00
Chris Robinson
5b3a20ef69 Update the object position as the animation moves 2013-01-06 21:18:48 -08:00
Chris Robinson
910619eb21 Store the NonAccum animation root from the skeleton instance 
Currently this is assumed to be the node with the animation text keys.
 2013-01-06 17:31:53 -08:00
Chris Robinson
b96a979719 Store an MWWorld::Ptr with the Animation 2013-01-06 17:05:48 -08:00
Nathan Jeffords
0f3712f284 change flickering light's brightness pattern 2013-01-06 14:29:22 -08:00
Chris Robinson
2b1fe7dc44 Add part info for weapons and shields 2013-01-06 05:39:39 -08:00
Marc Zinnschlag
25815ab8f7 Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite' 2013-01-06 13:31:01 +01:00
Chris Robinson
976b042cca Use a list to reduce some repeating code 2013-01-06 02:14:19 -08:00
Chris Robinson
99769879e3 Fix some createEntities calls 2013-01-06 00:32:38 -08:00
Chris Robinson
efca5ded47 Clean up some header includes to reduce nesting 2013-01-05 21:12:08 -08:00
Emanuel Guevel
63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter 
Edit other files accordingly.
 2013-01-06 01:37:58 +01:00
Chris Robinson
58d35dbfcf Have createEntities' caller retrieve the text keys as needed 2013-01-05 04:01:11 -08:00
Chris Robinson
818a24cdd6 Hold on to the AnimationState being used for animating 2013-01-05 00:03:14 -08:00
Chris Robinson
6e84d4bcdd Add a helper method to load entity objects 2013-01-04 23:19:48 -08:00
Marc Zinnschlag
fbb59302d9 Merge remote-tracking branch 'blunted2night/loading_screen_fix' 2013-01-04 10:50:59 +01:00
Emanuel Guevel
67273fc177 mwiniimporter: use Utf8Encoder 2013-01-04 01:52:02 +01:00
Nathan Jeffords
9afe4467d8 cache results of query for spash screen names 
ResourceGroupManager::listResourceNames returns a list of all resource
accessable which is expensive, this change caches the result of the
processed query so additional splash screen changes are quicker.
 2013-01-03 15:45:09 -08:00
Mark Siewert
d6377fb2e3 - Support deleting references from a plugin 
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
 2013-01-03 18:51:04 +01:00
Marc Zinnschlag
b7b51f24d6 added new Role for table headers (Role_Display) 2013-01-03 11:20:25 +01:00
Marc Zinnschlag
0af7a2888a Merge remote-tracking branch 'scrawl/ai_script' 2013-01-03 09:56:36 +01:00
Marc Zinnschlag
25d9918765 post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++) 2013-01-03 09:55:48 +01:00
Marc Zinnschlag
c0260697c2 Merge remote-tracking branch 'scrawl/master' 2013-01-03 09:52:46 +01:00
Marc Zinnschlag
ce5d27b07b Merge remote-tracking branch 'scrawl/button_fixes' 2013-01-03 09:50:24 +01:00
scrawl
42e0501c67 fix typo 2013-01-03 02:40:21 +01:00
scrawl
a5ef669eb6 Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD 
Conflicts:
	apps/openmw/mwscript/aiextensions.cpp
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-03 02:34:31 +01:00
scrawl
ba7086cadf Use race/class names (instead of ID) in replaced escape sequences 2013-01-03 02:05:05 +01:00
scrawl
1718d735b5 Fix menu/journal/book/scroll buttons when using localised MW-installations 
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
 2013-01-03 01:09:03 +01:00
scrawl
ddbe13e569 Workaround for http://bugs.openmw.org/issues/475 2013-01-03 01:07:17 +01:00
Marc Zinnschlag
ff74f687fb Merge remote-tracking branch 'lazydev/master' 2013-01-02 16:04:44 +01:00
lazydev
04cca2a1ce fix for http://bugs.openmw.org/issues/517 2013-01-02 18:58:52 +04:00
Marc Zinnschlag
83fe128e87 Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft' 2013-01-02 10:05:27 +01:00
scrawl
86f30992d7 fix message boxes not appearing properly when e.g. trading 2013-01-01 22:00:14 +01:00
Emanuel Guevel
2a7336c310 mwiniimporter: handle ini file encodings 
Use components/to_utf8 to handle encodings.
Add an --encoding option for choosing between win1250, win1251 and
win1252 encodings for the imported ini file.
 2013-01-01 21:59:30 +01:00
Marc Zinnschlag
4a8bf40a83 Merge remote-tracking branch 'lazydev/master' 2013-01-01 20:45:09 +01:00
lazydev
7cd1e87fe8 Merge branch 'master' of git://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
 2013-01-01 22:18:21 +04:00
Emanuel Guevel
e9a464c9f7 mwiniimporter: remove fallback values for Cursors 2012-12-31 16:45:24 +01:00
Emanuel Guevel
e2b348de96 mwiniimporter: fix line ending problem 2012-12-31 16:44:22 +01:00
Marc Zinnschlag
65c7c7f60e Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft' 2012-12-31 14:47:05 +01:00
greye
7e0713f6c4 fix string case update 2012-12-31 11:22:40 +04:00
lazydev
cd5d95ed22 1. Dialogs in Russian version now works. 
2. Destination names it travel window are now translated
 2012-12-31 04:15:47 +04:00
Marc Zinnschlag
8b2785400b Merge remote-tracking branch 'trombonecot/comparestring' 2012-12-30 20:11:18 +01:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
Marc Zinnschlag
e577731a06 Merge remote-tracking branch 'scrawl/master' 2012-12-30 18:31:35 +01:00
scrawl
f56182cac2 fix journal window not rendering any text 2012-12-30 17:06:17 +01:00
Emanuel Guevel
cb71efc427 mwiniimporter: clean up 2012-12-30 16:44:52 +01:00
Emanuel Guevel
38e7dbb970 mwininimporter: add more fallback values 2012-12-30 16:43:05 +01:00
Marc Zinnschlag
714b1924a5 partial dialogue subview implementation 2012-12-30 14:01:52 +01:00
eduard
98103e15eb conflict resolution 2012-12-30 13:46:07 +01:00
eduard
fb25f407fb dialoguemanager conflict 2012-12-30 13:37:19 +01:00
eduard
c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 2012-12-30 13:09:37 +01:00
Emanuel Guevel
9d043d0193 mwiniimporter: fix string cutting 2012-12-29 18:16:03 +01:00
Emanuel Guevel
b2203d22fc mwiniimporter: added fallback values 
Ugly comments included. I will merge it on another branch to clean this
up later.
 2012-12-29 18:15:32 +01:00
scrawl
1dcc0f10ee Merge pull request #6 from ChrisKCat/videoplayback 
Videoplayback
 2012-12-28 15:28:58 -08:00
Marc Zinnschlag
8d4afe3bf5 post merge fix 2012-12-28 23:45:13 +01:00
Marc Zinnschlag
e2a8e2107b Merge branch 'globals' 2012-12-28 23:42:02 +01:00
Marc Zinnschlag
334588bf1c Merge branch 'editor2' 2012-12-28 23:31:43 +01:00
Tom Mason
bed8fb69e6 added bounty related scripting functions 2012-12-28 22:26:21 +00:00
Chris Robinson
1dd9276ceb Add missing decoder method declarations 2012-12-28 11:26:41 -08:00
scrawl
ade4ec0453 fix texture edge bleeding due to wrong addressing mode 2012-12-28 19:01:47 +01:00
eduard
c75a5ae212 string compare and tolower 2012-12-28 18:05:52 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00
Tom Mason
ad9b86058b replaced explicit text with GMST entries, thanks to zinnschlag 2012-12-27 15:28:13 +00:00
Tom Mason
ba2301a156 removed redundant code thanks to scrawl 2012-12-27 00:49:39 +00:00
Tom Mason
299a1f32ed cleanup 2012-12-26 23:52:16 +00:00
Tom Mason
51fce62b69 Merge branch 'messageboxes' 2012-12-26 23:06:27 +00:00
Tom Mason
716fbbbd74 messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory 2012-12-26 22:57:53 +00:00
Tom Mason
a14b7e4a0f small fixes on text defines 2012-12-26 18:07:56 +00:00
Marc Zinnschlag
afc2e840ae renamed namespace TranslationData to Translation 2012-12-26 17:06:33 +01:00
Marc Zinnschlag
206c613b52 moved translation storage from GUI manager to engine 2012-12-26 17:03:37 +01:00
Marc Zinnschlag
2d468fec02 made previous commits naming standard compliant 2012-12-26 16:19:59 +01:00
Marc Zinnschlag
4c28f3211b Merge remote-tracking branch 'lazydev/master' 2012-12-26 15:50:03 +01:00
Mark Siewert
8ccec17481 - Restore ability for plugins deleting records defined in parent files 
- Don't throw a runtime_error when trying to load a reference based on a deleted record (just a warning for now, should be closer to MW)
 2012-12-26 10:34:59 +01:00
Mark Siewert
049b0e66e0 - Restore ability to generate references in the same cell from multiple plugins 
- Disable some code related to deleting entries in the store so that it builds again
 2012-12-25 20:27:30 +01:00
lazydev
1f71395660 renaming of translation component; removing of C++11 features 2012-12-25 23:20:39 +04:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Tom Mason
8ac8fdff47 implemented all text defines except a few for keybindings that don't exist yet 2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 2012-12-20 23:16:34 +00:00
Chris Robinson
85850c7440 Fix DEFAULT_OUTPUT declaration 2012-12-18 10:43:04 -08:00
scrawl
64210e6efa Revert "New Game button" 
This reverts commit c5dd0e1968.
 2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb Revert "remove commandline switch for new game" 
This reverts commit 86671096ec.
 2012-12-18 19:09:08 +01:00
Chris Robinson
7b2c3e6cd3 Pass a proper PlayMode enum to playSound and playSound3D 2012-12-18 06:01:21 -08:00
Chris Robinson
3b7edae7c3 Don't hold a list of all sound sources 2012-12-18 05:19:32 -08:00
Chris Robinson
fe36cc1de7 Don't try to resume sound types that aren't paused 2012-12-18 04:35:24 -08:00
Chris Robinson
2f8daec379 Allow pausing only certain types of sounds 2012-12-18 04:19:35 -08:00
Marc Zinnschlag
1cf019a007 post merge fix 2012-12-18 12:36:26 +01:00
Chris Robinson
b4e36d4f31 Add a method to get the volume from the sound type 2012-12-18 02:01:04 -08:00
Chris Robinson
a5356e194e Allow specifying a type for the playTrack method 2012-12-18 01:35:20 -08:00
Chris Robinson
72ffceb206 Add type flags to the sound play mode 2012-12-18 00:57:57 -08:00
Chris Robinson
dd3e568a00 Set the sound properties at initialization 2012-12-17 23:35:20 -08:00
Chris Robinson
20321c4552 Keep track of the actual active sounds 2012-12-17 21:50:01 -08:00
Chris Robinson
d348435a1d Improve audio open error message 2012-12-17 21:09:57 -08:00
Chris Robinson
67485d3454 Store the AVStream in the decoder for easy referencing 2012-12-17 07:15:53 -08:00
Chris Robinson
4373218746 Fix audio stream check 2012-12-17 06:56:30 -08:00
Chris Robinson
58ab3407b7 Constify a couple fields 2012-12-17 04:17:06 -08:00
Chris Robinson
9e842a0bbb Fix for trying to play videos when not supported 2012-12-17 00:41:04 -08:00
Chris Robinson
26660110e5 Allow building the video player without ffmpeg (playVideo will always throw an exception) 2012-12-17 00:20:56 -08:00
Chris Robinson
06fd66e99d Move some fields to the class they're used in 2012-12-16 11:49:46 -08:00
scrawl
f0f521a4e0 enableRestMenu -> enableRest 2012-12-16 16:55:59 +01:00
Chris Robinson
9c805483b0 Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback 2012-12-16 07:17:06 -08:00
scrawl
86671096ec remove commandline switch for new game 2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968 New Game button 2012-12-16 16:05:31 +01:00
Chris Robinson
c92cde2be9 Properly flush packet queues when at EOF 
Note: the previous flush method was renamed to clear. Flushing a queue allows
consumers to retrieve queued packets, but not expect any more to come in.
 2012-12-16 05:50:20 -08:00
Chris Robinson
6bc526b74d Avoid another loop for decoding audio 2012-12-16 05:30:38 -08:00
Marc Zinnschlag
77852439ce moved ColumnBase and Column struct into a separate translation unit 2012-12-16 12:52:23 +01:00
Chris Robinson
254a623319 Remove a redundant check 2012-12-16 03:09:24 -08:00
Chris Robinson
dd20db5dc2 Remove the stream indices from the VideoState 2012-12-16 03:05:44 -08:00
Chris Robinson
3f6d36c712 Avoid double-setting the material texture 2012-12-16 02:19:19 -08:00
Chris Robinson
e9d833be03 Use the packet pts to calculate the decoder sample offset 2012-12-16 01:56:52 -08:00
Chris Robinson
0edc87825d Move audio_clock to the decoder where it's used 2012-12-16 01:17:58 -08:00
Chris Robinson
4561c22e2b More fixes for the audio clock 
The audio_clock for the decoder represents the end of the current packet, so it
needs to be adjusted back to match the position that's actually going to be
read next.
 2012-12-16 00:07:56 -08:00
Chris Robinson
1a771ae671 Merge the stream struct into the parent decoder 2012-12-15 23:46:32 -08:00
Chris Robinson
5fff1c4e47 Update the ffmpeg decoder to use avcodec_decode_audio4 2012-12-15 23:22:37 -08:00
Chris Robinson
5f4c33f896 Only store one packet at a time 2012-12-15 22:54:54 -08:00
Chris Robinson
9d86890d9d Only use one stream for the ffmpeg decoder 2012-12-15 22:13:19 -08:00
scrawl
a3bd3a40ca fix 2 unrelated leaks 2012-12-16 00:47:29 +01:00
scrawl
18623a5efe Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback 2012-12-16 00:43:34 +01:00
scrawl
edf18a7d6e change destruction order to fix crash on exit when a video is playing 2012-12-15 22:01:45 +01:00
Chris Robinson
c869444dcf Don't leak the IO context if avformat_open_input fails 2012-12-15 11:31:50 -08:00
scrawl
63e86555b6 use sample_aspect_ratio if available 2012-12-15 19:40:59 +01:00
scrawl
5ed04ae53e added black bars 2012-12-15 19:23:03 +01:00
Chris Robinson
e6d27cd6d0 Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback 2012-12-15 09:15:47 -08:00
Chris Robinson
9b3cf5c159 Use a looping thread to trigger refreshes 2012-12-15 09:14:58 -08:00
Chris Robinson
fa1ad381da Make sure packets are cleaned up properly 2012-12-15 08:42:54 -08:00
scrawl
7477345481 fixed video material 2012-12-15 17:10:21 +01:00
Chris Robinson
db23c8152e Only duplicate AVPackets as needed 
Packets that don't have a destruct method are using static memory, which will
only be valid until the next av_read_frame call. Otherwise, it's already
dynamically allocated and will remain valid.
 2012-12-15 07:47:03 -08:00
Chris Robinson
6008cf0d15 Remove unneeded video_current_pts field 2012-12-15 05:02:01 -08:00
Chris Robinson
da44141b95 Avoid creating extra texture unit states on the video material 2012-12-15 04:17:28 -08:00
Chris Robinson
d50698d7d1 Clean up the rectangle and scene node used for displaying the video 2012-12-15 04:01:52 -08:00
Chris Robinson
eb0e8d9e37 Simplify PacketQueue::get 2012-12-15 02:50:59 -08:00
Chris Robinson
b41a77648e Avoid re-reading the source sample to duplicate, to avoid pointer aliasing 2012-12-15 02:33:59 -08:00
Chris Robinson
62a995d492 Calculate audio sync once per read 2012-12-15 00:18:42 -08:00
Chris Robinson
32b0a5d96e Update the queued sample count immediately 2012-12-14 23:42:49 -08:00
Chris Robinson
cbdf6ad595 Move more stuff to where it should be, and improve cleanup 2012-12-14 09:07:59 -08:00
Chris Robinson
71ff90aaee Don't use sub-frame timing for the video clock 2012-12-14 08:42:37 -08:00
Chris Robinson
582efcdb9b Always try to resync if the clock difference is large 2012-12-14 07:40:19 -08:00
Chris Robinson
f97eaec7ab Consolidate some code 2012-12-14 07:29:58 -08:00
Chris Robinson
d66d8a3118 Don't assume we can write beyond the end of the sample buffer 2012-12-14 06:43:51 -08:00
Chris Robinson
7332ffb0f8 Let the wanted sample size go down to 0 2012-12-14 06:02:34 -08:00
Chris Robinson
05c6483257 Fix external clock 2012-12-14 04:35:57 -08:00
Chris Robinson
2f37d31108 Move some definitions into the source file they're used in 2012-12-14 04:12:34 -08:00
Chris Robinson
a6e627001a Avoid a for(;;) construct 2012-12-14 03:23:04 -08:00
Chris Robinson
4d6c05f6cc Tighten audio skew allowance 2012-12-14 03:19:32 -08:00
Chris Robinson
8db5d10f10 Avoid showing a video picture if we're late 
Ideally we should skip decoding, or at least YUV->RGB conversion, too.
 2012-12-14 03:11:59 -08:00
Chris Robinson
157cb10f56 Fix a 16-bit audio assumption 2012-12-14 02:39:46 -08:00
Chris Robinson
c2b711d195 Move some more methods to the class they're part of 2012-12-14 02:36:29 -08:00
Chris Robinson
26a09ee7ba Move some methods into their respective class 2012-12-14 01:38:00 -08:00
Chris Robinson
5221298a7f Move a couple packet queue methods into the struct 2012-12-14 01:14:14 -08:00
Chris Robinson
90294c589b Use a volatile bool for the refresh 2012-12-13 18:24:57 -08:00
Chris Robinson
f555dc60eb Reduce some indentation 2012-12-13 18:12:17 -08:00
Chris Robinson
6cedd64509 Fix audio sync correction sizes 2012-12-13 18:05:27 -08:00
Chris Robinson
e291d0943d Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback 2012-12-13 17:53:50 -08:00
Chris Robinson
606fb982a8 Update to use avcodec_decode_audio4 2012-12-13 17:53:22 -08:00
scrawl
82564e07c7 fix crash when video file doesn't exist 2012-12-14 01:44:00 +01:00
scrawl
27cd9ff732 Revert "Use the decoded frame pts when available" 
This reverts commit cab68df257.
 2012-12-14 01:03:49 +01:00
scrawl
9d6f656822 fixed ogre resource functions 2012-12-14 00:10:54 +01:00
Chris Robinson
43481ad117 Use the external clock by default 2012-12-13 06:11:32 -08:00
Marc Zinnschlag
f95e72166c hide type column in non-mixed type tables 2012-12-13 15:03:35 +01:00
Marc Zinnschlag
faa5ef0874 rewrote column class 2012-12-13 14:53:16 +01:00
Chris Robinson
0a5ab977b7 Use the decoder's sample offset for calculating the stream offset 2012-12-13 05:04:53 -08:00
Marc Zinnschlag
640c218df3 made record state uneditable again 2012-12-13 13:52:26 +01:00
Marc Zinnschlag
3d4c8c5444 added dialogue sub view (editing of a single record; not functional yet); fixed a bug in Universal to string conversion 2012-12-13 13:35:08 +01:00
Chris Robinson
cab68df257 Use the decoded frame pts when available 2012-12-13 04:25:41 -08:00
Chris Robinson
1ea1407707 Support quad, 5.1, and 7.1 with OpenAL and ffmpeg 
The other decoders don't guarantee any channel ordering, which makes them
useless.
 2012-12-13 04:10:19 -08:00
Chris Robinson
600494eed8 More cleanup of unused code 2012-12-13 03:37:04 -08:00
Chris Robinson
f7ff8b3374 A bit more cleanup 2012-12-13 03:13:44 -08:00
Chris Robinson
7e8b844b2e Clean up some unused code 2012-12-13 03:05:37 -08:00
Chris Robinson
d2fbae9760 Init and deinit the VideoState synchronously, and re-enable audio playback 2012-12-13 02:52:37 -08:00
Chris Robinson
f067b22b3f Use a recursive mutex for the OpenAL stream thread 2012-12-13 02:33:35 -08:00
Chris Robinson
ba9c5f5b4e Don't initially fill buffers in OpenAL_SoundStream::play 2012-12-13 02:32:21 -08:00
Marc Zinnschlag
02184526e6 moved two helper classes from view/world/table into a separate translation unit 2012-12-13 11:24:39 +01:00
Chris Robinson
1ffaf6625a Remove SDL for playing movie audio and prepare for using an audio track 
This breaks audio playback on movies
 2012-12-13 01:42:20 -08:00
Chris Robinson
779ced0889 Add a method to play an audio track with a custom decoder 2012-12-13 00:05:57 -08:00
Chris Robinson
1571243ef0 Implement getTimeOffset for OpenAL_SoundStream 2012-12-12 23:16:45 -08:00
Chris Robinson
86bf6388c6 Pass a decoder to the playStream sound output method 2012-12-12 22:32:02 -08:00
Chris Robinson
9c831d3039 Add a decoder method to get the "file" name 2012-12-12 22:19:44 -08:00
Chris Robinson
1fb9eef27b Detach the thread used for frame timing 2012-12-12 22:02:33 -08:00
Chris Robinson
34e36fb852 Add a method to get the time offset from sounds 2012-12-12 16:50:35 -08:00
Marc Zinnschlag
cc18b30e17 open sub view on double click in report view 2012-12-12 22:36:20 +01:00
scrawl
7fd9e1d212 Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2012-12-12 22:24:38 +01:00
scrawl
18d8c767bd fix a bunch of warnings, improved error handling, initialize texture to black 2012-12-12 15:15:55 +01:00
Chris Robinson
2c1eceb9f0 Add methods to pause and stop all playing sounds (and music) 2012-12-12 02:33:12 -08:00
Chris Robinson
973b5faf25 Keep track of all allocated sources 2012-12-12 01:32:16 -08:00
Chris Robinson
e82c4afd50 close SDL when closing the video, not after the video loop is finished 2012-12-12 00:36:52 -08:00
Chris Robinson
a62d5bbfe4 Sleep using the absolute time, so the thread creation doesn't add to the wait 2012-12-11 23:54:41 -08:00
Chris Robinson
c2e1595445 Treat paused sounds as still playing 2012-12-11 21:01:32 -08:00
Chris Robinson
2efdafecd9 Indentation fixes 2012-12-11 20:11:48 -08:00
Chris Robinson
277248cdcb Fix some "comparison between signed and unsigned" warnings 2012-12-11 19:43:07 -08:00
Chris Robinson
3519934f27 Add a missing return value 2012-12-11 19:36:04 -08:00
Chris Robinson
9e2d4f8b7c Avoid potential NULL dereference 2012-12-11 19:32:10 -08:00
scrawl
fe384a1600 pause 3d rendering while the video plays 2012-12-12 01:30:34 +01:00
scrawl
faad64b254 Esc cancels the video 2012-12-12 01:13:53 +01:00
scrawl
0ce5ade6d8 DataStreamPtr fix, indentation fixes 2012-12-11 23:06:06 +01:00
scrawl
c49966dd29 started over 2012-12-11 22:49:31 +01:00
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
 2012-12-11 22:28:23 +01:00
Marc Zinnschlag
c75563c184 report model and view 2012-12-11 15:35:47 +01:00
Marc Zinnschlag
2db930a5cf rewrote subview factory system 2012-12-11 13:22:43 +01:00
Marc Zinnschlag
0ed378dfb2 changed sub view factory method signature 2012-12-11 11:24:30 +01:00
Marc Zinnschlag
de4a03081c fixed skill level type in skill level up message 2012-12-10 11:04:21 +01:00
scrawl
e3dd3d565c fix 2 leaks 2012-12-10 00:59:39 +01:00
Marc Zinnschlag
832fc56d34 changed UniversalId to string conversion 2012-12-09 11:10:35 +01:00
Marc Zinnschlag
5f5addf052 fixed an enum 2012-12-09 00:12:24 +01:00
Marc Zinnschlag
9fe7ff9690 added mandatory ID check stage 2012-12-08 23:27:59 +01:00
Marc Zinnschlag
72623652e4 addded messages interface for operations/stages 2012-12-08 18:38:36 +01:00
Marc Zinnschlag
89b4497331 added missing edit locks for create/revert/delete 2012-12-08 18:15:00 +01:00
Marc Zinnschlag
6c18be39f0 added stage class 2012-12-08 17:53:45 +01:00
Marc Zinnschlag
8b7f342641 removed last remains of old verify implementation 2012-12-08 17:00:58 +01:00
Marc Zinnschlag
af9b48f4d3 added operations base class 2012-12-08 15:25:50 +01:00
Marc Zinnschlag
a2b4f43176 moved document state enum to a separate file 2012-12-08 14:44:03 +01:00
Marc Zinnschlag
0e7ba008ad another skill gain fix 2012-12-08 14:28:56 +01:00
Marc Zinnschlag
caaffd1ec2 handle persuasion records properly 2012-12-08 14:24:15 +01:00
Marc Zinnschlag
a70a5282f4 fixed an overzealous skill gain error check 2012-12-08 13:37:43 +01:00
Marc Zinnschlag
fdc7e93835 preliminary multi-threaded verify implementation (does not actually perfom any document verification yet) 2012-12-08 11:59:13 +01:00
Marc Zinnschlag
386eec51c1 some skill usage fixes 2012-12-07 11:36:38 +01:00
eduard
e50b9aca86 tradding skill use, spechcraft use 2012-12-06 20:58:33 +01:00
eduard
2d62649dc9 tradding skill use, spechcraft use 2012-12-06 18:30:19 +01:00
eduard
b2a0e4b1fd tradding skill use, spechcraft use 2012-12-06 18:19:35 +01:00
Marc Zinnschlag
1c80390bce Merge branch 'master' into editor2 2012-12-06 15:26:03 +01:00
Marc Zinnschlag
2b53cf6547 do not list actions in the pop up menu that do not apply to any of the selected records 2012-12-06 15:25:31 +01:00
Marc Zinnschlag
c12ee129f7 added delete command 2012-12-06 15:18:41 +01:00
Marc Zinnschlag
b41cc5e9e9 added revert command 2012-12-06 14:56:04 +01:00
eduard
ea8ee11ff7 tradding skill use 2012-12-06 14:25:53 +01:00
eduard
5332546541 tradding skill use 2012-12-06 13:58:52 +01:00
Marc Zinnschlag
8bcd7d8fb1 fixed a type in a script instruction 2012-12-04 20:56:45 +01:00
Marc Zinnschlag
f07b7d17cd improved exception handling 2012-12-04 20:43:47 +01:00
Marc Zinnschlag
8e1a2e3a13 Issue #474: adjust global variable pcrace 2012-12-04 10:58:43 +01:00
Marc Zinnschlag
5cd2fe00ab initialise blank global records 2012-12-03 22:16:02 +01:00
Marc Zinnschlag
8e93bfa607 turned the global class into a general purpose table subview class 2012-12-03 22:03:02 +01:00
Marc Zinnschlag
0a8b7602d3 fixed edit lock 2012-12-03 21:51:42 +01:00
Marc Zinnschlag
49d6239004 added pop-up menu with create record action 2012-12-03 21:44:16 +01:00
scrawl
7cc28c3eb9 Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback 2012-12-03 17:43:00 +01:00
scrawl
3106db0379 commented out debug output 2012-12-03 17:41:38 +01:00
scrawl
bc90c75176 more clean up, video played with correct speed, videos without sound working too (mw_credits.bik) 2012-12-03 17:33:02 +01:00
scrawl
a77d910aaf audio codec is opened, some cleanup 2012-12-03 16:44:41 +01:00
Marc Zinnschlag
db29e411c4 added merge functions; temporarily merge on document creation 2012-12-03 13:56:02 +01:00
scrawl
3db850a7d1 Don't crash if no loading screens are found 2012-12-03 05:45:04 +01:00
scrawl
ea2bbec76e better fix for bed activation 2012-12-03 05:32:12 +01:00
Tom Mason
a6fd369e4e Fixed wait window reappearing after sleeping 2012-12-02 22:10:47 +00:00
greye
682fd23aea fix wrong increment 2012-12-02 21:18:59 +04:00
Marc Zinnschlag
b25f2e88ce Issue #492: fixed double alchemy ingredients removal 2012-12-02 15:07:22 +01:00
Marc Zinnschlag
556d737f65 Merge remote-tracking branch 'trombonecot/windowformatting' 2012-12-02 14:36:36 +01:00
eduard
30d0e93cf4 Fix window formatting on tool tip with too log titles 2012-12-02 14:12:18 +01:00
eduard
7e7e6e2bcb Fix window formatting on tool tip with too log titles 2012-12-02 14:08:22 +01:00
scrawl
d432420a32 fix FindFFmpeg.cmake 2012-12-01 20:53:28 +01:00
Marc Zinnschlag
bd5e364ac1 display record state in table 2012-12-01 13:42:12 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-12-01 11:30:51 +01:00
Marc Zinnschlag
ec1f957e54 edit lock for sub views 2012-11-30 13:58:10 +01:00
rpopovici
7079b9062f add AI script functions 2012-11-30 02:16:16 +02:00
Marc Zinnschlag
8dd76b49af factored out table widget from globals sub view 2012-11-29 19:09:06 +01:00
Marc Zinnschlag
fd55c0cae2 record IDs are no longer handled as a special case 2012-11-29 18:56:28 +01:00
Marc Zinnschlag
4086b556d2 use commands for modifying globals 2012-11-29 16:05:28 +01:00
Marc Zinnschlag
8a09e03d5c global variable editing (no undo support yet) 2012-11-29 14:45:34 +01:00
scrawl
398eecc35e GetWeaponType fix 2012-11-28 02:51:46 +01:00
scrawl
00e46addc2 GetArmorType fix 2012-11-28 02:48:21 +01:00
scrawl
8e857587d7 fix a text coloring bug 2012-11-28 02:36:33 +01:00
scrawl
1def60dbe1 PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank 2012-11-28 02:15:34 +01:00
scrawl
9f720ccbc9 Merge branch 'master' of https://github.com/zinnschlag/openmw into scripting 2012-11-28 02:14:37 +01:00
scrawl
644dacf603 suggestion by Zini for SetDelete 2012-11-28 01:30:18 +01:00
Marc Zinnschlag
5eb0f489e2 Issue 476: fixed auto-move bypassing disabled player controls 2012-11-27 18:39:12 +01:00
Greendogo
8b18d195bd Update apps/openmw/main.cpp 
Edited the description for the --script-run switch.
 2012-11-27 04:50:49 -06:00
Marc Zinnschlag
92f70635a2 improved selection behaviour 2012-11-27 10:42:46 +01:00
scrawl
d6dd212ce8 GetWerewolfKills, ModScale, SetDelete, GetSquareRoot 2012-11-27 06:54:13 +01:00
Marc Zinnschlag
ef9575498f basic (non-editable) subview for global variables 2012-11-26 12:29:22 +01:00
Mark Siewert
b103426cf0 - Partially reimplement deleting objects defined in a parent esX file. 
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
 2012-11-25 19:07:16 +01:00
Mark Siewert
896ab44d1e - Add some updated files missing from last commit. 
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
 2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
 2012-11-25 14:12:44 +01:00
Marc Zinnschlag
1dd63e9fb6 Merge branch 'master' into editor2 2012-11-25 10:50:34 +01:00
scrawl
1ccad32877 GetWeaponType 2012-11-25 02:06:43 +01:00
scrawl
e68dc19256 GetCurrentTime, HasSoulGem 2012-11-25 01:54:37 +01:00
scrawl
0db48b29c7 GetSpellEffects, GetRace 2012-11-25 01:26:29 +01:00
scrawl
4b830e5c7a Merge branch 'scripting' of github.com:scrawl/openmw into scripting 2012-11-25 00:44:38 +01:00
Marc Zinnschlag
eece4226c0 basic sub view system (very incomplete) 2012-11-24 13:30:43 +01:00
Marc Zinnschlag
4c0dcd46a1 added UniversalId class 2012-11-24 11:01:53 +01:00
Marc Zinnschlag
019146756f minor documentation changes regarding future improvements and additions 2012-11-24 10:14:43 +01:00
scrawl
70aa7459f5 GetWeaponDrawn 2012-11-24 03:04:26 +01:00
scrawl
be82d1452f HasItemEquipped 2012-11-24 02:59:44 +01:00
scrawl
600ed5f38a GetAttacked 2012-11-24 02:48:53 +01:00
scrawl
50baf6dac7 moved to controlextensions 2012-11-24 02:45:25 +01:00
scrawl
a596d23203 GetArmorType 2012-11-24 02:38:10 +01:00
scrawl
d7811624d5 GetEffect 2012-11-24 02:15:55 +01:00
scrawl
e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 2012-11-24 02:02:49 +01:00
scrawl
10329c780d GetLocked 2012-11-23 21:31:10 +01:00
Marc Zinnschlag
a6c7f16a7b Merge remote-tracking branch 'scrawl/reputation' 2012-11-23 21:26:44 +01:00
scrawl
d418e21371 <Mod|Get><Flee|Fight|Hello|Alarm> 2012-11-23 21:14:32 +01:00
scrawl
9c170af30c SameFaction 2012-11-23 20:57:08 +01:00
scrawl
d54ed557bf Equip 2012-11-23 20:48:59 +01:00
scrawl
064cb80c0a fix wait dialog fading 2012-11-23 20:48:53 +01:00
scrawl
0af869c816 GetReputation 2012-11-23 20:22:51 +01:00
scrawl
eb29b1593b ModReputation, SetReputation 2012-11-23 19:56:45 +01:00
scrawl
f218ef2675 fix separator 2012-11-23 19:21:13 +01:00
scrawl
1d7e92b6b3 dialogue fixes 2012-11-23 19:05:40 +01:00
Marc Zinnschlag
303506d24b added new document function 2012-11-23 14:08:20 +01:00
Marc Zinnschlag
997386d873 implemented world verify function (doesn't do anything yet; mostly meant as a test for multi-operation interface) 2012-11-23 13:15:45 +01:00
Marc Zinnschlag
2fc183d595 added operations progress bar 2012-11-23 12:20:35 +01:00
Marc Zinnschlag
eaa58e0530 preparations for multiple parallel progress-type operations 2012-11-23 10:52:46 +01:00
Marc Zinnschlag
04158d03b0 clean up properly after closing a top level window 2012-11-23 10:30:14 +01:00
Marc Zinnschlag
03aacd3263 added progress tracking 2012-11-23 10:25:34 +01:00
Marc Zinnschlag
931eb08114 implemented edit locking (used during saves) 2012-11-23 00:51:04 +01:00
Marc Zinnschlag
5838929371 implemented a dummy save function (does not actually save anything) 2012-11-23 00:36:01 +01:00
Marc Zinnschlag
d7c63d4c74 track document modification state and display it in the top level window title bar 2012-11-22 23:42:17 +01:00
Marc Zinnschlag
d7af9fbec6 various fixes 2012-11-22 17:24:28 +01:00
Marc Zinnschlag
6643674b13 ESM tool fix 2012-11-22 17:23:25 +01:00
Marc Zinnschlag
8e546ebd30 added test command 2012-11-22 16:00:23 +01:00
Marc Zinnschlag
ed3d8b8ca2 added undo stack and undo/redo actions 2012-11-22 15:54:31 +01:00
Marc Zinnschlag
1ddcea1f07 display view indices in title bar 2012-11-22 15:25:16 +01:00
Marc Zinnschlag
789cecb9df added main menu and implemented new view function 2012-11-22 14:51:38 +01:00
Marc Zinnschlag
758371d7e4 implemented view/document closing 2012-11-22 14:10:23 +01:00
Marc Zinnschlag
9834bb3ad5 basic document handling 2012-11-22 13:30:02 +01:00
Marc Zinnschlag
9201baebf9 template fix 2012-11-22 10:19:11 +01:00
Marc Zinnschlag
c3cd6e8a8a new attempt at the editor 2012-11-21 17:31:18 +01:00
scrawl
c8562d8442 toggleCollisionBoxes actually does something useful now 2012-11-20 02:20:54 +01:00
Marc Zinnschlag
5d45bcd03a Merge remote-tracking branch 'trombonecot/master' 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-11-19 21:21:00 +01:00
eduard
4e4d15f8ac Failed action 2012-11-19 21:04:49 +01:00
scrawl
693eeabeca shiny: fix GLSL texture units when shaders were disabled 2012-11-19 13:55:26 +01:00
Mark Siewert
31fb715bd7 - Add support for moving existing references by plugin files. No cell changing yet. 
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
 2012-11-17 21:50:25 +01:00
eduard
82ea547ce4 Failed action 2012-11-17 18:17:08 +01:00
Mark Siewert
2175f13b67 - Add tracking for dependencies between plugins. 
- Add reference number mangling required for moving references around.
 2012-11-17 00:21:51 +01:00
scrawl
8ef3edd416 Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 2012-11-16 22:28:00 +01:00
scrawl
f5355e3e92 512x512 map, slightly faster 2012-11-16 22:26:00 +01:00
Marc Zinnschlag
a092deaee8 various fixes 2012-11-16 20:28:20 +01:00
Marc Zinnschlag
3dc013ceae Merge remote-tracking branch 'gohan/Gohan' 2012-11-16 20:15:58 +01:00
scrawl
dc67a547b0 global map explored overlay 2012-11-16 19:34:09 +01:00
marcin
51027c541e Feature #391 Dummy AI package classes 2012-11-16 18:38:15 +01:00
Marc Zinnschlag
9193f3b0ae implemented getCommon/BlightDisease script instructions 2012-11-16 13:32:40 +01:00
Marc Zinnschlag
89c7936534 fixed dialogue script error reporting 2012-11-16 12:47:09 +01:00
Marc Zinnschlag
fd5671e6db fixed argument lists for setpcfacrep and modpcfacrep 2012-11-16 12:45:07 +01:00
marcin
bed0280ba1 Feature #391 Dummy AI package classes 2012-11-15 22:33:50 +01:00
marcin
99ddc63e2c Feature #391 Dummy AI package classes 2012-11-15 22:32:15 +01:00
marcin
515419ae0b Feature #391 Dummy AI package classes 2012-11-15 22:22:44 +01:00
marcin
4b939c7521 Feature #391 Dummy AI package classes 2012-11-15 22:15:20 +01:00
Marc Zinnschlag
82d62eb95a Merge branch 'script' 2012-11-15 20:00:37 +01:00
Marc Zinnschlag
9669eed083 Issue #219: added last missing function filters 2012-11-15 20:00:27 +01:00
scrawl
aefde3f5bc Merge branch 'master' into globalmap 2012-11-15 13:21:24 +01:00
marcin
e6c8e1f0d7 Feature #391 Dummy AI package classes 2012-11-14 18:42:04 +01:00
marcin
698afbec3e Feature #391 Dummy AI package classes 2012-11-14 18:40:32 +01:00
scrawl
5f7d349126 several missing includes 2012-11-14 05:32:23 +01:00
Marc Zinnschlag
b046687f46 added PCFacRep script instructions 2012-11-13 16:11:03 +01:00
Marc Zinnschlag
2a1727d4c5 improved error reporting for dialogue scripts (enabled via --script-verbose) 2012-11-13 15:35:46 +01:00
Marc Zinnschlag
c621a9f7e4 added missing disposition script instructions 2012-11-13 14:29:00 +01:00
Marc Zinnschlag
8aa1fd921b fixed some stats related script instructions 2012-11-13 14:19:43 +01:00
Marc Zinnschlag
cbb0fd5792 Merge branch 'dialogue' 2012-11-13 10:04:08 +01:00
Marc Zinnschlag
409d15576b Merge remote-tracking branch 'greye/player-model' 2012-11-12 14:18:38 +01:00
Marc Zinnschlag
e2ccec99f0 Issue #219: added another missing PC stats filter 2012-11-12 14:02:49 +01:00
Marc Zinnschlag
586ac3f5c6 Issue #219: added some more stats filters; fixed two filters 2012-11-12 13:56:51 +01:00
Marc Zinnschlag
77ba8c5117 Issue #219: implemented rank requirement filter 2012-11-12 13:23:25 +01:00
scrawl
8e847fdc6e fix speechcraft skill increasing when persuade didn't succeed 2012-11-11 19:18:41 +01:00
Mark Siewert
42eefaf36f - Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). 
- Reference loader now (partially) supports MVRF tag.
 2012-11-10 21:43:41 +01:00
scrawl
11a8d5d70a Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 2012-11-10 21:19:41 +01:00
scrawl
7c22690116 Merge branch 'next' into globalmap 2012-11-10 21:19:10 +01:00
greye
623e00531d fix reentering race selection 2012-11-10 21:54:43 +04:00
greye
0d33d005a5 head/hair selection 2012-11-10 21:30:16 +04:00
greye
50867e8d87 fix gender selection update, main model visibility and couple of crashes 2012-11-10 19:57:50 +04:00
Marc Zinnschlag
75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 2012-11-10 15:44:44 +01:00
Marc Zinnschlag
7b1788b03b minor fix 2012-11-10 15:11:21 +01:00
Marc Zinnschlag
0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 2012-11-10 14:59:52 +01:00
Marc Zinnschlag
6dc2214502 Issue #219: more DialogueManager refactoring 2012-11-10 14:52:44 +01:00
Marc Zinnschlag
79706bf60f Issue #219: dialogue manager cleanup 2012-11-10 14:31:58 +01:00
Marc Zinnschlag
d24e3eec9f Issue #219: added filters for various player stats 2012-11-10 14:02:52 +01:00
Marc Zinnschlag
f8fcca64b6 Issue #219: Proper implementation of talked to PC filter 2012-11-10 13:31:10 +01:00
Marc Zinnschlag
7e8d4bb3c9 Issue #219: added various creature and NPC stats; implemented respective filters 2012-11-10 13:21:38 +01:00