Marc Zinnschlag
c38812d026
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee
getBaseGold implemented in MWWorld::Class for NPC and Creature
...
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d
Gold Pool implemented for Vendors
...
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
2014-03-28 12:01:56 -04:00
Marc Zinnschlag
2c2106205d
Merge remote-tracking branch 'scrawl/master'
2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21
Bug #1224 : Changed fix to potentially allow for language independent saves
2014-03-27 22:32:42 +01:00
scrawl
4f852daf45
Don't play company logo when using --skip-menu
2014-03-27 19:59:33 +01:00
scrawl
f2cd37edd0
Play company logo movie
2014-03-27 19:51:48 +01:00
scrawl
5906d795c0
Refactored video player (now a MyGUI widget)
2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
2014-03-27 15:25:01 +01:00
Marc Zinnschlag
5c81f20f46
Merge remote-tracking branch 'rohitnirmal/load-weap-icon'
2014-03-27 14:57:55 +01:00
Marc Zinnschlag
ce792cf182
Merge branch 'light'
2014-03-27 14:39:40 +01:00
Marc Zinnschlag
50f1679a4c
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-27 13:40:06 +01:00
Jeffrey Haines
6896142db1
Trader Gold Reset Delay
...
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
2014-03-27 07:30:24 -04:00
Marc Zinnschlag
53c4878d52
fix for inconsistent case in topic records
2014-03-27 10:01:42 +01:00
Jeffrey Haines
2a8bf46607
Trader Gold Reset Delay
...
Implemented traded gold reset delay.
Note:
Traders gold pool is still in inventory.
2014-03-27 01:23:56 -04:00
Rohit Nirmal
e695890e01
Only update the icon if player is NOT unarmed, to avoid bad dereference.
2014-03-26 21:53:35 -05:00
Rohit Nirmal
bcacdc49af
Update weapon icon in HUD when save is loaded.
2014-03-26 21:08:31 -05:00
scrawl
27956f3624
Savegame dialog: Hide main menu after successful load
2014-03-27 02:36:21 +01:00
scrawl
e5e1e84c52
Ask for confirmation to exit OpenMW
2014-03-26 22:05:21 +01:00
scrawl
a5598e9c2e
Add Credits button to main menu (plays mw_credits.bik)
2014-03-26 21:38:57 +01:00
scrawl
23f4bbc5b0
Videoplayer: only pause previous sounds if there is an audio stream
2014-03-26 21:36:57 +01:00
scrawl
5562c78ac4
Ask for confirmation when selecting 'New Game'
2014-03-26 21:11:39 +01:00
scrawl
ecfaa41e93
Savegame dialog: use locale-aware datetime format
2014-03-26 20:56:39 +01:00
scrawl
53ba23e303
Fixes #1224 : Store class name instead of id in savegame header
2014-03-26 19:56:12 +01:00
scrawl
793649c854
ToggleAI: Report current status on toggle
2014-03-26 19:55:52 +01:00
scrawl
688415ce54
Play deathknockout/deathknockdown animations when appropriate
2014-03-26 18:55:16 +01:00
Marc Zinnschlag
ed524b2fd4
added bright lighting mode
2014-03-26 18:29:15 +01:00
Marc Zinnschlag
9746f8bd32
added night lighting mode
2014-03-26 17:59:42 +01:00
Marc Zinnschlag
fa29942b27
added day lighting mode
2014-03-26 17:47:56 +01:00
Marc Zinnschlag
d5506172e8
added lighting switching
2014-03-23 15:14:26 +01:00
Marc Zinnschlag
205354ba30
some ambient light cleanup
2014-03-23 13:40:56 +01:00
Marc Zinnschlag
1b6b4e3442
Merge remote-tracking branch 'slothlife/weather_save'
2014-03-23 08:36:45 +01:00
cc9cii
772a49b2a6
Just some notes for future maintenance.
2014-03-23 13:38:11 +11:00
scrawl
0a17245633
Refactored settings window
2014-03-22 19:02:14 +01:00
Marc Zinnschlag
87ae03b5d4
fix for previous commit
2014-03-22 16:39:24 +01:00
Marc Zinnschlag
6bd3b3ee78
include local variable state in saved games
2014-03-22 15:00:49 +01:00
Marc Zinnschlag
4d80bc009a
Merge remote-tracking branch 'scrawl/master'
2014-03-22 09:54:42 +01:00
scrawl
0c207f7212
Fix build error
2014-03-22 02:08:09 +01:00
scrawl
394284d0f8
Fixes #1209 : Tarhiel never falls
...
There are a few pitfalls with this code:
- Gravity is only considered when applying queued movement. Therefore, make sure to queue some movement every frame. (Could be refactored in the future?)
- The character controller never detects being in free fall (!World::isOnGround) unless movement has been applied.
2014-03-22 02:08:04 +01:00
Alexander "Ace" Olofsson
317f1e0b63
Update dialoguesubview.cpp
...
That doesn't work on Windows. (Are and/or allowed in C++ in any other compiler?)
2014-03-21 13:44:01 +01:00
Marc Zinnschlag
41fd94b160
compensated for different coordinate systems
2014-03-21 13:39:22 +01:00
Marc Zinnschlag
1e57d55717
update/close on deletion of reference/referenceable
2014-03-21 13:27:46 +01:00
Marc Zinnschlag
698fe8cce3
update preview title on changed referenceableID (preview for references only)
2014-03-21 12:52:46 +01:00
Marc Zinnschlag
58daf52a67
deal with empty and invalid referenceable ID fields
2014-03-21 12:44:06 +01:00
Marc Zinnschlag
1a9df4bc56
Merge branch 'preview'
2014-03-21 12:35:40 +01:00
Marek Kochanowicz
2a26ff2299
better fix
2014-03-21 12:13:54 +01:00
Marc Zinnschlag
fc8ae2b9b5
fixed encoding problems
2014-03-21 11:56:48 +01:00
Marc Zinnschlag
10ce47938b
update preview on reference/referenceable changes
2014-03-21 11:22:43 +01:00
Marc Zinnschlag
2128d3008c
Merge branch 'master' into preview
2014-03-21 08:12:06 +01:00
slothlife
6dce3e5186
Fixed include to use C99 header, not C++11 header
2014-03-21 01:33:11 -05:00
slothlife
6eab9c5179
Move weather state save/load to a new class
2014-03-21 01:19:40 -05:00
Rohit Nirmal
e3a9daf921
Play item sound when trying to sell a bound item, too.
2014-03-20 22:22:31 -05:00
Marc Zinnschlag
688e03a9d2
Merge remote-tracking branch 'sirherrbatka/Editor-Dialog'
2014-03-20 22:27:28 +01:00
Marek Kochanowicz
fbb619db73
…
2014-03-20 21:41:11 +01:00
Marek Kochanowicz
a692ce99fa
where was my mind…
2014-03-20 20:26:53 +01:00
Marek Kochanowicz
ccd5e549cd
moved buttons down
2014-03-20 19:53:03 +01:00
Marek Kochanowicz
832a10b2ac
solving problems
2014-03-20 18:40:10 +01:00
Marc Zinnschlag
1a1d52c513
fixed a column ID problem
2014-03-20 14:19:50 +01:00
Marek Kochanowicz
5c34823bb0
added some placeholder icons
2014-03-20 13:59:00 +01:00
Marek Kochanowicz
ad2f9a69a1
prevent deleting already deleted record
2014-03-20 08:59:04 +01:00
slothlife
1acd1bd913
Feature #1173 : Saved Game: include weather state
...
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
2014-03-20 01:25:52 -05:00
Rohit Nirmal
e4c4747a27
Play item sound even if merchant doesn't purchase it.
2014-03-19 20:08:01 -05:00
Marek Kochanowicz
ea9b6fa37e
view button
2014-03-19 12:01:36 +01:00
Marek Kochanowicz
8f3103ce65
added preview button
2014-03-19 11:43:25 +01:00
Marek Kochanowicz
6416ae90d2
Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/view/world/subviews.cpp
2014-03-19 10:23:15 +01:00
Marek Kochanowicz
010160d047
missed those :/
2014-03-18 20:56:55 +01:00
Marek Kochanowicz
c0b2b783cb
use more proper creators
2014-03-18 20:53:21 +01:00
Marek Kochanowicz
f3475f7ef5
Merge branch 'master' of https://github.com/zinnschlag/openmw into Editor-Dialog
2014-03-18 19:24:10 +01:00
Marek Kochanowicz
db774b02d7
clone and create buttons work
2014-03-18 09:36:22 +01:00
Marek Kochanowicz
95afca0558
delete record button
2014-03-17 19:28:41 +01:00
Marek Kochanowicz
7296b09357
revert button
2014-03-17 19:18:18 +01:00
Marek Kochanowicz
09ba547630
use tool buttons with icons
2014-03-17 15:35:36 +01:00
scrawl
128a47570e
One more fix
2014-03-17 14:15:52 +01:00
scrawl
4443e22387
Build fix
2014-03-17 13:32:13 +01:00
scrawl
c8c0e5de38
Fixed code issues found with unity build. Missing include guards, duplicated functions, ...
2014-03-16 23:49:06 +01:00
scrawl
81dfc26d26
mwscript/locals was added twice
2014-03-16 21:39:46 +01:00
Marc Zinnschlag
20ea859aac
adjusted the far clip distance
2014-03-16 17:14:44 +01:00
sirherrbatka
3c8eeb8c48
added comment
2014-03-16 17:11:13 +01:00
Marc Zinnschlag
6b11265fbc
consider scale and orientation when previewing reference
2014-03-16 17:06:45 +01:00
Marc Zinnschlag
48ea93d890
less random camera start position
2014-03-16 17:06:30 +01:00
sirherrbatka
4a0d1ba272
do not cast and check multiple times
2014-03-16 17:06:11 +01:00
Marc Zinnschlag
fa042a8aca
use proper title for reference prewview subviews (avoid internal ID)
2014-03-16 13:22:32 +01:00
Marc Zinnschlag
8b36de6c67
Merge remote-tracking branch 'cc9cii/Slaughterfish-fix'
2014-03-16 12:57:38 +01:00
Marc Zinnschlag
afbdd84467
Merge remote-tracking branch 'cc9cii/AiWander-fix'
2014-03-16 12:47:30 +01:00
Marc Zinnschlag
c36dfef972
prewview subview
2014-03-16 12:44:01 +01:00
cc9cii
f71fb83bfc
Cleaned up more inaccurate comments.
2014-03-16 20:56:11 +11:00
cc9cii
f57c11254f
Revert to original variable names.
2014-03-16 20:09:18 +11:00
cc9cii
22c544d9d7
Remove unnecessary comment.
2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700
Apparently fall trace needs to be done with the middle of the object.
2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4
Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however.
2014-03-16 08:09:14 +11:00
scrawl
d08394bf78
Fixes #1205 : apparently creature and hand-to-hand (health) attacks should also level up armor skill (tested in vanilla)
2014-03-15 21:00:25 +01:00
scrawl
61955111f1
Fixes #1204 : Any health value < 1 should show as empty life bar.
2014-03-15 20:48:54 +01:00
scrawl
93c21b5ef2
Fixes #1197 : incorrect mouse wheel step
2014-03-15 20:34:12 +01:00
scrawl
3880247017
Fixes #1206 : effect texture override was not accounted for
2014-03-15 20:28:48 +01:00
Marc Zinnschlag
2fdf80bcbf
Merge remote-tracking branch 'gsedej/master'
2014-03-15 13:53:05 +01:00
cc9cii
e6977d00e8
Oops. Fix typo picked up by Zini.
2014-03-15 08:16:35 +11:00
cc9cii
b2e3fa70c2
Fix spelling errors in comments.
2014-03-14 07:04:39 +11:00
Marek Kochanowicz
4a623ace71
disabling works
2014-03-13 18:41:37 +01:00
Marek Kochanowicz
c97172d89c
fixed segfault and prevent drops from other documents
2014-03-13 17:00:14 +01:00
Marek Kochanowicz
e1a4b64efb
fixed segfault
2014-03-13 16:50:04 +01:00
cc9cii
d54ae58ec9
Bug #900 fix - minor update to comments
2014-03-14 00:09:03 +11:00
cc9cii
d92740efc9
Bug #900 fix - only fixed AiWonder, AiCombat, AiTravel and others may need a different strategy to this.
2014-03-13 23:44:52 +11:00
Marc Zinnschlag
7bc97fb8b8
reworked code for player positioning on startup and new game
2014-03-13 13:19:32 +01:00
Marek Kochanowicz
dd755a00e4
fix for the bug (?)
2014-03-13 08:52:37 +01:00
Marek Kochanowicz
cc1ceb35ce
drag and drop works
2014-03-12 20:34:55 +01:00
Marek Kochanowicz
fd4829141d
succesfully connected the signals
2014-03-12 19:55:51 +01:00
Marek Kochanowicz
1bf67e7390
added the new qlineedit subclass
2014-03-12 19:36:46 +01:00
Marek Kochanowicz
30a0c82e22
this code segfaults, but i don't know why
2014-03-12 16:28:10 +01:00
Marek Kochanowicz
919065db32
fixed segfault
2014-03-12 16:06:59 +01:00
Marek Kochanowicz
d1290ac556
skip deleled or erased records
2014-03-12 15:46:27 +01:00
Marek Kochanowicz
2278eb5e91
handle locking
2014-03-12 15:17:49 +01:00
Marek Kochanowicz
1a9d4204d2
correction
2014-03-12 15:07:17 +01:00
Gašper Sedej
43a12fffd5
indentation issue...
2014-03-12 14:37:44 +01:00
Marek Kochanowicz
2e226e63b6
change universalid of base subview after pressing next or prev
2014-03-12 13:04:40 +01:00
Gašper Sedej
d72a2f1ffb
Added code to test if git hash is availible
2014-03-12 12:33:42 +01:00
Marek Kochanowicz
cb9bcc3cc1
buttons are functional
2014-03-12 12:25:37 +01:00
scrawl
0cd40294a2
Fixed ranged combat for creatures
2014-03-12 11:30:44 +01:00
Marek Kochanowicz
299b7a6ce6
Added buttons, they don't do anything.
2014-03-12 11:08:04 +01:00
Gašper Sedej
06e02ed77f
Added version and revision number to mainmenu
2014-03-12 10:53:56 +01:00
Marek Kochanowicz
8d50af547a
created editwidget
2014-03-12 10:39:28 +01:00
Marek Kochanowicz
865e6b52ae
scroll area
2014-03-11 21:21:05 +01:00
Marek Kochanowicz
c422dc6eed
Refactorisation.
2014-03-11 20:40:31 +01:00
Marek Kochanowicz
5ad572346b
referencables also work now
2014-03-11 13:02:25 +01:00
Marek Kochanowicz
1edf5a4414
registered additional subviews.
2014-03-11 10:47:30 +01:00
Marek Kochanowicz
87286232d7
fixed bug, god bless overloading
2014-03-11 09:38:53 +01:00
Marek Kochanowicz
a25271f0b6
moving bloat away from the dispatcher
2014-03-11 09:14:13 +01:00
Marc Zinnschlag
ef1364878f
moved test cube from SceneWidget to WorldspaceWidget
2014-03-10 18:35:49 +01:00
Marek Kochanowicz
17b521cec8
additional check
2014-03-10 17:57:40 +01:00
Marek Kochanowicz
f4614c2c63
use qlabels for not editable fields
2014-03-10 17:52:45 +01:00
Marek Kochanowicz
089732419a
introduce longString
2014-03-10 17:18:29 +01:00
Marek Kochanowicz
cc96a38921
use qlinedit for the var
2014-03-10 13:27:52 +01:00
Marek Kochanowicz
874847c959
handle color
2014-03-10 13:25:01 +01:00
Marc Zinnschlag
7812427836
added Preview submenu item; fixed View issues regarding exterior cells
2014-03-10 12:44:34 +01:00
Marek Kochanowicz
73cb3ac0ed
embelishing
2014-03-10 12:04:03 +01:00
Marek Kochanowicz
361bc55973
dont force trying display
2014-03-10 09:47:41 +01:00
Marek Kochanowicz
9ab920bd80
display id and other not editable data
2014-03-10 09:37:53 +01:00
Marek Kochanowicz
b2fdaa74b0
trying to set the size policy
2014-03-09 18:44:04 +01:00
Marc Zinnschlag
2b17f5dde9
register resources locations on editor startup
2014-03-09 12:32:21 +01:00
Marc Zinnschlag
2de862126a
moved resources group creation from Engine to bsa component
2014-03-09 11:42:39 +01:00
Marek Kochanowicz
7eb10756d4
some extra views enabled
2014-03-09 08:58:24 +01:00
scrawl
6eaa7553f8
Fixes #1181 : Enable controls when loading a savegame
2014-03-09 03:34:49 +01:00
Sandy Carter
72a3c50eb8
( #1191 ) Disallow picking up if inventory disabled
...
Check if window manager has allowed the inventory window
if not, then items should not be possible to pick up
2014-03-08 13:45:54 -05:00
Marek Kochanowicz
0447be7e7a
register extra views. do not display id
2014-03-08 17:24:00 +01:00
Marek Kochanowicz
1f1774b5e1
changing the enumdelegate seteditordata
2014-03-08 16:54:05 +01:00
Marek Kochanowicz
9612c6a6fd
handle also bool boxes
2014-03-08 16:50:42 +01:00
Marek Kochanowicz
08ccae6b49
handle comboboxes
2014-03-08 16:21:49 +01:00
Marek Kochanowicz
a8b11829d4
disable not editable widgets
2014-03-08 15:18:40 +01:00
Marek Kochanowicz
3c60345d6b
nest wrapper into the proxy class
2014-03-08 15:15:00 +01:00
scrawl
072dc6d438
Feature #50 : Implement marksman mechanics.
2014-03-08 06:03:45 +01:00
scrawl
12de0afb03
Feature #50 : Spawn projectiles
...
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
2014-03-08 01:31:27 +01:00
Marek Kochanowicz
2e6b45dafb
edit view, savind works
2014-03-07 22:17:40 +01:00
Marek Kochanowicz
020e3f8fc5
Merge branch 'master' of https://github.com/zinnschlag/openmw into dialogoue3
2014-03-07 17:16:38 +01:00
Marek Kochanowicz
f0a45fa15f
just saved progress
2014-03-07 17:15:43 +01:00
cc9cii
f36bea03ab
Bug #1189 fix by scrawl
2014-03-07 19:36:44 +11:00
Marek Kochanowicz
b0ae78e889
basicly enabled code
2014-03-06 20:10:13 +01:00
Marc Zinnschlag
f1353dc84f
Merge branch 'scene'
2014-03-06 16:46:44 +01:00
Marc Zinnschlag
516a3b9abd
close interior cell view when cell is deleted
2014-03-06 16:40:08 +01:00
Marc Zinnschlag
0254a209f6
some general cleanup
2014-03-06 13:51:21 +01:00
Marc Zinnschlag
f04348fb8e
do not offer view action for cells flagged as deleted
2014-03-06 13:43:06 +01:00
Marc Zinnschlag
4a119c8f46
ambient lighting in interior cells
2014-03-06 13:02:21 +01:00
Marc Zinnschlag
7e0f0c8402
fixed SceneWidget destructor
2014-03-06 12:42:09 +01:00
Marc Zinnschlag
397921e457
specialising WorldspaceWdiget into paged and unpaged subclasses
2014-03-06 10:13:39 +01:00
Marc Zinnschlag
7386d3eb0b
moved navigation into the WorldspaceWidget
2014-03-06 10:01:23 +01:00
scrawl
e08f6c9ce3
Bug #416 : Copy framebuffer to a texture instead of not clearing
...
Potentially faster than the previous workaround, and should work for triple buffering too.
2014-03-06 04:01:25 +01:00
scrawl
83b6fcf22e
Bug #416 : Workaround for page flipping problem
2014-03-05 22:24:05 +01:00
scrawl
1d926816b5
Terrain: background load blendmaps & layer textures. Refactor QuadTree update.
2014-03-05 21:46:37 +01:00
scrawl
2a4e99c069
Set StaticGeometry origin
...
Fixes an exception for coordinates far away from (0,0,0).
2014-03-05 21:46:37 +01:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
scrawl
195071efc7
Terrain: geometry is now loaded in background threads.
...
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
2014-03-05 21:46:37 +01:00
scrawl
065b6d3331
Terrain: moved ESM::Land load to earlier in the startup procedure
...
Required for background loading as we cannot load ESM::Land data from background threads.
2014-03-05 21:46:36 +01:00
scrawl
8730b61362
Render maps after *all* cells have finished loading
...
Still not fixing Bug #772 , but at least this will allow for background loading of terrain.
2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f
Terrain: support alternate coordinate systems. Get rid of LoadingListener for now
2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
cc9cii
ce8d327e8e
Debug MSVC build of openmw needs number of sections beyond 2^16
2014-03-05 22:11:10 +11:00
gus
d84319300a
fix
2014-03-05 11:27:16 +01:00
gus
f4879dacd5
add AIfollow to summoned creatures
2014-03-05 11:24:39 +01:00
Marc Zinnschlag
a264e86e13
subclasses scene widget for worldspace scenes
2014-03-04 14:47:43 +01:00
Marc Zinnschlag
f9d2fde783
Merge branch 'openmw-29'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
Marc Zinnschlag
0ae9cc0106
removed unused function
2014-03-03 08:21:16 +01:00
Marc Zinnschlag
26c2f28879
replaced global world->scene menu item with individual view context menu items in cell and reference tables
2014-03-02 22:43:44 +01:00
Marc Zinnschlag
55195f819a
changed edit requests from row index format to UniversalId/hint format
2014-03-02 22:34:41 +01:00
Marc Zinnschlag
797f5527ee
added hint parameter for UniversalId viewing requests
2014-03-02 13:29:02 +01:00
Marc Zinnschlag
cb3994281c
changed UniversalId::Type_Scene from index to string ID argument (argument is the worldspace)
2014-03-02 13:11:15 +01:00
Marc Zinnschlag
ca30f2af3d
minor fix
2014-03-02 11:03:37 +01:00
Marc Zinnschlag
536a0e0ab0
added orbit navigation mode
2014-03-01 14:15:04 +01:00
scrawl
a99aa15d14
Fix a copy&paste mistake leaving start rotation uninitialized
2014-02-28 17:23:58 +01:00
Marc Zinnschlag
4d3abeedcb
keep camera upright in 1st person mode
2014-02-28 13:37:01 +01:00
Marc Zinnschlag
ae637d6abc
rolling
2014-02-28 11:58:03 +01:00
Marc Zinnschlag
0926501717
Merge remote-tracking branch 'cc9cii/branch_0_29_fixes' into openmw-29
2014-02-27 15:45:45 +01:00
Marc Zinnschlag
4eea2c7a86
added free navigation mode
2014-02-27 15:42:59 +01:00
Marc Zinnschlag
c977b2a756
moved implementation of the 1st person camera into a separate file
2014-02-27 15:23:14 +01:00
Marc Zinnschlag
14c3bfcf62
added navigation class
2014-02-27 14:46:06 +01:00
cc9cii
56ae85df0c
Fix 32bit Windows crash while taking the save screenshot.
2014-02-28 00:28:02 +11:00
cc9cii
8fa88f4480
sync with upstream
2014-02-28 00:13:57 +11:00
cc9cii
2421f23c2f
cleanup the mess...
2014-02-27 23:59:23 +11:00
Marc Zinnschlag
8f73cc9268
added navigation mode selection
2014-02-25 14:59:46 +01:00
Marc Zinnschlag
526d75df51
inverted ctrl key
2014-02-25 14:30:38 +01:00
Marc Zinnschlag
644f5cb8de
fixed mouse button release detection
2014-02-25 14:28:55 +01:00
Marc Zinnschlag
e33bd4d508
camera rotation via ctrl-left button drag
2014-02-25 14:24:35 +01:00
Marc Zinnschlag
e987199949
getting rid of some magic numbers
2014-02-25 14:14:53 +01:00
Marc Zinnschlag
07d20a2013
camera panning via left button drag
2014-02-25 14:09:07 +01:00
Marc Zinnschlag
b9107addc0
mouse wheel zooming
2014-02-25 13:39:49 +01:00
Marc Zinnschlag
b6ae521aa5
moving the camera with A and D keys
2014-02-25 13:31:15 +01:00
Marc Zinnschlag
af50575259
use shift key to speed up camera movement
2014-02-25 13:17:15 +01:00
Marc Zinnschlag
8081c067a6
moving the camera with W and S keys
2014-02-25 13:09:37 +01:00
Marc Zinnschlag
4ec4599be3
added navigation mode enum to SceneWidget
2014-02-25 12:30:45 +01:00
Marc Zinnschlag
6ec86564d1
re-enabled OGRE in OpenCS; cleaned up startup
2014-02-25 11:58:32 +01:00
cc9cii
5b48ca114f
aicombat pathfinding fix - check the correct list
2014-02-25 08:31:14 +01:00
cc9cii
85c467f00f
Minor cleanup for aicombat pathfinding workaround.
2014-02-25 08:30:52 +01:00
Nikolay Kasyanov
76c1d60d23
Fixed OpenCS build on OS X
2014-02-24 15:59:05 +01:00
Marc Zinnschlag
c62a352956
Merge branch 'cellstore'
2014-02-24 10:03:13 +01:00
Marc Zinnschlag
9b18e01507
keep track of which cells have state that needs to be saved
2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078
various bits of cleanup
2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0
encapsulated reference collections
2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f
moved CellRefList into a separate file
2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144
make Ptr a bit more pointer-like
2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58
encapsulated water level
2014-02-23 17:34:18 +01:00
gus
95ff869163
Merge branch 'openmw-29' of https://github.com/zinnschlag/openmw.git into AIFix2
2014-02-23 17:07:49 +01:00
Marc Zinnschlag
79e723ad06
encapsulated mIds
2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8
encapsulated mState
2014-02-23 14:26:36 +01:00
cc9cii
1bd2664cb0
aicombat pathfinding workaround
2014-02-23 11:47:25 +01:00
cc9cii
1ab5948f19
merge upstream changes
2014-02-23 19:11:37 +11:00
Marc Zinnschlag
b0ae5b8ab7
Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29
2014-02-22 17:16:55 +01:00
cc9cii
fcfc8fcccb
Revert "Allow MinGW64 compilation in Windows/msys"
...
This reverts commit c3f350e3fb
.
Conflicts:
libs/platform/string.h
2014-02-22 23:45:13 +11:00
cc9cii
ac606a865c
Back out unnecessary change.
2014-02-22 23:22:23 +11:00
cc9cii
c241405d91
Fix Windows save & load.
2014-02-22 12:15:20 +11:00
cc9cii
c3f350e3fb
Allow MinGW64 compilation in Windows/msys
2014-02-22 12:06:50 +11:00
Nikolay Kasyanov
59508e914f
Fixed OpenCS build on OS X
2014-02-22 01:17:58 +04:00
Marek Kochanowicz
e348c6baa9
accept drops from filters table. Cool. ☺
2014-02-21 13:50:59 +01:00
Marek Kochanowicz
e2dce53543
additional check on droping to prevent exception
2014-02-21 12:55:01 +01:00
Marek Kochanowicz
fcf17805a0
Installing basic event filter
2014-02-21 12:48:39 +01:00
Marc Zinnschlag
7693f712bc
started making CellStore into a proper class; encapsulated mCell member
2014-02-21 11:35:46 +01:00
Marek Kochanowicz
55e9083570
refactorisation
2014-02-21 10:27:23 +01:00
Marek Kochanowicz
1c35a85adf
fixed bugs, added extra display_type
2014-02-20 19:27:51 +01:00
Marek Kochanowicz
7dff34ebf1
Features implemented. Time to debug.
2014-02-20 19:15:09 +01:00
Marek Kochanowicz
3ad6df1f92
try with the passing action
2014-02-20 17:54:18 +01:00
Marek Kochanowicz
38a86b5015
We can handle droping multiple records
2014-02-20 16:01:54 +01:00
Marek Kochanowicz
b788ab8b4c
correcting
2014-02-20 14:10:03 +01:00
Marek Kochanowicz
4fe21dc38f
Const correctness
2014-02-20 12:43:09 +01:00
Marc Zinnschlag
736644de05
Revert " #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
...
This reverts commit 51fb9f65ea
.
2014-02-20 12:31:40 +01:00
Marek Kochanowicz
eb3cbaa4e1
Create filter on droping record.
2014-02-20 12:25:47 +01:00
Marek Kochanowicz
c7b3e139aa
Propagate signal to the edit widget
2014-02-20 11:07:04 +01:00
Marek Kochanowicz
fca7701359
Column titles retrived and passed to the filterbox.
2014-02-19 16:15:51 +01:00
pvdk
b43325119a
Some changes to the version retrieval: ignore shallow clones
2014-02-19 14:19:08 +01:00
Marek Kochanowicz
d7a1abb30b
emit signal with types (will be connected to the tablesubview)
2014-02-19 12:55:39 +01:00
Marek Kochanowicz
dd95ed8e4c
Accept drops on the filterbox
2014-02-19 12:32:48 +01:00
Marek Kochanowicz
569533eeae
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
2014-02-19 11:23:53 +01:00
scrawl
d25b3ad9cb
Fix AiCombat for creatures with weapons
2014-02-19 11:23:03 +01:00
scrawl
ebc67a82cf
Don't list unnamed quests in the quest book
2014-02-19 11:23:03 +01:00
scrawl
1fba5d1bb9
Terrain: change world bounds from AABB to 4 floats
2014-02-19 11:23:03 +01:00
scrawl
bc376e6649
Closes #888 : Treat "Bip 01" as animation root if existing
2014-02-19 11:23:03 +01:00
scrawl
439018e706
Get rid of useless return values
2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc
Moved includes to appropriate place
2014-02-19 11:23:03 +01:00
Marek Kochanowicz
e9664d80bd
make convert enumns public static
2014-02-19 11:22:47 +01:00
Marc Zinnschlag
550e5eb686
Merge remote-tracking branch 'corristo/osx-music-fix'
2014-02-18 09:12:02 +01:00
gus
d8f24ac499
bug fix
2014-02-17 15:49:49 +01:00
Marc Zinnschlag
ea16f79d77
Merge remote-tracking branch 'gus/AIFix2'
2014-02-17 10:54:07 +01:00
gus
84959eea28
woops, thanks scrawl
2014-02-17 10:50:10 +01:00
gus
6e1425321b
remove cout spam
2014-02-17 10:43:09 +01:00
gus
e5b19cf3c6
clean up
2014-02-17 10:37:11 +01:00
Marc Zinnschlag
02c6c65705
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-17 09:55:50 +01:00
Marek Kochanowicz
2bb9e47507
Improvements.
2014-02-17 08:58:55 +01:00
Nikolay Kasyanov
51fb9f65ea
#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()
2014-02-17 02:59:23 +04:00
Nikolay Kasyanov
5e8cb2e466
Another attempt to fix #1041 . This time I'm sending real data from decoder
...
once after playback started.
2014-02-17 02:35:13 +04:00
Marek Kochanowicz
e1a0f60041
allow _foo ids without qoute
2014-02-16 20:26:22 +01:00
Marek Kochanowicz
b83817e05e
May only include alphanumeric characters and underscores and may not start with a number.
2014-02-16 20:18:28 +01:00
Marek Kochanowicz
3cc23a9cb3
very basic, but safe putting down " "
2014-02-16 18:41:42 +01:00
Nikolay Kasyanov
4e28fd85a3
Fixed build on OS X
2014-02-16 20:22:46 +04:00
Marc Zinnschlag
c18c3e51ee
handle IDs that don't exist anymore after loading
2014-02-16 16:23:05 +01:00
Marc Zinnschlag
9788bbcab9
partially store creature state in saved game files (only attributes and dynamics for now)
2014-02-16 15:56:36 +01:00
Marc Zinnschlag
b0532e0c85
store NPC state in saved game files
2014-02-16 15:51:45 +01:00
Marc Zinnschlag
9f721fd144
store list of known topics in saved game files
2014-02-16 12:54:27 +01:00
Marc Zinnschlag
6ac64bbe15
Merge branch 'script'
...
Conflicts:
readme.txt
2014-02-16 12:12:56 +01:00
Marek Kochanowicz
17af865a9f
checking for the source of the drop, reject those from other files for now
2014-02-16 09:51:33 +01:00
Marc Zinnschlag
9cdfca6c26
Merge remote-tracking branch 'potatoesmaster/disable-crash'
2014-02-15 22:55:00 +01:00
Marek Kochanowicz
cbe1fe2f95
removed misplaced bracket
2014-02-15 22:38:59 +01:00
Marek Kochanowicz
45d9364195
Put the id in the quote.
2014-02-15 22:14:27 +01:00
Marek Kochanowicz
ec8c8a9d88
-journalinfo +topic
2014-02-15 22:05:42 +01:00
Marek Kochanowicz
41606a67e4
implemented whitelist of allowed types in the scripts
2014-02-15 20:49:09 +01:00
Marek Kochanowicz
930b77e60a
allow drag and drop into the script edit window.
2014-02-15 19:52:40 +01:00
Marc Zinnschlag
01a7918124
Merge remote-tracking branch 'potatoesmaster/selected-spell'
2014-02-15 18:38:10 +01:00
Marek Kochanowicz
97fe5465bf
created new files
2014-02-15 17:55:18 +01:00
Emanuel Guevel
3d8ca02479
Fix breaking of enchanted items casting
2014-02-15 17:39:57 +01:00
Marc Zinnschlag
0afa61eed5
fixed referenceable-loading in case of more than one content file
2014-02-15 15:50:17 +01:00
Marc Zinnschlag
2007a3e902
improved script check error messages
2014-02-15 13:25:38 +01:00
Marek Kochanowicz
56be62b956
small reformatting
2014-02-15 13:23:51 +01:00
Marek Kochanowicz
4ee90c24e5
more readable code.
2014-02-15 13:22:14 +01:00
Marc Zinnschlag
4e04131957
fixing case broke sorting in script context
2014-02-15 13:09:43 +01:00
Marc Zinnschlag
2130ec39d6
disable warnings by default in script verifier
2014-02-15 12:58:34 +01:00
Marek Kochanowicz
b1f63947e8
Checking if the drop comes from same document.
2014-02-15 12:40:07 +01:00
Marek Kochanowicz
d6820b977e
store const ref to the document in the table.
2014-02-15 12:22:32 +01:00
Marek Kochanowicz
f3dc45f1ec
long line split.
2014-02-14 15:29:10 +01:00
Marek Kochanowicz
37d262b147
Splited very long line.
2014-02-14 15:12:34 +01:00
Marc Zinnschlag
7b8802588e
Merge remote-tracking branch 'sirherrbatka/DragDrop'
2014-02-14 14:28:30 +01:00
Marek Kochanowicz
aafde926d3
Documentation, corrections.
2014-02-14 14:04:36 +01:00
Marc Zinnschlag
e17af4231a
added script verifier
2014-02-14 13:38:30 +01:00
Marc Zinnschlag
0ff744c2ff
fixed CSMWorld::ScriptContext::isJournalId
2014-02-14 12:56:05 +01:00
gus
a315d5cc2b
aiactivate works. Bug when you try to use it on a reference that doesn't exist. Need to clran up door.cpp
2014-02-14 12:55:14 +01:00
Marek Kochanowicz
ae418f2538
nicer formatting
2014-02-14 12:51:50 +01:00
Marc Zinnschlag
0a8ffbfb1d
added missing implementation for CSMWorld::ScriptContext::getMemberType
2014-02-14 12:46:54 +01:00
Marc Zinnschlag
910d62e4b8
added missing implementation for CSMWorld::ScriptContext::getGlobalType
2014-02-14 11:59:33 +01:00
Marc Zinnschlag
451e1f413b
instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly
2014-02-14 11:15:16 +01:00
Emanuel Guevel
7c981587fc
When searching object by id, search in active cells before searching in the player's inventory
2014-02-13 22:58:12 +01:00
Marc Zinnschlag
053b3dc371
Merge branch 'openmw-28'
...
Conflicts:
CMakeLists.txt
2014-02-13 20:57:28 +01:00
Emanuel Guevel
e597328b6b
Make enable/disable a no-op for items in containers
2014-02-13 20:24:27 +01:00
Marek Kochanowicz
40cc108e54
drag and drop works.
2014-02-13 20:19:51 +01:00
Marek Kochanowicz
1bcc6d6918
using new icon.
2014-02-13 19:14:17 +01:00
Marek Kochanowicz
2afe3f3e57
Introduced multitype icon.
2014-02-13 19:00:35 +01:00
Marek Kochanowicz
6662560cbc
new displays for referencable table columns
2014-02-13 15:43:19 +01:00
Marc Zinnschlag
d6e212a02b
Merge branch 'master' into script
2014-02-13 15:02:02 +01:00
Marc Zinnschlag
e9238b456d
use case-insensitive sorting in columns
2014-02-13 15:01:10 +01:00
Marek Kochanowicz
09d3c7a446
Attempt to match types. Does not work at the moment.
2014-02-13 13:54:09 +01:00
gus
7c6e27e4f9
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aitravel.cpp
2014-02-13 12:59:04 +01:00
Marek Kochanowicz
71b2fc1c70
Introduced method to access display type.
2014-02-13 10:55:31 +01:00
Marc Zinnschlag
9c52820754
Merge remote-tracking branch 'scrawl/master'
2014-02-13 10:54:51 +01:00
Marek Kochanowicz
5f3f867a10
Implemented convertEnums function
2014-02-13 10:21:49 +01:00
scrawl
c6fb0f2d9b
Removed terrain component's dependency on ESM
2014-02-13 10:13:53 +01:00
Marc Zinnschlag
dde4fbd818
allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away
2014-02-13 09:52:44 +01:00
Marc Zinnschlag
b3412b7eec
another case fix (remote member access again)
2014-02-12 15:22:17 +01:00
Marc Zinnschlag
dc433a3c09
fixed case handling problem for local variable access
2014-02-12 13:38:16 +01:00
Marc Zinnschlag
388735046f
fixed broken remote member variable access
2014-02-12 13:35:24 +01:00
Marek Kochanowicz
c142089bfe
Merge branch 'master' of https://github.com/zinnschlag/openmw into DragDrop
2014-02-12 13:13:32 +01:00
Marek Kochanowicz
c00834a8de
added some iostream garbage.
2014-02-12 13:12:58 +01:00
Marek Kochanowicz
8dfdd87a07
Merge branch 'DnD' of https://github.com/gugus/openmw into DragDrop
...
Conflicts:
apps/opencs/view/world/table.cpp
2014-02-12 12:12:53 +01:00
Marek Kochanowicz
62c9c77ddf
Compiles now.
2014-02-12 11:42:19 +01:00
gus
6cf561f713
get index to where we are dropping
2014-02-12 11:32:01 +01:00
gus
2e33ab3a13
droping somewhat works
2014-02-12 11:16:12 +01:00
Marek Kochanowicz
e1a39b8388
Replaced some display_string with specific type. Damn, i wish this is correct ;-)
2014-02-12 09:24:08 +01:00
Marek Kochanowicz
fc135fbfee
Added new Display types
2014-02-12 09:04:52 +01:00
Emanuel Guevel
8824af30b4
Allow to display message box outside of dialogue window
2014-02-11 18:26:57 +01:00
Marc Zinnschlag
ffd1783690
Merge remote-tracking branch 'mrcheko/master'
2014-02-11 17:03:50 +01:00
Marc Zinnschlag
e44a7268fc
Merge remote-tracking branch 'potatoesmaster/selected-spell'
2014-02-11 17:00:41 +01:00
Emanuel Guevel
a3eea4f6b6
Do not allow spellcasting stance without spell selected
2014-02-11 16:34:51 +01:00
Emanuel Guevel
70d35da116
Unset selected spell when removed
2014-02-11 16:34:23 +01:00
Emanuel Guevel
6a4820c0f7
Show a message when the player attempts to cast a disabled spell
2014-02-11 14:52:58 +01:00
Marc Zinnschlag
9de2922d22
fixed case problem in remote member variable access
2014-02-11 13:56:56 +01:00
Marek Kochanowicz
53e2e8415d
replaced start with exec
2014-02-11 12:25:21 +01:00
gus
df46218acc
try droping
2014-02-10 16:48:04 +01:00
Marc Zinnschlag
3b990795c4
added access to remote access of local variables of global scripts
2014-02-10 14:45:55 +01:00
gus
b5006c5dbd
compile fix
2014-02-09 15:33:00 +01:00
mrcheko
a6be72673c
improves animation-controlled velocity check
2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2
Fix lockpicks
2014-02-08 07:35:34 +01:00
scrawl
6ce499f0e6
Fixes #848 : Use hardcoded animation velocity for first person movement
2014-02-06 04:05:22 +01:00
scrawl
ff11d85a62
Fix wrong assertion
2014-02-06 03:15:01 +01:00
gus
632834ce10
WIP
2014-02-05 16:12:50 +01:00
scrawl
4a26909172
Fixes #1159 : Don't allow quick keys menu in chargen
2014-02-05 12:15:49 +01:00
Marek Kochanowicz
3b8f04c0f3
Allow multi-item drag.
2014-02-05 11:44:08 +01:00
Marek Kochanowicz
f01b02c42d
Changed format.
2014-02-05 11:24:33 +01:00
Marek Kochanowicz
76b729ac9b
Removed getUniversalid interface.
2014-02-05 11:19:55 +01:00
scrawl
677fc84223
Refactor actors update
2014-02-05 09:50:21 +01:00
scrawl
0cc1cd8f7e
Fix message box formatting bug
2014-02-05 05:18:11 +01:00
scrawl
7907181c0c
Fix uninitialized member
2014-02-05 05:18:11 +01:00
scrawl
ffe19e7a52
Feature #50 : Handle attach & release of projectiles
2014-02-05 05:18:11 +01:00
scrawl
8b8fb931a0
Feature #50 : Don't allow ranged weapon attack when ammunition is empty
2014-02-05 05:18:10 +01:00
scrawl
a07eaa0c0d
Feature #50 : Allow body pitch in third person for ranged weapon aiming
2014-02-05 05:18:10 +01:00
scrawl
5ee105c812
Fix typo
2014-02-05 05:18:10 +01:00
scrawl
7cf22391a5
Feature #50 : Handle weapon controllers (i.e. bowstring animations, etc)
2014-02-05 05:18:10 +01:00
scrawl
e1e7a492e2
Fix movement speed formula for flying creatures
2014-02-05 05:18:10 +01:00
scrawl
f608ceeffc
Fixes #1158 (Armor rating label issues)
2014-02-05 05:18:10 +01:00
scrawl
8aed4fcfa4
Correction for marksman weapon inventory preview
2014-02-05 05:18:10 +01:00
scrawl
5b076aa570
Revert "Bug #1074 : Inventory paperdoll obscures armour rating"
...
This reverts commit b017a3be3e
.
2014-02-05 05:18:10 +01:00
scrawl
df78357e05
Handle knockout separately ( Closes #1151 )
2014-02-05 05:18:09 +01:00
Marek Kochanowicz
04287cb87a
Provide method to return whole data vector from tablemimedata.
2014-02-04 19:42:52 +01:00
Marek Kochanowicz
8b799683c1
Display QPixMap with dragged object.
2014-02-04 18:48:18 +01:00
Marek Kochanowicz
3439940a8e
Tablemimedata able to handle vector of objects and return icon.
2014-02-04 18:38:31 +01:00
Marek Kochanowicz
423b2906be
Yes, you can drag. But not drop.
2014-02-04 11:40:48 +01:00
Marek Kochanowicz
dc80bfff55
Attempt to get basic tablemimedata subclass.
2014-02-04 09:13:40 +01:00
mrcheko
688f359a33
discard creatures speed and negative fatique changes
2014-02-03 23:09:26 +02:00
Marc Zinnschlag
c5b92ed6c8
Merge remote-tracking branch 'pvdk/versioninfo'
2014-02-03 11:21:11 +01:00
Marc Zinnschlag
21f502df34
compatibility fix
2014-02-03 11:20:55 +01:00
pvdk
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson
e50a393de4
Fix linking issues on Windows using MSVC.
2014-02-02 23:59:57 +01:00
pvdk
4e03e9cf87
Changed development version info text and the tooltip now works on all platforms
2014-02-02 20:10:47 +01:00
Marc Zinnschlag
32860a05e3
added dummy implementations for getPcInJail and getPcTraveling
2014-02-02 15:35:18 +01:00
mrcheko
761f13d3ce
activate whole-body attack animations
2014-02-02 16:29:51 +02:00
Marc Zinnschlag
914ab1b8ab
allow 'x' instead of 'getjournalindex x'
2014-02-02 15:08:27 +01:00
Marc Zinnschlag
4ee43612f6
added new switch: --script-warn
2014-02-02 14:09:59 +01:00
mrcheko
b85a4dd35e
pos accum without conformity with animation bug/creature speed
2014-02-02 15:01:49 +02:00
Alexander "Ace" Olofsson
e3d85af70a
Fix an issue with int32_t being unknown on windows.
2014-02-02 13:57:19 +01:00
Marek Kochanowicz
a36cc26434
Created new files for TableMimeData class.
2014-02-01 19:06:41 +01:00
scrawl
1deb0a7cdf
Savegame dialog: Set key focus to editbox
2014-02-01 18:42:01 +01:00
scrawl
ec46575671
Overwriting saves fixes - copy description of overwritten slot, ask for confirmation
2014-02-01 18:42:01 +01:00
scrawl
6d37cd7e86
Savegame dialog: Don't allow empty save names
2014-02-01 18:42:01 +01:00
scrawl
63284d21a0
Savegame dialog: 'Enter' while editing a name is equivalent to pressing the ok button
2014-02-01 18:42:01 +01:00
scrawl
dea9d21db6
Some additional safety checks for global map loading
2014-02-01 18:42:01 +01:00
scrawl
f89b3cac02
Feature #764 : Store the actor that gave the dialog response
2014-02-01 18:42:01 +01:00
scrawl
a988a0d6dc
Don't add duplicate topic responses to the journal
2014-02-01 18:42:00 +01:00
scrawl
37ef8ec908
Savegame dialog: support loading saves using Enter key or double-click
2014-02-01 18:42:00 +01:00
scrawl
49e26415be
Don't call loadGame() from within the MWMechanics::Actors update sequence
2014-02-01 18:42:00 +01:00
Marc Zinnschlag
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d
added creature/NPC state to saved games (only container/inventory for now)
2014-02-01 17:36:23 +01:00
Marc Zinnschlag
d2ec3ffdc8
handle equipped items when serialising inventory state
2014-02-01 17:31:05 +01:00
Marc Zinnschlag
bcc5894e2d
changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)
2014-02-01 15:24:01 +01:00
Marc Zinnschlag
dd674566a2
store content of containers in saved game files
2014-01-31 13:25:32 +01:00
scrawl
4ec86d1c68
Bug #1147 : Fix the inventory preview pose used for ranged weapons
2014-01-31 05:06:35 +01:00
scrawl
60bbab52fe
Support keyframe controllers for bones that aren't in the skeleton base
2014-01-31 05:06:34 +01:00
scrawl
da34f8bda1
Fix LastHitObject
2014-01-31 04:43:35 +01:00
scrawl
067c2bc2ec
Disable combat movements for creatures without weapons
2014-01-31 04:43:35 +01:00
scrawl
7820ea5806
"Always best attack" should only affect the player
2014-01-31 04:43:35 +01:00
scrawl
d0c6ecd03a
Bug #1148 : Workaround for broken images in some MW versions
2014-01-31 04:43:35 +01:00