scrawl
83cceeee72
Use the extended animation priority for Block animations, allow starting attacks during a block animation ( Fixes #2761 )
2015-07-15 16:43:11 +02:00
scrawl
cf14d1748c
Use the extended animation priority for Hit animations
2015-07-15 16:33:10 +02:00
scrawl
50db6ed396
Use the extended animation priority for weapon animations
2015-07-15 14:40:36 +02:00
scrawl
e93a578f23
Extend the animation priority system to one priority value per bone group / distinct blend mask
2015-07-15 14:18:31 +02:00
scrawl
335ef97cf5
Rename Animation::Group to Animation::BlendMask
...
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
2015-07-15 13:49:16 +02:00
Stanislav Bas
a1389b87ba
Return a correct index for a loaded record that was deleted
2015-07-14 23:31:16 +03:00
scrawl
355ef14d23
Merge pull request #665 from Koncord/master
...
Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt
2015-07-14 20:10:27 +02:00
Stanislav Bas
5e623a2a1d
Rework RefIdData code. Update the index map when a new record is loaded
2015-07-14 20:54:24 +03:00
Koncord
73731d27e9
Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt
2015-07-14 23:54:47 +09:00
Marc Zinnschlag
df027b3498
hooked up script subview buttons to bottom box (enables add and clone)
2015-07-14 13:52:48 +02:00
Marc Zinnschlag
cf1fb76bb4
fixed deleted button sensitivity state
2015-07-14 13:34:13 +02:00
Marc Zinnschlag
0860c27b03
improving consistency of subview layouts
2015-07-14 11:49:41 +02:00
Marc Zinnschlag
2202973c24
replaced the script subview status bar with a bottom box (including a status bar)
2015-07-14 10:05:45 +02:00
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
2015-07-13 23:36:25 +02:00
Stanislav Bas
b55a4999ca
Add NAME handling to DebugProfile and Filter records
2015-07-13 22:37:14 +03:00
scrawl
c4866bdfc6
Disable mipmaps for GUI textures
...
For some reason, the mipmap generator seems to be broken on Linux Intel graphics (works on Nvidia). This was breaking the scrollbar arrows, which are minified enough to show using a mipmap.
2015-07-13 19:13:26 +02:00
scrawl
dca4704b4b
Print exceptions in CharacterCreation::spawnDialog
2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a
Select the current resolution in resolution list on game start ( Fixes #2768 )
2015-07-13 18:00:41 +02:00
scrawl
5a0af772dd
Update README.md
...
- Remove "an attempt at". I think we are far enough into the project to say that the "attempt" has been successful, at least to a degree. ;)
- Added Current Status section.
- Added line about OpenMW-CS.
2015-07-13 17:40:03 +02:00
Marc Zinnschlag
fc6c14614b
added user settings option to toggle toolbars in single-record subviews
2015-07-13 12:52:18 +02:00
Stanislav Bas
71e5fc7f04
Remove INAM handling from InfoCollection
2015-07-13 11:27:32 +03:00
Stanislav Bas
c8c79dc1ef
Move ID loading into a separate method for Dialogue and DialInfo records
2015-07-13 11:26:23 +03:00
Marc Zinnschlag
749eff5259
renaming a few user settings categories
2015-07-13 09:42:16 +02:00
Stanislav Bas
74a055f3cc
Remove NAME and DELE handling from IdCollection
2015-07-13 10:40:11 +03:00
Marc Zinnschlag
d22f8703e5
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-13 09:09:01 +02:00
Stanislav Bas
42f9136141
Remove DELE and NAME handling from RefIdCollection and RefIdData
2015-07-12 15:22:51 +03:00
Stanislav Bas
c266315a35
Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)
2015-07-12 15:20:22 +03:00
Stanislav Bas
2ed182b144
Update to upstream/master. Resolve merge conflicts in MWWorld::Store
2015-07-12 12:01:18 +03:00
dteviot
ddeabcdfbe
Removed unused field that was giving compiler warning.
2015-07-12 17:15:41 +12:00
dteviot
e294cd95cd
extracted function playIdleDialogueRandomly()
2015-07-12 17:15:14 +12:00
dteviot
22059d68f6
Remove duplicated code.
2015-07-12 17:14:48 +12:00
dteviot
0b089a5564
extracted function evadeObstacles()
2015-07-12 16:38:36 +12:00
dteviot
1ef78b1e56
extracted playGreetingIfPlayerGetsTooClose()
2015-07-12 16:37:31 +12:00
dteviot
df421fce92
extracted function setPathToAnAllowedNode()
2015-07-12 16:35:15 +12:00
dteviot
b508846a64
Renamed mStoredAvailableNodes to mPopulateAvailableNodes.
...
Don't call getAllowedNodes() needlessly.
2015-07-12 16:32:48 +12:00
Stanislav Bas
adec0cb61d
Add removing of deleted Infos to Dialogue::clearDeletedInfos()
2015-07-12 00:19:04 +03:00
Stanislav Bas
e0983c815c
Some fixes for ESM Dialogues and Infos
2015-07-11 22:17:53 +03:00
Marc Zinnschlag
b97a4cee44
added button bar to script subview
2015-07-11 16:09:13 +02:00
Marc Zinnschlag
dacb93c57f
Merge remote-tracking branch 'scrawl/coverity_scan'
2015-07-11 11:53:43 +02:00
scrawl
0ed3e3e489
Fix cout/cerr mixup
2015-07-11 04:27:41 +02:00
scrawl
24ae1d5ace
Fix some issues found by coverity
2015-07-11 03:34:08 +02:00
scrawl
667c80fb2a
Add brackets around a correct expression to fix coverity warning
2015-07-11 03:34:08 +02:00
scrawl
ebdd5dc993
Fix code that I forgot to uncomment (thanks coverity)
2015-07-11 03:34:08 +02:00
scrawl
3d3b37324d
Change build targets again
2015-07-11 01:38:29 +02:00
scrawl
4b002863c8
Re-enabled a few build targets
2015-07-11 00:45:11 +02:00
scrawl
05400d469a
Merge remote-tracking branch 'upstream/master' into HEAD
2015-07-11 00:44:17 +02:00
Alexander "Ace" Olofsson
12f413ba9b
Don't instantiate specialized templates
...
This fixes the VS2012 build issue
2015-07-10 20:21:55 +02:00
Marc Zinnschlag
11d24fd23b
Merge remote-tracking branch 'maqifrnswa/patch-2'
2015-07-10 09:07:00 +02:00
Marc Zinnschlag
ba9a9d16bb
Merge remote-tracking branch 'scrawl/master'
2015-07-10 09:06:04 +02:00
Marc Zinnschlag
08d2b196bd
Merge remote-tracking branch 'ace/explicit-instantiation'
2015-07-10 08:58:53 +02:00