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
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
scrawl
52f89e9a17
Don't play "idle" voice entries for NPCs with Hello 0
...
Not entirely sure if this is correct, but it prevents the NPCs in the starting boat from incorrectly playing them.
2014-01-31 04:43:35 +01:00
scrawl
39d86a9468
Improvements to smooth NPC steering
2014-01-31 04:43:29 +01:00
mrcheko
80d8aa4030
bug with sequence of knockouts; giving sense to some hit state code
2014-01-30 23:54:26 +02:00
Marc Zinnschlag
900532a6ca
store additional state of lights in saved game files
2014-01-30 12:37:33 +01:00
Marc Zinnschlag
ec7cb90ca4
added support for serialisation of CustomData state
2014-01-30 11:50:13 +01:00
scrawl
2b15b8b484
Fix gold bugs ( Fixes #1145 , Fixes #1146 )
2014-01-29 15:37:27 +01:00
scrawl
305e78c981
Fix creature attack bug
2014-01-29 15:37:27 +01:00
scrawl
e717694b36
Reset Run stance in AiWander
2014-01-29 15:37:27 +01:00
scrawl
23ffb8a4dc
Fixes #1143 : Make getCurrentAiPackage return the package that was run last, not the package that will be run in the next frame.
...
This makes the Mehra Milo script work properly.
2014-01-29 15:37:27 +01:00
scrawl
434fd21584
Don't set journal index if a higher index is currently set
...
This is vanilla behaviour, and required for the Mehra Milo vivec informants quest.
2014-01-29 15:37:27 +01:00
scrawl
edff88542b
Allow double click / Enter key for accepting race/class/birthsign
2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce
Don't crash when deleting or disabling a moving door
2014-01-29 15:37:26 +01:00
scrawl
190512156d
Use some more GMSTs for enchanting
2014-01-29 15:37:26 +01:00
scrawl
ea7e0abdc2
Move WhenStrikes skill success to a more appropriate place
2014-01-29 15:37:26 +01:00
scrawl
b8db151da7
Add missing skill increases for armor hits
2014-01-29 15:37:26 +01:00
scrawl
82146e7f8d
Use GMSTs for levelup
2014-01-29 15:37:26 +01:00
scrawl
cc40cec395
Move levelup to NpcStats
...
The code came from back in the days where NpcStats did not derive from CreatureStats.
2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8
Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail.
...
This caused an exception when looting a creature that had moved cells.
2014-01-29 15:37:26 +01:00
scrawl
365ae15532
Drag&Drop: auto-hide windows that can't be drop targets on mouseover
2014-01-29 15:37:26 +01:00
mrcheko
3a5da7e6e8
merged with master
2014-01-29 00:03:00 +02:00
mrcheko
5ee1dc6be8
attacktypes error fix
2014-01-28 21:07:26 +02:00
Marc Zinnschlag
1d34f5e096
Merge remote-tracking branch 'sirherrbatka/cloning'
...
Conflicts:
apps/opencs/model/world/refiddata.cpp
2014-01-28 12:40:14 +01:00
Marc Zinnschlag
a473c3f619
some cleanup
2014-01-28 12:36:10 +01:00
Marc Zinnschlag
fd5486864a
Merge remote-tracking branch 'gus/AIFix2'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/actors.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2014-01-28 12:33:31 +01:00
Marek Kochanowicz
2bd98a69ab
Corrections, according to the comments. Thanks for the review. :-)
2014-01-28 11:16:48 +01:00
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
2014-01-27 23:05:17 +02:00
mrcheko
fe0268062d
merge with master
2014-01-27 22:38:01 +02:00
Marek Kochanowicz
d3000ce099
whitespaces removed again.
2014-01-27 19:47:54 +01:00
Marek Kochanowicz
62ea0bb066
Cleared whitespaces.
2014-01-27 19:40:05 +01:00
Marek Kochanowicz
c82db915f1
Removed needless includes
2014-01-27 19:32:51 +01:00
Marek Kochanowicz
d0b07de7ef
Corrected bug mentioned by zini.
2014-01-27 16:59:18 +01:00
gus
846276f747
clean up
2014-01-27 15:14:24 +01:00
Marek Kochanowicz
ed0ba906cf
removed needless include
2014-01-27 15:05:29 +01:00
Marek Kochanowicz
9c579dbd6c
ok, that should be enough
2014-01-27 15:03:29 +01:00
Marek Kochanowicz
84e07c95b1
formatting
2014-01-27 15:02:29 +01:00
Marek Kochanowicz
51115fa5be
spaces around operators
2014-01-27 14:56:57 +01:00
Marek Kochanowicz
c91ae86084
is there something that can generate diff from two git branches? Using github for this is kinda annoying.
2014-01-27 14:53:39 +01:00
Marek Kochanowicz
52176d6435
reforfucking
2014-01-27 14:51:57 +01:00
Marek Kochanowicz
2b71568bb6
still reformating
2014-01-27 14:50:36 +01:00
Marek Kochanowicz
316debb827
reformating
2014-01-27 14:46:58 +01:00
Marek Kochanowicz
4d6fb31610
reformating
2014-01-27 14:45:07 +01:00
Marek Kochanowicz
2899f04a3f
reformatting
2014-01-27 14:43:12 +01:00
Marek Kochanowicz
6a0b5defd7
removed needless member value.
2014-01-27 13:42:08 +01:00
Marek Kochanowicz
bb62efc3d8
Removed pointless includes.
2014-01-27 13:36:01 +01:00
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
2014-01-27 13:27:42 +01:00
Marek Kochanowicz
71d6364754
Chaninging variables name to follow our policy.
2014-01-27 13:13:39 +01:00
Marek Kochanowicz
aa6d1ff4c3
removed needless argument for cloning
2014-01-27 13:08:14 +01:00
Marek Kochanowicz
be8b978a89
corrected mistake in data
2014-01-27 12:23:03 +01:00
Marek Kochanowicz
62c2259c87
removing coordinates handling
2014-01-27 10:10:23 +01:00
mrcheko
45b3aa3d93
corrected things connected to determining attack type
2014-01-26 23:32:57 +02:00
gus
f5d589388c
bug fix
2014-01-26 22:06:54 +01:00
gus
764011dd1b
clean up
2014-01-26 21:53:55 +01:00
gus
7cb47aa635
new implementation of pathfinding. Works, but need clean up
2014-01-26 21:26:19 +01:00
scrawl
eba6c9a8fd
Fix massive console spam regarding the scrib's idle3 animation
2014-01-26 02:49:32 +01:00
scrawl
b1066de81d
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit 4e360136b1047bbe43b2
2014-01-26 00:31:44 +01:00
scrawl
a1fbd1fcc8
Revert "Merge remote-tracking branch 'mrcheko/master'"
...
This reverts commit df7c139e2ffec26342cd
2014-01-26 00:14:49 +01:00
scrawl
e0de76a6f7
Save/load global map
2014-01-25 19:06:14 +01:00
scrawl
e62bf8fca9
Remove some garbage
2014-01-25 16:41:26 +01:00
scrawl
79a9c4e048
Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame.
2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2
Fix crash when loading another game after dying
2014-01-25 16:13:45 +01:00
scrawl
28185e2017
Death/godmode fixes: Revive player *after* character update, since there might be fall damage.
2014-01-25 15:54:24 +01:00
scrawl
f09328ca84
Clear global map overlay when starting/loading a game
2014-01-25 13:34:56 +01:00
Marek Kochanowicz
032c542396
improving the cell cloning.
2014-01-24 20:34:33 +01:00
gus
707e579dfe
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-01-24 19:16:50 +01:00
gus
5ca5946760
WIP
2014-01-24 19:13:23 +01:00
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-24 18:28:35 +01:00
scrawl
295aed3533
Implement savegame screenshots
2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b
Include some required Ogre headers explicitely
2014-01-24 15:02:34 +01:00
scrawl
ac1859fb77
Merge branch 'savedgame' of https://github.com/zinnschlag/openmw into savedgame
2014-01-24 15:02:13 +01:00
scrawl
9b9c39af7a
Fix being able to activate magic bolts mid-flight
2014-01-24 13:22:39 +01:00
scrawl
ac4c904e62
Fix projectile bug
2014-01-24 13:22:30 +01:00
Marek Kochanowicz
01be9386d6
Id to the coordinates with the boost and explicit specialisations of template member functions.
2014-01-24 11:22:20 +01:00
mrcheko
87e83a92f8
refactoring of setting an attack type
2014-01-23 23:14:20 +02:00
Marek Kochanowicz
f390c7f4b0
Disable widgets in the cell creator.
2014-01-23 16:24:03 +01:00
Marek Kochanowicz
c87d9ff38d
Disable reference creator widget when in the clone mode.
2014-01-23 16:17:04 +01:00
Marek Kochanowicz
dda7ddb6f8
Disable not needed referencable creator widget when in cloning mode.
2014-01-23 16:00:44 +01:00
Marek Kochanowicz
1b1ecafdd8
introduced missing columns to data
2014-01-23 15:13:37 +01:00
pvdk
19bef4fce8
Distinguish between release and development builds
2014-01-23 13:18:05 +01:00
scrawl
70264eae3b
Feature #764 : Quest completetion status in quest book
2014-01-23 13:08:56 +01:00
scrawl
849ee54399
Feature #764 : Show quest names in quest book if present
2014-01-23 12:54:37 +01:00
Marc Zinnschlag
460089c0aa
ignore deleted references that did not came from a content file
2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
2014-01-23 12:51:42 +01:00
scrawl
358cc3c62f
Closes #1060 : Fix incorrect message box size
2014-01-23 12:24:06 +01:00
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
2014-01-23 11:29:40 +01:00
Marek Kochanowicz
4d9d31b25e
refrences cloning does not work
2014-01-23 09:41:09 +01:00
pvdk
c354cd52be
Added compile date and time to the version info in the launcher
2014-01-22 18:37:49 +01:00
pvdk
fa186f5ec1
Added version information to the launcher
2014-01-22 17:51:10 +01:00
pvdk
c95b8bcb39
Moved the generated version header stuff into components
2014-01-22 17:33:55 +01:00
scrawl
cf378ec31e
Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors
2014-01-22 15:25:03 +01:00
scrawl
2e6e0fd0a0
Fix GetPcCell bug
2014-01-22 14:45:36 +01:00
scrawl
ea21d8fec3
Fix CreatureTargetted function
2014-01-22 13:30:45 +01:00
scrawl
4c94289b1f
Fix PC Health Percent function
2014-01-22 13:30:07 +01:00
scrawl
f27701cbe8
Detect selling stolen items or enchanting with stolen items
2014-01-22 13:04:55 +01:00
scrawl
264226dfe3
Handle iWereWolfBounty
2014-01-22 12:33:47 +01:00
scrawl
194413c955
Feature #1119 : Implement Resistance/Weakness to normal weapons magic effect. Handle fWereWolfSilverWeaponDamageMult.
2014-01-22 12:26:53 +01:00
scrawl
f89c400305
Don't complain about greetings with no sound
2014-01-22 00:02:43 +01:00
scrawl
16f5f5862d
Feature #956 : Implement blocking melee attacks
2014-01-21 23:25:24 +01:00
Marek Kochanowicz
b3b51992ef
copying references.
2014-01-21 21:37:21 +01:00
Marc Zinnschlag
9ebe66e693
improved cleanup; failed loads will now drop back into the main menu instead of crashing
2014-01-21 14:50:58 +01:00
Marc Zinnschlag
0f60898517
adding missing cleanup for SoundManager
2014-01-21 14:13:13 +01:00
scrawl
82a07af72c
Fix typo (should be Strength, not Luck). Use GMSTs for strength damage.
2014-01-21 12:30:23 +01:00
scrawl
1617a4f7d9
Use fCombatDistance
2014-01-21 12:30:23 +01:00
scrawl
a4404054bb
Feature #1130 : Add race power spells for NPCs as well, not just the player
2014-01-21 12:30:23 +01:00
scrawl
5de8c7fe29
Feature #1130 : Add auto-calculated NPC spells
2014-01-21 12:30:23 +01:00
scrawl
851a7d5014
Feature #957 : Handle area effects for "on touch" range
2014-01-21 12:30:15 +01:00
Marek Kochanowicz
bc0130f8d8
do not double check if record is deleted
2014-01-21 10:35:08 +01:00
Marek Kochanowicz
9b56b6585b
Cloning works for referencables as well.
2014-01-21 09:43:02 +01:00
Marek Kochanowicz
7594bcf97a
Small refactoring.
2014-01-21 08:27:29 +01:00
Marek Kochanowicz
d0a52b7b24
mostly refreshing view.
2014-01-20 18:28:06 +01:00
Marek Kochanowicz
92ee252eef
Small correction.
2014-01-20 16:39:42 +01:00
Marek Kochanowicz
d82f272e05
Properly check if clone is deleted.
2014-01-20 16:17:49 +01:00
Marek Kochanowicz
5a52715701
implemented check for deletion. But it seems flawed.
2014-01-20 15:58:19 +01:00
Marek Kochanowicz
38636fab9a
added setId to adapter
2014-01-20 14:38:20 +01:00
Marek Kochanowicz
a45339bbe6
lower case in command, not in the collection
2014-01-20 14:14:59 +01:00
Marek Kochanowicz
33620a001b
Cloning works for single record type tables. Well, kinda.
2014-01-20 13:59:00 +01:00
scrawl
c8a9e9f7fa
Stop AiCombat when the target is dead
2014-01-20 13:54:10 +01:00
scrawl
42284603f7
Properly handle on target effects with mArea=0
2014-01-20 13:44:38 +01:00
scrawl
9cedd3bb2e
Fix spell area not displaying in tooltip
2014-01-20 13:11:34 +01:00
scrawl
205e8aa4e9
Feature #957 : Implement area magic
2014-01-20 13:11:29 +01:00
scrawl
ba5300b071
Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted.
2014-01-20 12:05:13 +01:00
scrawl
5dd3cfa09a
Loop projectile sounds
2014-01-20 11:50:52 +01:00
scrawl
df7c139e2f
Merge remote-tracking branch 'mrcheko/master'
2014-01-19 21:23:04 +01:00
scrawl
fec26342cd
Query the number of animation groups for death/hit animations, since they can vary a lot (argonian/khajiit, creatures, first person..)
2014-01-19 21:11:48 +01:00
mrcheko
339399f8b1
bug fix/logic fix/future suggestion
2014-01-19 22:09:51 +02:00
scrawl
05e75e1214
Closes #1127 : Fix for subtitles for idle dialogue appearing outside of hearing range
2014-01-19 20:54:05 +01:00
scrawl
bea161331c
Play 'hello' voiced dialogue entries in AIWander
2014-01-19 20:53:58 +01:00
Marek Kochanowicz
0ea2bb7c4c
Working on commands
2014-01-19 16:49:39 +01:00
scrawl
0adc0f56ed
Issue #777 : Consider weapons in Creature::hit
2014-01-19 16:13:16 +01:00
scrawl
9723263730
Bug #1126 : Tweak creature attack distance a bit (still no idea where this should come from)
2014-01-19 14:47:58 +01:00
scrawl
1a00f26390
Bug #1126 : Golden saints and many other creatures only have "Bip01 Head"
2014-01-19 14:33:41 +01:00
scrawl
4e360136b1
Merge remote-tracking branch 'mrcheko/master'
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2014-01-19 14:01:39 +01:00
scrawl
047bbe43b2
Don't complain about missing jump animations
2014-01-19 13:46:40 +01:00
scrawl
13646a651b
Issue #777 : Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
2014-01-19 13:32:58 +01:00
scrawl
198bb0de60
Issue #777 : Add CreatureAnimation variant for creatures with weapons/shields
2014-01-19 13:05:26 +01:00
Marek Kochanowicz
b3e45c55bc
progressing with the cloning
2014-01-19 11:44:47 +01:00
scrawl
589fbbd871
Issue #777 : Create InventoryStore for creatures with weapons/shields
2014-01-19 11:43:23 +01:00
scrawl
69ca03c308
Issue #777 : Move DrawState to CreatureStats. All creatures can cast spells, and some creatures have weapons.
2014-01-19 09:43:41 +01:00
scrawl
947b6c9645
kOgrePi unused
2014-01-18 22:16:31 +01:00
scrawl
4c0045b418
Bug #1109 : Do not reset water level when loading a plugin with no water level record (for real this time)
2014-01-18 21:11:12 +01:00
Marc Zinnschlag
14e64c180f
on load check player record for dangling ID references
2014-01-18 15:06:58 +01:00
Marc Zinnschlag
6584a01d01
reset reference to player NPC record during cleanup
2014-01-18 14:53:25 +01:00
mrcheko
969340d61b
fixed StartCombat script
2014-01-18 12:55:17 +02:00
scrawl
525ce2f042
Some cleanup - move definitions to implementation file
2014-01-18 10:52:16 +01:00
scrawl
c04a8afc8b
Make sure onPcEquip is also set for Equip script instruction
2014-01-18 10:51:52 +01:00
scrawl
9653355cf1
Feature #701 : Spawn levelled creatures in cells
2014-01-18 07:26:27 +01:00
mrcheko
df4df5b094
fixed weapRange for creatures/startcombat script(?)
2014-01-17 23:30:28 +02:00
scrawl
5049f3b134
Fix the group for creature attack animations
2014-01-17 20:18:35 +01:00
mrcheko
a11a6b616b
Merge remote-tracking branch 'upstream/master'
2014-01-17 21:00:55 +02:00
mrcheko
435bbdd530
one more mismatch fixed
2014-01-17 20:55:21 +02:00
mrcheko
46a4790cb1
final warnings removal
2014-01-17 20:33:49 +02:00
mrcheko
7df8273d71
fix for everybody
2014-01-17 20:01:15 +02:00
scrawl
3dcb292bc1
Do not soul trap creatures without a soul (which apparently exist)
2014-01-17 18:43:45 +01:00
mrcheko
5357f569e6
fix for scrawl
2014-01-17 19:36:22 +02:00
scrawl
149d77dedf
Feature #960 : Add knockdown and hit recovery for creatures
2014-01-17 17:41:16 +01:00
scrawl
9b32b1403b
Feature #960 : Implement Creature::hit
2014-01-17 17:19:08 +01:00
scrawl
228254c890
Handle creature attack animations in character controller
2014-01-17 16:31:27 +01:00
scrawl
c76a0448a3
Closes #1123 : Implement SlowFall magic effect
2014-01-17 15:47:34 +01:00
scrawl
27d0d9c592
Fix exception when clicking on statics when in the inventory window
2014-01-17 15:27:59 +01:00
scrawl
5fc38e7ac4
Don't use blood effects for fatigue damage
2014-01-17 15:20:28 +01:00
scrawl
c548dcee13
Quick keys menu: make sure selected spell still exists
2014-01-17 15:20:22 +01:00
Marc Zinnschlag
1b7697a4b2
handle missing player specific state during load/save
2014-01-17 13:07:57 +01:00
scrawl
805843d7ff
Closes #1086 : Implement blood effects
2014-01-17 11:27:13 +01:00
scrawl
240d96a0f1
Renamed AnimationValue to AnimationTime
2014-01-17 10:55:46 +01:00
scrawl
11394d83c5
Feature #1086 : Import blood models/textures in MWIniImporter
2014-01-17 10:55:46 +01:00
scrawl
ddc432c7ef
Fix stealing bug
2014-01-17 10:55:46 +01:00
scrawl
e410eb5273
Play 'Idle' voiced dialogue entries in AIWander. Tweak voice max distance.
2014-01-17 10:55:46 +01:00
scrawl
2836c7c927
Do not set owner when adding items to a container, as opposed to NPC/creatures
2014-01-17 10:55:46 +01:00
scrawl
fe66012bcd
Closes #1115 : Fix a bug causing number of AI packages to grow exponentially when adding an AI package. Not sure if adding the same package twice should even be allowed.
2014-01-17 10:55:46 +01:00
scrawl
f070d9966d
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-17 10:55:46 +01:00
mrcheko
f2ad1c18f2
fix merging problem/some logic fixes
2014-01-16 22:24:05 +02:00
Alexander "Ace" Olofsson
ddf72c06de
Update statswindow.cpp
...
Fixes a build issue on MSVC ('floor' : ambiguous call to overloaded function)
2014-01-16 12:09:50 +01:00
Marc Zinnschlag
c300cd9375
loading/saving of some player state (cell/coordinates and some other bits)
2014-01-16 12:03:23 +01:00
mrcheko
d5f794d4fb
update to combat ai behaviour
2014-01-15 22:56:55 +02:00
scrawl
ea8f60eddf
Implement movement speed formula for creatures. Still moving a bit too slow.
2014-01-15 16:30:16 +01:00
scrawl
d544551f61
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
...
Information provided by Hrnchamd.
2014-01-15 15:50:45 +01:00
scrawl
7534fc968d
Minor acrobatics fixes
2014-01-15 14:53:30 +01:00
scrawl
28a2585106
Unsheath weapon in AiWander
2014-01-15 14:53:29 +01:00
scrawl
dff67bb0b6
StopCombat: mark as non-hostile
2014-01-15 14:53:29 +01:00
scrawl
da3295d69c
Closes #1106 : Move stance to CreatureStats, since creatures also have separate run/walk animations.
2014-01-15 14:53:29 +01:00
scrawl
03b2e99802
Remove unused Combat stance
2014-01-15 14:53:29 +01:00
scrawl
d0500e8124
Some unneeded includes cleanup
2014-01-15 14:53:28 +01:00
scrawl
0c4b6ea89f
Minor fix
2014-01-15 14:53:28 +01:00
scrawl
a432661b8a
Minor correction
2014-01-15 14:53:28 +01:00
scrawl
de64c57179
Fix some typos and accidental commit
2014-01-15 14:53:28 +01:00
Marc Zinnschlag
bf1a37dc38
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
2014-01-15 14:29:54 +01:00
Marek Kochanowicz
6224344957
Being any idiot is hard.
2014-01-15 12:52:38 +01:00
Marek Kochanowicz
3d722ba104
Corrected brackets.
2014-01-15 11:59:11 +01:00
Marek Kochanowicz
fbcb1a14fc
ooops, using search id
2014-01-15 11:12:56 +01:00
Marek Kochanowicz
89d4a90c06
Localised version of morrowind will no longer spam false positives. Don't check diff, please.
2014-01-15 10:30:43 +01:00
Marek Kochanowicz
344cae8f99
added new entry to the context menu
2014-01-14 15:44:04 +01:00
greye
61707694e8
fix memory leak in AISequence
2014-01-14 16:22:50 +04:00
Marek Kochanowicz
6397d9d40e
Added mCloneAction member
2014-01-14 13:12:15 +01:00
greye
15d946415e
minor cleanup
...
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
2014-01-14 12:46:53 +04:00
Marek Kochanowicz
c981a2a6f8
Removed boost in favor of #include <components/misc/stringops.hpp>. Hopefully this will make scrawl happy. :P
2014-01-14 09:25:03 +01:00
Marek Kochanowicz
2c1ef610b9
Moving back to boost for case insensitive comparsion.
2014-01-14 09:16:59 +01:00
scrawl
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
2014-01-14 07:42:03 +01:00
scrawl
69381c49c7
Added a todo comment
2014-01-14 07:39:44 +01:00
scrawl
b8583124e0
Correction for RemoveSoulgem instruction
2014-01-14 06:13:30 +01:00
scrawl
90b92a8f41
Move levelled list code out of ContainerStore
2014-01-14 05:37:06 +01:00
scrawl
6aa56354c0
Revert "Bug #991 : Don't autoequip items with harmful permanent enchantments"
...
This is no longer needed, since merchants no longer equip items sold to them (2f35e5a04e71d9755ef1
2014-01-14 05:24:58 +01:00
scrawl
9de3abcb5f
Closes #1105 : Do not reduce magicka if unable to cast
2014-01-14 03:34:30 +01:00
scrawl
396efd580b
Fix a leftover of the old coordinate system
2014-01-14 03:26:56 +01:00
scrawl
2196ce427a
Closes #556 : Link movie volume to 'master' volume slider, instead of 'music'.
2014-01-14 03:08:37 +01:00
scrawl
95651857f3
Fix code duplication
2014-01-14 02:52:34 +01:00
scrawl
0d0005c433
Fix fatigue not restoring when waiting
2014-01-14 02:20:13 +01:00
Marek Kochanowicz
e34cb9e931
changed according to the scrawl sugestion
2014-01-13 19:17:03 +01:00
Marek Kochanowicz
59de794e58
Creature check was not invoked.
2014-01-13 19:02:23 +01:00
Marek Kochanowicz
17cc6a695c
fixed bug resposnsible for exception throwed.
2014-01-13 18:34:28 +01:00
scrawl
ba27b693f8
Increase sneak skill on successful pickpocket
2014-01-13 10:18:03 +01:00
scrawl
73268a8606
Fix skill progress not working
2014-01-13 10:18:03 +01:00
scrawl
cd06b2177d
Automatically knock down when fatigue goes below zero
2014-01-13 10:18:03 +01:00
scrawl
413bf127de
Allow drain fatigue effect to reduce below zero
2014-01-13 10:18:02 +01:00
scrawl
3a1b6dd354
Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected.
2014-01-13 10:18:02 +01:00
scrawl
83872f6bf5
Knockdown / hit recovery improvements. Use formula and GMSTs from research wiki for knockdown determination. Hand-to-hand automatically knocks out when fatigue empty.
2014-01-13 10:18:02 +01:00
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2014-01-13 10:17:10 +01:00
Marc Zinnschlag
63cd70f810
some junk removal
2014-01-13 10:03:25 +01:00
scrawl
7983b07b10
Get bk_treasuryreport script to work properly:
...
- OnPcEquip needs to be set on *using* any item, not just equipping
- Handle PcSkipEquip
- Execute item's script once immediately after setting OnPcEquip
- Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped
2014-01-13 06:20:18 +01:00
gus
5d4e148063
some clean up
2014-01-12 22:47:22 +01:00
gus
5d038423ec
attempt to solve Bug #1009 by not building graph every frame
2014-01-12 18:42:31 +01:00
Marc Zinnschlag
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
2014-01-12 16:58:06 +01:00
gus
0e46c40cb5
Make ACtionTeleport non player specific and teleport actors following the teleporting actor
2014-01-12 14:03:11 +01:00
gus
1ae62665d6
get all actors following a given actor
2014-01-12 14:02:40 +01:00
gus
dd870e35db
get all actors following a given actor
2014-01-12 14:02:15 +01:00
gus
2446abe076
Allow getting current active package
2014-01-12 14:01:54 +01:00
gus
7e96a391da
FollowCell duration = 0 -> infinite time
2014-01-12 11:39:42 +01:00
gus
7066844e52
Follow you until a certain cell is reached
2014-01-12 11:38:58 +01:00
scrawl
f78b846f9e
Handle CasterLinked magic effect flag
2014-01-12 10:21:49 +01:00
scrawl
767c72e619
Fix diagonal movement being faster than forward movement
2014-01-12 10:04:06 +01:00
scrawl
fb778f8ecd
Use fEncumbranceStrMult
2014-01-12 04:09:51 +01:00
scrawl
1d19d36bd6
Remove unused magic effect flags and update esmtool output
2014-01-12 01:25:00 +01:00
scrawl
921ef6cd9c
Closes #1093 : Show weapon when initializing the character controller with a weapon equipped
2014-01-12 00:42:27 +01:00
scrawl
10ddea45e9
Move crime from onHit to hit, since failed hits are apparently also a crime
2014-01-11 23:12:21 +01:00
scrawl
44b2380874
Closes #947 : Decrease fatigue when running, swimming and attacking
2014-01-11 22:28:50 +01:00
scrawl
dddc0979a2
Fix another fatigue cap issue
2014-01-11 22:28:50 +01:00
scrawl
224f288359
Don't attempt to change disposition for creatures
2014-01-11 21:30:26 +01:00
scrawl
3db299f1b2
Fix fall damage crash
2014-01-11 21:30:26 +01:00
gus
051d7141be
check position to stop AIFollow
2014-01-11 20:32:38 +01:00
Marc Zinnschlag
5ea25dc269
player state cleanup
2014-01-11 15:34:32 +01:00
Marc Zinnschlag
b1ffb64a1f
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 14:33:27 +01:00
gus
ccf07f9406
Bugfix
2014-01-11 12:07:10 +01:00
gus
2d66b2c4fa
AiFollow. Npc get stuck often (no stuck dtection yet)
2014-01-11 12:06:36 +01:00
gus
f41f08c352
Wrong logic... should improve performances
2014-01-11 12:04:32 +01:00
gus
0609b71df9
fix pathfinding
2014-01-11 11:57:07 +01:00
Marc Zinnschlag
a0872b2646
Merge remote-tracking branch 'gus/AIFix2'
2014-01-11 11:51:53 +01:00
Marc Zinnschlag
1b03eec63e
Merge remote-tracking branch 'scrawl/master'
2014-01-11 11:43:12 +01:00
gus
828e5841d8
Windows SDL fix
2014-01-11 11:00:34 +01:00
scrawl
a2ba0dde31
Implemented GoToJail
2014-01-11 06:47:58 +01:00
scrawl
3896c88403
Use VFX_DefaultCast / VFX_DefaultHit if the magic effect does not specify any
2014-01-11 05:58:05 +01:00
scrawl
9ddee8fd8c
Autocalculate NPC reputation as according to research wiki
2014-01-11 04:03:13 +01:00
scrawl
9127839cc1
Add a searchPtr method as required for getting an owner, which may already be dead and disposed of.
2014-01-11 03:33:17 +01:00
scrawl
bf6d302fba
Confiscate stolen items when caught
2014-01-11 03:29:41 +01:00
scrawl
909494ff35
Implement Assault crimes. In other words, NPCs now fight back!
2014-01-11 03:08:16 +01:00
scrawl
12944f2459
Fix an auto equipping bug that allowed twohanded weapon and shield at the same time
2014-01-11 03:07:35 +01:00
scrawl
d4a98ffc27
Increase fight rating when being the victim of a crime
2014-01-11 02:27:44 +01:00
scrawl
aba72ffefe
Fix up the merge a bit
2014-01-11 02:12:41 +01:00
scrawl
727aa30347
Dead actors are unaware of everything
2014-01-11 02:06:54 +01:00
scrawl
d01f89b153
Rewrite some awful code
2014-01-11 00:24:21 +01:00
scrawl
e9f63270d9
Speed fix for "on target" spells
2014-01-10 22:51:42 +01:00
scrawl
621e52f09d
Play "attack" voiced dialogue entries randomly based on iVoiceAttackOdds.
2014-01-10 22:48:42 +01:00
scrawl
d9d6f37619
Use iVoiceHitOdds
2014-01-10 22:44:40 +01:00
scrawl
15e48107f7
Use i1stPersonSneakDelta + some cleanup
2014-01-10 22:39:01 +01:00
scrawl
2744cde40f
Use a few additional GMSTs
2014-01-10 22:27:31 +01:00
scrawl
3bf36515d5
Implement Trespassing crime
2014-01-10 21:26:24 +01:00
scrawl
f5a70dccf0
Fix title of buttons in generate class result dialog
2014-01-10 21:13:03 +01:00
scrawl
627dcddb33
Do not allow training skills above their governing attribute
2014-01-10 20:53:53 +01:00
Marc Zinnschlag
f62497dfdc
Merge remote-tracking branch 'mrcheko/master'
2014-01-10 19:08:35 +01:00
mrcheko
ffcb7fb280
fix for bug scrawl mentioned
2014-01-10 19:04:07 +02:00
Marek Kochanowicz
cb0d3794f7
Final check is not performed with just +1! Something is not right.
2014-01-10 11:01:29 +01:00
Marek Kochanowicz
688488de62
replaced == operator for string comparsion in npc check with boost algorithm to get case insensitive check.
2014-01-10 10:43:03 +01:00
Marek Kochanowicz
31c59db71c
Splited another long line in the header.
2014-01-10 10:22:18 +01:00
Marek Kochanowicz
468b9d7340
camel case in the header
2014-01-10 09:50:56 +01:00
Marek Kochanowicz
e4d637fd64
splited long lines in the header.
2014-01-10 09:49:05 +01:00
Marek Kochanowicz
b98cdabe89
Shameful bug fixed.
2014-01-10 09:42:36 +01:00
mrcheko
d41f27451b
appropriate camera vanity<>preview mode switch + hit recoils fix
2014-01-09 23:36:40 +02:00
scrawl
546b0cee76
Closes #1077 : Replace tags before trying to get the message length
2014-01-09 22:17:51 +01:00
scrawl
aa855e9524
Include some required Ogre headers explicitely
2014-01-09 20:56:24 +01:00
Marc Zinnschlag
5e2eb8caf8
Merge remote-tracking branch 'swick/master'
2014-01-09 09:47:42 +01:00
Marc Zinnschlag
85707b5e3e
Merge remote-tracking branch 'scrawl/master'
2014-01-09 09:35:54 +01:00
scrawl
768d9f7237
Scripting: Add an optional 'required' parameter to getReference (default: true). If required=false, it will not throw an exception if there's no reference. Fixes PcExpell not working without a reference like it's supposed to, and makes the code nicer for some others (use required=false instead of catching the exception)
2014-01-09 02:21:03 +01:00
scrawl
223c1d5a38
Use GMSTs for crime bounty
2014-01-09 02:20:52 +01:00
scrawl
6f9113fe88
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
2014-01-09 01:49:58 +01:00
scrawl
baf55df7a1
Gold fixes (when did this break?)
2014-01-09 01:34:10 +01:00
Sebastian Wick
925d28e4a7
crashcatcher uname error checking
2014-01-09 00:52:37 +01:00
scrawl
9bf7bf529c
Implement crime-related dialogue globals as they are described in MSFD
2014-01-09 00:40:25 +01:00
scrawl
d7f69205f6
Don't play "Menu Click" sound for disabled (= cannot receive input) buttons, plus some redundancy fixes
2014-01-09 00:06:24 +01:00
scrawl
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
2014-01-08 23:37:46 +01:00
scrawl
372cd437d1
Add a utility function for counting items in a container
2014-01-08 23:00:29 +01:00
scrawl
c55f9bd0aa
GetWaterLevel fix (similar to MCP): if there is no water in the cell, return -FLT_MAX to prevent mods from incorrectly thinking the player is underwater.
2014-01-08 20:19:47 +01:00
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
2014-01-08 20:16:39 +01:00
Marc Zinnschlag
a7be755db0
Merge remote-tracking branch 'mrcheko/master'
2014-01-08 20:13:31 +01:00
scrawl
bf02b77c1d
Closes #1090 : Don't throw an exception if a cell has no region in GetPCCell
2014-01-08 19:57:13 +01:00
scrawl
154fae9f25
Don't suppress exceptions thrown while running scripts
2014-01-08 19:52:57 +01:00
scrawl
9baa1bef78
Expell player from faction when committing a crime against a faction member
2014-01-08 19:26:03 +01:00
scrawl
19d63f392f
Clean up the NpcStats expelled interface. Show message box when expelled.
2014-01-08 18:59:00 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
7b33f6f2ac
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
2014-01-08 17:19:43 +01:00
scrawl
b99ca92fee
Add missing line of sight check
2014-01-08 17:18:13 +01:00
Nikolay Kasyanov
bc90443aeb
Revert "Music playback on OS X >= 10.9 works again. Fixes bug #1041."
...
This reverts commit fc21dd1f3a
2014-01-08 18:07:58 +04:00
mrcheko
46519062d3
hit recoils/knockdowns feature
2014-01-08 16:05:14 +02:00
scrawl
2bb21f2f76
Don't copy NpcStats/CreatureStats unnecessarily. Fixes a bug: taunt actions would not correctly increase the target's fight rating.
2014-01-08 02:35:36 +01:00
scrawl
c85c2cff4e
Fix disposition changes from trades not applying properly
2014-01-08 01:46:42 +01:00
scrawl
728365b48d
Remove an unused hook
2014-01-07 21:07:02 +01:00
scrawl
03b6334ceb
Get rid of a hack
2014-01-07 20:43:08 +01:00
scrawl
0285d18fc2
Respect items belonging to a faction
2014-01-07 20:24:01 +01:00
scrawl
3c0080d2c1
Implement theft detection
2014-01-07 19:58:17 +01:00
scrawl
d2d76f4f47
Fix disintegration bug
2014-01-07 19:21:19 +01:00
scrawl
c4ab2f417a
Fix exception closing container window
2014-01-07 18:11:19 +01:00
scrawl
90b55c8d4b
Use Ogre's asin/acos functions which will protect against NaNs
2014-01-07 17:09:08 +01:00
Marc Zinnschlag
48a08c4c4d
Merge remote-tracking branch 'endorph/master'
2014-01-07 14:12:15 +01:00
Dmitriy 'Endorph' Shkurskiy
9afa8e952e
tabs -> spaces
2014-01-07 14:32:14 +02:00
Marc Zinnschlag
72a81a2381
Merge remote-tracking branch 'scrawl/master'
2014-01-07 10:17:33 +01:00
scrawl
780bf5a2cd
Implement pickpocket detection. Play a voiced dialogue entry when detected.
2014-01-07 03:01:33 +01:00
scrawl
ea3ee4407f
oops, didn't mean to commit this
2014-01-07 02:48:44 +01:00
Sergey Shambir
d5a0ff17fd
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
...
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
2014-01-07 05:06:20 +04:00
Sergey Shambir
d536ff3cdc
printAIPackage: changed field name from Unknown to ShouldRepeat too.
2014-01-07 04:58:59 +04:00
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
2014-01-07 04:43:06 +04:00
scrawl
887db76ed2
Don't consider swimming or in-air characters as sneaking
2014-01-07 01:22:04 +01:00
scrawl
29c823b9d4
Implement awareness check function. Use this for combat AI and GetDetected instruction.
2014-01-07 00:51:09 +01:00
scrawl
4a3d148a48
Fixes #1089 (skill increases)
2014-01-07 00:37:52 +01:00
Marek Kochanowicz
b85fe2becf
Changes according to the comment.
2014-01-06 23:37:18 +01:00
Marc Zinnschlag
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
2014-01-06 22:30:08 +01:00
scrawl
68b87714bb
Addition to 2f35e5a04e: companions should still auto equip
2014-01-06 22:14:11 +01:00
mrcheko
2591ff2d5a
bug repairing
2014-01-06 22:00:01 +02:00
Marek Kochanowicz
06f8537087
added final check for player npc. Removed useless includes. However, this code spams exceptions and I can't figure out why.
2014-01-06 18:43:44 +01:00
Marc Zinnschlag
43dd3b8ef2
removed redundant deletion flag from CellRef
2014-01-06 13:53:20 +01:00
Marc Zinnschlag
0ad7aa1f53
Merge remote-tracking branch 'scrawl/master'
2014-01-06 10:22:07 +01:00
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
scrawl
2f35e5a04e
Stop merchants from autoequipping items sold to them
2014-01-05 22:43:09 +01:00
Marc Zinnschlag
e63b4964b2
Merge remote-tracking branch 'scrawl/master'
2014-01-05 21:27:06 +01:00
scrawl
dde2cd5d5a
Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.
2014-01-05 20:53:45 +01:00
scrawl
73f8161d1e
Fix spell deletion not resetting the selected spell correctly
2014-01-05 19:40:05 +01:00
scrawl
b3764c504a
Implement GetPcJumping instruction
2014-01-05 19:08:12 +01:00
scrawl
45847c67ad
Lock NIF cache when loading an interior cell as well. Should improve load performance.
2014-01-05 18:38:21 +01:00
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
2014-01-05 18:22:29 +01:00
scrawl
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
2014-01-05 18:09:50 +01:00
Marek Kochanowicz
c69814ed14
corrected one, additional name to follow policy
2014-01-05 18:00:49 +01:00
Marek Kochanowicz
4338706307
static is a keyword. renamed static to staticElement
2014-01-05 17:31:54 +01:00
Marek Kochanowicz
80d424591f
npc instead of NPC.
2014-01-05 17:28:47 +01:00
Marek Kochanowicz
693c398204
forgot to save the file before comit -_-'
2014-01-05 17:05:57 +01:00
Marek Kochanowicz
873870c7ce
Chainging names to comply our policy.
2014-01-05 17:04:57 +01:00
scrawl
ce013315ba
Nothing to see here, move along.
...
Fine... it's flying cliff racers. But did you really want to know?
2014-01-05 16:09:06 +01:00
Marek Kochanowicz
c1f4a9cb0e
Added proper id check.
2014-01-05 12:18:26 +01:00
Marek Kochanowicz
89d8ee62fa
Removing name check from listCheck. Id can't be empty to be sure.
2014-01-05 12:12:36 +01:00
Marek Kochanowicz
220d92f865
changed ID check in leveled list to name.
2014-01-05 11:30:03 +01:00
scrawl
44e96fcaaa
Implement Charm magic effect
2014-01-05 01:56:36 +01:00
scrawl
14b70a3ce6
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
2014-01-05 01:34:35 +01:00
scrawl
634a53211c
Make sure materials are built before trying to determine their transparency
2014-01-04 22:56:06 +01:00
pvdk
92234cf783
Changed crashcatcher's uname system info retrieval and cleaned indentation
2014-01-04 21:46:38 +01:00
scrawl
c4e4a8fb57
Closes #1083 : Fix werewolf change handling
2014-01-04 20:50:18 +01:00
scrawl
f4517c8221
For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire
2014-01-04 20:50:18 +01:00
mrcheko
7002412760
resolve conflict in character.cpp
2014-01-04 17:55:09 +02:00
Marek Kochanowicz
e860717105
replaced raw values with enums.
2014-01-04 15:28:08 +01:00
Marek Kochanowicz
558690b571
implemented list of magical bolts for skipping.
2014-01-04 15:19:17 +01:00
Marek Kochanowicz
dfd1058551
Various style corrections.
2014-01-04 14:49:01 +01:00
Marek Kochanowicz
aa05ffcf60
Splited some long argument lists to the multiple lines.
2014-01-04 13:05:19 +01:00
Marc Zinnschlag
356b53bd22
Merge remote-tracking branch 'scrawl/master'
2014-01-04 11:38:31 +01:00
Dmitriy 'Endorph' Shkurskiy
7023395012
Windows-specific definition to omit inclusion of unused stuff from Windows.h
2014-01-04 07:46:29 +02:00
Dmitriy 'Endorph' Shkurskiy
18d4cdb2ac
Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator
2014-01-04 07:46:29 +02:00
scrawl
16838595a3
Another console fix: discard text markup when getting the command line's text
2014-01-04 05:24:32 +01:00
scrawl
1b96c5d266
Console improvements: Show scrollbar, allow copying text from the history
2014-01-04 05:13:53 +01:00
scrawl
710a1e2f37
Smash case for manual reference IDs as well, consistent with references in data files
2014-01-04 04:39:06 +01:00
scrawl
557652112f
Show the target HP bar also when casting a heal effect (same as MCP)
2014-01-04 04:21:44 +01:00
scrawl
12691040d1
Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.
2014-01-04 02:49:10 +01:00
scrawl
09d491d1ba
Move a piece of functionality to its appropriate place
2014-01-04 01:13:19 +01:00
scrawl
be2ebc5cac
Closes #1081 : Implement disease contraction
2014-01-03 23:33:14 +01:00
scrawl
2a7d610f87
Implement GetSpellReadied instruction
2014-01-03 22:55:17 +01:00
scrawl
c0fbcf413f
Use the playermagic and playerfighting control switches
2014-01-03 22:44:35 +01:00
scrawl
e9bd43e2da
Use GMSTs for bound items/creatures
2014-01-03 20:54:14 +01:00
Marek Kochanowicz
1c3296fb64
Some changes in weapons check.
2014-01-03 18:25:06 +01:00
scrawl
617a65cdd2
Print message to dialogue window after successful trade
2014-01-03 17:40:14 +01:00
scrawl
b22dd40b41
Implement Paralyze magic effect
2014-01-03 17:06:05 +01:00
Marc Zinnschlag
ee621245bb
Merge remote-tracking branch 'scrawl/master'
2014-01-03 15:59:06 +01:00
scrawl
55c5d7cee4
Implement Resurrect instruction
2014-01-03 15:54:23 +01:00
Marek Kochanowicz
7b63e1942c
style corrections
2014-01-03 11:42:49 +01:00
Marek Kochanowicz
24f090ca98
Finishing stuff.
2014-01-03 11:31:54 +01:00
Marek Kochanowicz
8201c97abf
Inventory item template.
2014-01-03 09:16:41 +01:00
scrawl
b4230f716e
Implement RemoveEffects instruction
2014-01-03 05:19:10 +01:00
scrawl
7d8ca91286
Implement RemoveSpellEffects instruction
2014-01-03 05:18:44 +01:00
scrawl
366801f3d5
Implement explodeSpell instruction (like Cast, with caster = target)
2014-01-03 04:44:50 +01:00
scrawl
93e1a2df73
Implement Cast script instruction (shrines work now)
2014-01-03 04:09:52 +01:00
scrawl
b42240be6d
Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.
2014-01-03 03:48:43 +01:00
scrawl
32ff3b530c
Change all instances of skill/attribute values to use an appropriate typedef.
2014-01-03 01:59:15 +01:00
scrawl
623cdef69f
Code cleanup
2014-01-02 21:49:12 +01:00
scrawl
eba60858dd
Closes #1078 : Show stat bar text even when 0
2014-01-02 21:48:33 +01:00
Marc Zinnschlag
3b75f6676c
Merge remote-tracking branch 'scrawl/openmw-0.28' into openmw-28
2014-01-02 21:27:08 +01:00
scrawl
299690631f
Implement SoulTrap magic effect
2014-01-02 21:21:28 +01:00
mrcheko
79e972bdb6
resolved accompanying minor problems
2014-01-02 21:54:41 +02:00
Lukasz Gromanowski
b017a3be3e
Bug #1074 : Inventory paperdoll obscures armour rating
...
Changed size of inventory paperdoll.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-02 20:20:57 +01:00
scrawl
596e0c8a49
Correct Dispel effect (use magnitude as chance)
2014-01-02 20:15:07 +01:00
scrawl
94d2ec8e4e
Add missing spells update
2014-01-02 20:02:28 +01:00
Marc Zinnschlag
5d3b696eb6
Merge remote-tracking branch 'scrawl/master' into openmw-28
2014-01-02 19:52:47 +01:00
scrawl
12de351feb
Check if levitation is enabled before levitating
2014-01-02 16:38:23 +01:00
scrawl
0990ca4b75
Closes #1072 : Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly
2014-01-02 15:58:00 +01:00
scrawl
e6c0e187bc
Closes #1073 : Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.
2014-01-02 15:44:58 +01:00
Marc Zinnschlag
0d3e67dafc
Merge branch 'master' into openmw-28
2014-01-02 13:39:36 +01:00
Marc Zinnschlag
a6e6411686
Merge remote-tracking branch 'scrawl/master'
2014-01-02 12:12:52 +01:00
scrawl
c558e12212
Don't try to move objects that are not in a cell
2014-01-02 03:06:48 +01:00
scrawl
993edf0384
Bug #1063 : Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc.
2014-01-02 02:27:48 +01:00
scrawl
0f2b2fabdb
Implement water walking
2014-01-02 02:03:44 +01:00
scrawl
783c501d70
Some checks to prevent bound item abuse
2014-01-02 01:36:08 +01:00
scrawl
590c8cb4a0
Implement Disintegrate effects. When an armor/weapon breaks, unequip it and do not allow equipping it again.
2014-01-02 01:03:44 +01:00
scrawl
899214a906
Use fVanityDelay
2014-01-02 00:13:23 +01:00
scrawl
c6421276bd
Closes #841 : Correct activation distance in third person mode
2014-01-01 23:59:17 +01:00
scrawl
24aa743573
Add function for converting feet to game units
2014-01-01 23:34:18 +01:00
scrawl
f6387d5979
Implement Telekinesis magic effect. Remove some duplicate code.
2014-01-01 23:30:58 +01:00
scrawl
531bef6193
Shorter Vector3 initialisation
2014-01-01 22:46:10 +01:00
scrawl
5729672262
Show marked position on map. Implement Detect X magic effects.
2014-01-01 22:37:52 +01:00
mrcheko
16e10cc702
error fix
2014-01-01 22:46:29 +02:00
scrawl
bfc9fcf2cd
Add starting spells when building player (F_PCStart flag)
2014-01-01 21:34:00 +01:00
mrcheko
09a0a69b04
more improvements
2014-01-01 21:40:31 +02:00
Marc Zinnschlag
1f4c192bf6
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
2014-01-01 19:47:11 +01:00
Marc Zinnschlag
e1355be47c
Merge remote-tracking branch 'lgro/valgrind_warnings'
2014-01-01 19:41:52 +01:00
scrawl
eab7ffd6b4
Remove redundant finding of default exterior position height
2014-01-01 18:05:28 +01:00
scrawl
8e5cae1081
Implement mark/recall magic effects
2014-01-01 17:06:21 +01:00
Lukasz Gromanowski
2d4e06cd50
Updated comments about freeing format_ctx->pb->buffer.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 17:05:49 +01:00
Lukasz Gromanowski
722469d57b
Correction to the e9844e1 commit.
...
Restored interrior check in WeatherManager::update().
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-01-01 16:45:39 +01:00
scrawl
69ba8a40bf
Fix weird formatting added during the merge
2014-01-01 16:13:20 +01:00
scrawl
b3cd10dbea
Remove redundant setTeleported calls
2014-01-01 15:18:25 +01:00
Marc Zinnschlag
b19b277f18
temporarily disable OGRE-integration in OpenCS (need to sort out path problem first)
2014-01-01 15:16:51 +01:00
Marc Zinnschlag
c3482b6f24
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/openmw/mwmechanics/spellcasting.cpp
2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e
Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting'
...
Conflicts:
apps/openmw/mwworld/weather.cpp
apps/openmw/mwworld/worldimp.cpp
2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a
Implement divine/almsivi intervention magic effects
2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd
Remember the last known exterior position of the player in case we fail to map the interior to a world position.
2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d
Fixes #417 : Apply weather instantly when teleporting
...
Correction to previous commit - WeatherManager->update()
will always be called.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37
Fixes #417 : Apply weather instantly when teleporting
...
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 20:40:23 +01:00
scrawl
b02b966c44
Closes #994 : Don't cap skills to 100 when set via console (except for modX variants)
2013-12-31 19:11:16 +01:00
Marc Zinnschlag
c34b586b65
Merge remote-tracking branch 'ace/fix'
2013-12-31 18:37:12 +01:00
scrawl
3604b9d171
Closes #566 : In interior cells, update global map position marker using the first exterior teleport door
2013-12-31 18:35:46 +01:00
scrawl
be1938ee90
Closes #805 : Don't add entities that are supposed to be invisible to static geometry
2013-12-31 18:32:46 +01:00
Lukasz Gromanowski
1ce4663065
Updated compiler opcodes for COE, and setHello.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-31 18:13:38 +01:00
mrcheko
a8fb1ae51c
improved, added knockdown after falling
2013-12-31 17:55:04 +02:00
Alexander "Ace" Olofsson
8381cad5a4
Don't try to set a cursor before one exists
2013-12-31 14:13:42 +01:00
mrcheko
d6345bce91
added npc hit reactions
2013-12-31 13:24:20 +02:00
scrawl
94cdc1efd2
Enable mipmap generator for 1.9+
2013-12-31 00:54:40 +01:00
Lukasz Gromanowski
cb04f43384
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:08:53 +01:00
Lukasz Gromanowski
6107d5bad2
Updated ffmpeg decoder fix
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 22:16:06 +01:00
Lukasz Gromanowski
5c5f87445b
Fixes for "Conditional jump or move depends on uninitialised value(s)"
...
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 21:47:06 +01:00
Marek Kochanowicz
cb723710fe
Corrected stupid typo.
2013-12-30 19:24:53 +01:00
scrawl
b8ac37347c
Code cleanup for Class::canBeEquipped
2013-12-30 19:04:35 +01:00
Marek Kochanowicz
79bc149c73
reverting refidata.hpp
2013-12-30 18:47:19 +01:00
Marek Kochanowicz
a7de04d0a4
reverting refiddata.cpp
2013-12-30 18:46:18 +01:00
Marek Kochanowicz
4a1987ddec
correcting
2013-12-30 18:41:16 +01:00
scrawl
79a440e94a
Many additions to 900bc06d2c:
...
- Fix indentation
- Consider any kind of light, not just torch_infinite_time
- Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
- Remove redundant code and don't add additional lights to the inventory
- World::isDark returns false for interiors which are unaffected by weather
2013-12-30 17:57:41 +01:00
Marek Kochanowicz
3758fe3834
reformatted
2013-12-30 13:23:16 +01:00
Marek Kochanowicz
c89608f390
Check for head and hair. Correct faction check.
2013-12-30 11:39:03 +01:00
Scott Howard
2f082ef796
remove unneeded libraries
2013-12-29 16:25:49 -05:00
Marek Kochanowicz
842e26b8e5
added comment
2013-12-29 21:53:33 +01:00
Marek Kochanowicz
13637e7166
Dynamic_casting, checking rank. Commented out faction check, since it will not work.
2013-12-29 21:45:09 +01:00
Marek Kochanowicz
e321d571e1
Added faction check.
2013-12-29 21:06:08 +01:00
Marek Kochanowicz
9df6d23afc
removing member size values, since this does not work properly.
2013-12-29 20:15:00 +01:00
Lukasz Gromanowski
c65f018760
Fixes #417 : Apply weather instantly when teleporting
...
Corrected constant name.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329
Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day'
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48
Fixes #417 : Apply weather instantly when teleporting
...
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 12:47:44 +01:00
scrawl
04f9f7af56
Closes #990 : Add option to unlock mouse cursor when in any menu
2013-12-29 00:58:48 +01:00
scrawl
17ff8165d2
Closes #1065 : Don't apply fall damage when landing in water
2013-12-29 00:36:36 +01:00
Marek Kochanowicz
bf0383fe05
Last fixes.
2013-12-28 18:07:01 +01:00
Marek Kochanowicz
147ee0ace3
small oops + added new variables to the constructor
2013-12-28 17:35:04 +01:00
scrawl
2a8ab932ef
Bug #951 : Only recalculate derived stats when attributes change
2013-12-28 17:19:35 +01:00
Marek Kochanowicz
b9d1047ad6
Small fix for lights.
2013-12-28 16:18:16 +01:00
Lukasz Gromanowski
100edda8c0
Fixes #417 : Apply weather instantly when teleporting
...
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 16:15:34 +01:00
Marek Kochanowicz
be6e47bcb6
Corrections
2013-12-28 15:51:38 +01:00
Marek Kochanowicz
5406a70fdd
still working on npc check
2013-12-28 11:34:51 +01:00
Marek Kochanowicz
da3dda896a
Code compiles now
2013-12-27 22:57:36 +01:00
scrawl
596c9b80a9
Check if threads are joinable before joining (issue with boost 1.52)
2013-12-27 22:38:30 +01:00
Marek Kochanowicz
03235bf0a2
NPC. Still WIP.
2013-12-27 22:13:55 +01:00
scrawl
85ec80100c
Bug #1005 : Hide torches/shields during spellcasting and hand-to-hand combat
2013-12-27 22:00:16 +01:00
scrawl
7265b427fe
Bug #1013 : Rewrote fall height detection
2013-12-27 21:21:18 +01:00
scrawl
02277db685
Bug #1052 : Don't use set/getOnlyText which discards escape characters
2013-12-27 19:52:10 +01:00
scrawl
686d9efac3
Bug #1060 : Fix incorrect spell type checks
2013-12-27 18:58:35 +01:00
scrawl
27092a4494
flagAsModified should be private
2013-12-27 18:58:35 +01:00
scrawl
6400f23ab0
Use the material controller manager for effects with overridden texture
2013-12-27 14:54:36 +01:00
scrawl
d262d9e6b0
Bug #1054 : Set render queue group for effects
2013-12-27 14:51:59 +01:00
scrawl
1c60a781a5
Add header to CMakeLists
2013-12-27 14:42:22 +01:00
scrawl
561c661156
Reset starting angle / position when adding world item to a container
2013-12-27 01:57:08 +01:00
scrawl
608bd0f525
Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028
2013-12-27 01:34:56 +01:00
scrawl
30b1da996b
Issue #1029 - Quick keys menu: Select compatible replacement when tool used up
2013-12-27 00:51:29 +01:00
scrawl
5a287a7e01
Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData.
2013-12-27 00:41:19 +01:00
scrawl
d09a86e208
Issue #1018 : Don't allow view mode switching while performing an action
2013-12-27 00:36:06 +01:00
scrawl
a3017e16d4
Don't allow changing the spell that is being cast mid-animation
2013-12-26 22:32:39 +01:00
scrawl
5054d8e6c1
Bug #1055 : Check power use and mana before starting cast animation
2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1
Bug #991 : Don't autoequip items with harmful permanent enchantments
2013-12-26 21:26:59 +01:00
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
2013-12-26 20:53:52 +01:00
scrawl
a3ff9e5be8
Change destruction order - fixes a shutdown crash discovered with mesa
2013-12-26 20:53:52 +01:00
scrawl
fb845e81a4
Rename nosound to no-sound for consistency
2013-12-26 20:53:52 +01:00
scrawl
85ed21dbd2
Remove unused command line option
2013-12-26 20:53:51 +01:00
scrawl
33389b9b63
XDG compliant paths
2013-12-26 20:53:51 +01:00
scrawl
a9e1e89bbc
Bug #1007 : Fix the console getting key focus when a reference becomes unavailable, even if the console is not visible
2013-12-26 20:53:51 +01:00
scrawl
31c1f484ed
Slight performance improvement for WindowManager::updateVisible
2013-12-26 20:53:51 +01:00
scrawl
b6bad969a0
Fix an issue with items that have no UI icon
2013-12-26 20:53:51 +01:00
scrawl
81ec8c2f55
Handle --version and --help before reading configuration - putting these options into openmw.cfg makes no sense
2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
Marek Kochanowicz
f04a727af6
removed set sizes, consted sizes, added itemleveledlist check
2013-12-26 18:40:47 +01:00
Marek Kochanowicz
1da56e1790
checkin leveled items lists
2013-12-26 18:28:24 +01:00
Marek Kochanowicz
c2993909cf
added creature leveled list check
2013-12-26 18:16:54 +01:00
Marek Kochanowicz
360a939aa0
Working on leveled lists now.
2013-12-26 15:35:58 +01:00
Marek Kochanowicz
6c95cea4c4
Added ingredient check
2013-12-26 15:24:52 +01:00
Marek Kochanowicz
c1715779fa
Added door check with related methods.
2013-12-26 12:59:43 +01:00
Nikolay Kasyanov
9fabae5198
OS X: force Cocoa API for Ogre windows in OpenCS
2013-12-25 00:26:15 +04:00
Marek Kochanowicz
e4e7d50623
Added creatureCheck. I don't know meaning of all data fields here.
2013-12-23 12:32:35 +01:00
Marek Kochanowicz
94fcea4d4d
added mCreaturesSize
2013-12-22 14:46:07 +01:00
Marek Kochanowicz
32046070d5
Added getCreatures
2013-12-22 14:44:22 +01:00
Marek Kochanowicz
16af9e6986
added container check
2013-12-22 14:42:17 +01:00
Marek Kochanowicz
1a7f023237
added mContainersSize.
2013-12-22 14:35:40 +01:00
Marek Kochanowicz
dc594da0de
added getContainers
2013-12-22 14:34:29 +01:00
Marek Kochanowicz
bbcaef8e42
Added armor check and related stuff.
2013-12-22 14:32:42 +01:00
Marek Kochanowicz
97fc8acbdb
Added armor check
2013-12-22 14:22:03 +01:00
Marek Kochanowicz
955fe3e8cf
Added check for non-positive quality of alchemical apparatus
2013-12-22 10:00:04 +01:00
Marek Kochanowicz
1811f0a71b
Works, but it seems that I miss something in referencables. I will write post on the forum.
2013-12-21 15:40:39 +01:00
Marek Kochanowicz
a27441720e
Added enchantmnet check for books.
2013-12-21 12:07:40 +01:00
Marek Kochanowicz
ee5dfd1cc8
Adde potionCheck method
2013-12-21 11:15:46 +01:00
Marek Kochanowicz
21ee2a6d2e
Getting size of potions.
2013-12-21 11:02:58 +01:00
Marek Kochanowicz
a6c36e2377
Small optimization.
2013-12-21 11:01:40 +01:00
Marek Kochanowicz
385824aee0
Renamed getActivator to getActivators.
2013-12-21 10:59:13 +01:00
Marek Kochanowicz
4842c56cb5
added getpotions
2013-12-21 10:58:05 +01:00
Lukasz Gromanowski
900bc06d2c
Fixes #845 : NPCs hold torches during the day
...
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.
Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.
Since this commit autoEquip() method doesn't automatically equip lights.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 22:38:23 +01:00
Marek Kochanowicz
f69465d7e0
Added aditional checks for books. Activator check.
2013-12-20 22:31:17 +01:00
Marek Kochanowicz
8085fcc792
Added Referencable checks class, added method to get refidcontainer, added method to get mBooks.
...
Currently only books are checked, and only if name is present.
2013-12-20 20:02:42 +01:00
Marc Zinnschlag
18e7e83585
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-20 13:13:06 +01:00
mrcheko
8eb2696f6c
using gmst string
2013-12-20 14:04:59 +02:00
Lukasz Gromanowski
abc126e2af
Fixes #845 : NPCs hold torches during the day
...
Added check for Player character so it won't be affected by showing,
or hidding torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 01:01:30 +01:00
Lukasz Gromanowski
6eb674e4e5
Fixes #845 : NPCs hold torches during the day
...
Added equipping/unequipping torches.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-20 00:18:34 +01:00
Lukasz Gromanowski
92072d968b
Fixes #845 : NPCs hold torches during the day
...
Simplified a bit code which shows and hides light.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-19 21:11:07 +01:00
mrcheko
3816a09c6f
bug 428 ask to load recent saved game
2013-12-19 22:08:34 +02:00
Marc Zinnschlag
16b3927f17
Merge remote-tracking branch 'scrawl/master'
2013-12-19 14:26:41 +01:00
scrawl
9afdf71af3
Fix crash with player->position command
2013-12-19 00:37:57 +01:00
scrawl
a0d38dfb63
Fix highlighted topics being selectable when in a choice
2013-12-19 00:26:08 +01:00
scrawl
876fb9a899
Addition to bb4bd999ba : adjust position for objects placed from inventory
2013-12-19 00:11:14 +01:00
Marc Zinnschlag
c22e38f825
removing 255 content file limitation
2013-12-17 21:19:05 +01:00
Marc Zinnschlag
09fadd446b
Merge remote-tracking branch 'mrcheko/savedgame' into savedgame
2013-12-17 19:33:32 +01:00
pvdk
da9b67b6d2
Fix for Bug #922 : Launcher writing merged openmw.cfg files
2013-12-16 20:40:58 +01:00
mrcheko
a854eb73db
StateRunning check returns
2013-12-16 21:02:21 +02:00
scrawl
eb5e4ecec2
Remove more unused code
2013-12-16 15:35:38 +01:00
mrcheko
f50ff0b1c4
reworked http://bugs.openmw.org/issues/428
2013-12-16 15:40:47 +02:00
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
scrawl
56893a097d
Don't stack used torches
2013-12-16 13:31:03 +01:00
scrawl
cd756a8a39
Fix incorrect value for partially used items (missing float casts). Make sure the correct value is displayed in tooltips.
2013-12-16 13:22:27 +01:00
Marc Zinnschlag
1cf1d49bc4
fix to content file reading error reporting in case of missing dependency
2013-12-16 11:39:24 +01:00
mrcheko
fd9f8c34f6
bug fix http://bugs.openmw.org/issues/428
2013-12-15 18:50:25 +02:00
Marc Zinnschlag
3590fa40bd
store global script state in saved game files
2013-12-15 16:16:50 +01:00
Nikolay Kasyanov
fc21dd1f3a
Music playback on OS X >= 10.9 works again. Fixes bug #1041 .
2013-12-14 17:26:09 +04:00
Marc Zinnschlag
0890fa66b0
Merge remote-tracking branch 'mrcheko/master'
2013-12-13 18:47:11 +01:00
mrcheko
8b3a393a6b
bug fix at http://bugs.openmw.org/issues/985
2013-12-13 19:33:01 +02:00
mrcheko
c8bf69b91a
Revert "bug fix http://bugs.openmw.org/issues/985 "
...
This reverts commit 7a9b64c6f4
2013-12-13 19:02:25 +02:00
scrawl
39eea24dc3
Don't try to show exceptions in a message box if SDL was not initialized
2013-12-13 03:50:01 +01:00
mrcheko
7a9b64c6f4
bug fix http://bugs.openmw.org/issues/985
2013-12-12 16:09:38 +02:00
Marc Zinnschlag
2a35c7d33a
fixed running global scripts a second time after they have been stopped
2013-12-12 13:16:32 +01:00
Marc Zinnschlag
74793c1c2f
globals script cleanup; fixed potential case folding bug
2013-12-12 13:15:38 +01:00
Marc Zinnschlag
fc37c77a91
store global variables in saved game files
2013-12-12 12:19:25 +01:00
Lukasz Gromanowski
91a4d9a2eb
Fixes #845 : NPCs hold torches during the day
...
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-10 23:48:49 +01:00
Marc Zinnschlag
b38bfe1f21
removed a redundant function for listing global variables
2013-12-10 15:22:38 +01:00
Marc Zinnschlag
51bfa5cde3
rewrote global variable storage (using ESM variant type now)
2013-12-10 15:09:58 +01:00
Marc Zinnschlag
1fdd43bbb7
removed a redundant new
2013-12-10 12:31:18 +01:00
Emanuel Guevel
357ecd92b2
Do not display negative stat values
...
Display zero instead of negative values.
Also remove useless for loops and some unused attributes.
2013-12-10 00:41:36 +01:00
Emanuel Guevel
fc8bd1aacb
Allow fatigue stat to become negative when fatigue damages are taken
2013-12-09 21:53:04 +01:00
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
2013-12-09 18:39:34 +01:00
scrawl
0bc3a13c0f
Break invisibility on Use or Activate
2013-12-08 23:36:37 +01:00
scrawl
5fd2df5546
Ignore invisible targets for combat AI
2013-12-08 23:21:23 +01:00
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2
Fixes #1006 : Many NPCs have 0 skill
...
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-08 21:47:43 +01:00
Lukasz Gromanowski
8d63f8eea2
Fixes #998 : Setting the max health should also set the current health
...
Added setting current value of dynamic stat in OpSetDynamic class.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 21:00:46 +01:00
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
2013-12-07 16:26:52 +01:00
scrawl
742e0e014d
Remove more cruft in MessageBox. Fixes inconsistent sizing when close to a newline.
2013-12-07 14:15:51 +01:00
scrawl
bb70deabb1
Add an incomplete implementation of SayAnimationValue (lip animation)
2013-12-07 14:15:45 +01:00
Marc Zinnschlag
1c13a9037a
save and load dynamic records
2013-12-07 13:17:28 +01:00
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
2013-12-07 12:27:06 +01:00
Lukasz Gromanowski
e01085cac5
Fixes #1015 : Player status window scroll state resets on status change
...
Removed resetting scroll state position.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-07 02:57:30 +01:00
Marc Zinnschlag
48b779af80
Merge remote-tracking branch 'ace/win-fix'
2013-12-06 15:17:34 +01:00
Alexander "Ace" Olofsson
baacf91de4
Another windows build fix
2013-12-06 11:37:29 +01:00
Marc Zinnschlag
14eff87339
removed some junk from ESM store
2013-12-06 11:34:24 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2
Merge remote-tracking branch 'scrawl/master'
2013-12-05 16:04:50 +01:00
scrawl
845bc5f7eb
Show fatal exceptions in a message box instead of cerr when running without a terminal
2013-12-05 15:51:07 +01:00
scrawl
afa71bb622
Throw an exception if a BSA is not found
2013-12-05 15:51:07 +01:00
scrawl
9ab8fe1038
Fix bsatool warning
2013-12-05 15:46:33 +01:00
scrawl
f695deb29d
Remember window positions
2013-12-05 15:46:23 +01:00
Marc Zinnschlag
ee6ddc3404
block saving while chargen is in progress
2013-12-05 14:56:30 +01:00
Marc Zinnschlag
8b7889f8e5
setup player after loading a saved game
2013-12-05 14:22:08 +01:00
Marc Zinnschlag
a7b42b867b
more cleanup
2013-12-05 14:18:43 +01:00
Marc Zinnschlag
ce624e024b
make sure player record stays in place across cleanups
2013-12-05 14:03:25 +01:00
Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
Marc Zinnschlag
537b2efe8e
first round of cleaning up world cleanup
2013-12-05 12:49:25 +01:00
scrawl
8f4ffe4ddc
Fix new window size not being written to settings when manually resizing window
2013-12-03 15:55:31 +01:00
Marc Zinnschlag
63721682f6
GUI fix: previous character was selected when saving new character
2013-12-03 15:19:13 +01:00
Marc Zinnschlag
34cdd2bb1f
deal with dialogue/info records that don't exist anymore
2013-12-03 14:39:54 +01:00
Marc Zinnschlag
2293b92efe
storing and loading the journal
2013-12-03 14:28:46 +01:00
Marc Zinnschlag
2fe135d85f
journals subview was bound to the wrong universal ID type
2013-12-02 16:25:26 +01:00
Marc Zinnschlag
0f971163f7
use Entry instead of plain string for topic and quest entries
2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387
splitting JournalEntry into Entry and JournalEntry
2013-12-01 14:44:27 +01:00
Marc Zinnschlag
16e2d67b1f
added overloaded start/endRecord functions to ESMWriter
2013-12-01 13:32:11 +01:00
Marc Zinnschlag
c94f006307
Merge remote-tracking branch 'scrawl/master'
2013-11-30 15:06:09 +01:00
scrawl
8391891a5b
Ignore case for content file extensions
2013-11-30 14:25:29 +01:00
Marc Zinnschlag
43f5f16731
removed a todo comment
2013-11-30 12:54:44 +01:00
Marc Zinnschlag
177aab536d
storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)
2013-11-30 12:41:18 +01:00
pvdk
46973e8e82
Fix for Bug #982 : unchecking addons is now saved to profile
2013-11-30 12:08:37 +01:00
Marc Zinnschlag
eed46960fe
some spelling fixes
2013-11-30 12:02:56 +01:00
Marc Zinnschlag
9d64c92d33
store text in journal entries
2013-11-30 11:57:33 +01:00
Marc Zinnschlag
8b3e852ffc
Merge remote-tracking branch 'scrawl/master'
2013-11-30 11:09:38 +01:00
Marc Zinnschlag
aebc2791a5
fixed selecting current character based on value stored in settings
2013-11-30 11:08:41 +01:00
scrawl
4b4025ed0f
Keep the player's CharacterController when changing cells. Fixes several glitches.
2013-11-30 11:01:45 +01:00
Marc Zinnschlag
016500af98
Merge remote-tracking branch 'scrawl/master'
2013-11-30 09:45:46 +01:00
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
2013-11-30 09:45:41 +01:00
scrawl
e1e9de0f02
Don't hide tooltips on mouse click. Probably wasn't such a bright idea.
2013-11-30 09:04:52 +01:00
scrawl
6aa9e18915
Reset filter when starting a trade
2013-11-30 08:33:18 +01:00
scrawl
bb4bd999ba
PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.
2013-11-30 08:29:22 +01:00
scrawl
0e267b79ec
Don't heal dead actors when resting
2013-11-29 20:21:57 +01:00
scrawl
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
2013-11-29 20:06:54 +01:00
scrawl
ce2d521b8f
Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra".
...
When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.
2013-11-29 20:03:50 +01:00
scrawl
ffc885853a
Fix bolt for magic effects that don't have one specified
2013-11-29 10:39:37 +01:00
scrawl
b82ee4b44f
Fix some problems with the previous commit
2013-11-28 21:49:15 +01:00
scrawl
076cc9230b
First try at handling target magic
2013-11-28 17:31:17 +01:00
scrawl
20ccfe2324
Play sound when enchanting
2013-11-28 11:37:30 +01:00
Marc Zinnschlag
5aea6ef80f
some clean up for the cleanup code
2013-11-28 11:22:34 +01:00
Marc Zinnschlag
35e8e23037
keep track of total play time per character
2013-11-28 09:33:50 +01:00
Marc Zinnschlag
7e2819c62e
store year in saved game profile
2013-11-28 09:27:10 +01:00
Marc Zinnschlag
b0eb5938bf
removed some redundant code
2013-11-28 09:13:54 +01:00
Marc Zinnschlag
71436b1160
changed interface for global variable access
2013-11-28 09:10:38 +01:00
scrawl
97fadb24ca
Update the Ptr in mObjects in Objects::updateObjectCell
2013-11-27 18:49:04 +01:00
scrawl
03c4b680ca
Fix changePointer
2013-11-27 18:49:04 +01:00
scrawl
a8c838b53a
Don't list deleted refs in CellStore::foreach
2013-11-27 18:49:04 +01:00
scrawl
49ea1aae67
Use GMST for sun damage reduction
2013-11-26 15:01:22 +01:00
Marc Zinnschlag
99ea63dc4a
factored out code for generating month names
2013-11-26 12:47:30 +01:00
Marc Zinnschlag
e6dc927f11
removed duplicates of the cell name function
2013-11-26 11:49:07 +01:00
Marc Zinnschlag
bc6fe682c9
replaced getCurrentCellName function with a more general getCellName function
2013-11-26 11:39:58 +01:00
Marc Zinnschlag
eea433f141
restore last played character selection across sessions
2013-11-26 10:37:58 +01:00
scrawl
eba068149d
Fix AIWander crash
2013-11-25 15:38:18 +01:00
Marc Zinnschlag
ad143e0524
case fix (content file names)
2013-11-25 14:56:05 +01:00
Marc Zinnschlag
616e3aa32f
store content file list in saved games and reject saved games not matching the current game
2013-11-25 13:00:05 +01:00
Marc Zinnschlag
55544e931c
reject newer formats when scanning saved games
2013-11-25 10:21:49 +01:00
Marc Zinnschlag
e3670cff8a
improved character selection logic
2013-11-24 16:58:41 +01:00
Marc Zinnschlag
67cd0887e6
added description field to saved game record; make use of description in GUI
2013-11-24 15:19:56 +01:00
Marc Zinnschlag
7efac4c9a5
fixed handling of characters without a valid slot
2013-11-24 15:05:00 +01:00
Marc Zinnschlag
18a3b38fb4
when scanning saved game directory, reject characters without a valid saved game
2013-11-24 14:42:58 +01:00
scrawl
14c9a4e1d3
Cap enchantment casting cost to 1 as displayed in enchanting window. Display current enchantment charge in spell window.
2013-11-23 23:12:54 +01:00
scrawl
07408a4652
Don't allow selling gold (again - when did this get broken?)
2013-11-23 22:52:20 +01:00
scrawl
4aa9f3bcef
Don't set the enchanted item in HUD for "WhenStrikes" enchantments
2013-11-23 22:48:56 +01:00
scrawl
f3e89e9168
Fix arrow down in console
2013-11-23 22:48:39 +01:00
scrawl
d2ed77f3f2
Fix shields being visible during spellcasting
2013-11-23 20:24:52 +01:00
Marc Zinnschlag
d8c40562ae
Merge remote-tracking branch 'scrawl/light'
2013-11-23 12:44:42 +01:00
scrawl
a1fe07181c
Fix rotation offset of some lights (bug 955)
2013-11-23 05:55:03 +01:00
scrawl
0e254aa7c7
Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in.
2013-11-23 03:25:55 +01:00
scrawl
39de0510a0
Fix another case of container scripts not getting re-added
2013-11-22 02:12:37 +01:00
scrawl
829512ded4
Fix container scripts not getting re-added when the player changes cells
2013-11-22 01:02:12 +01:00
scrawl
2e87cbc231
Add basic functionality to SaveGameDialog
2013-11-21 20:34:34 +01:00
scrawl
cf79a83d4f
Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.
2013-11-21 19:07:54 +01:00
scrawl
b490e56ba1
Remove redundant setLocals (already done by ContainerStore::add)
2013-11-21 17:19:41 +01:00
scrawl
61ab6e1739
Use fWortChanceValue for making ingredient/potion effects visible
2013-11-21 17:19:41 +01:00
scrawl
320ba98097
Correct getDerivedDisposition according to wiki (check if player expelled)
2013-11-21 17:19:41 +01:00
scrawl
6451b687d9
Adjust value for several item types as according to wiki
2013-11-21 17:19:41 +01:00
scrawl
b6c22ad5d9
Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.
2013-11-21 17:19:30 +01:00
scrawl
bab657fe2b
Add a utility function to add items to a ContainerStore by RefID
2013-11-21 17:14:30 +01:00
scrawl
6641fd4635
Fix bug when enchanting: only the mBase pointer was updated, not the CellRef mRefID, which is used for container stacking. The new (enchanted) item was stacking with the old item when it was added, so the enchantment completely disappears.
2013-11-21 17:14:30 +01:00
scrawl
800a2845b0
Add Bound & Summon effects (will need some adjustments later)
2013-11-21 17:14:23 +01:00
Marc Zinnschlag
2702d10911
more comments
2013-11-21 12:31:04 +01:00
Marc Zinnschlag
b5f99522c7
added a few comments
2013-11-21 12:29:24 +01:00
Marc Zinnschlag
c165894869
load saved game record
2013-11-21 12:24:24 +01:00
Marc Zinnschlag
5ba56a5ea5
character signatures
2013-11-21 11:18:56 +01:00
Marc Zinnschlag
cbbdf390ad
added function for inspection of saved characters and character slots
2013-11-21 11:10:18 +01:00
Marc Zinnschlag
fc1501a510
store character profile information in saved game file
2013-11-21 10:53:42 +01:00
Marc Zinnschlag
e938c5a0ee
changed character creation logic (create on save instead of on new game)
2013-11-21 10:20:50 +01:00
scrawl
bf153e1c8e
Fix bug applying instant effects
2013-11-21 00:41:52 +01:00
scrawl
4ed4c1e319
Add Vampirism and Sun Damage effects. Some fixes.
2013-11-21 00:41:31 +01:00
scrawl
7f735c2c4c
Release and show the cursor when focus lost
2013-11-20 16:07:14 +01:00
scrawl
5a4bd9b202
Remove software cursor option, hw cursors seem to be working well enough
2013-11-20 06:20:16 +01:00
scrawl
fa63924884
Simplify message box manager, should fix a random bug with boxes not disappearing
2013-11-20 05:49:05 +01:00
scrawl
3452bd2e0b
Add glow effect for enchanted items
2013-11-20 00:13:12 +01:00
scrawl
0b9676aaa3
Fix an issue with the AI code
2013-11-19 18:43:32 +01:00
scrawl
38a82c4b0b
Add a todo comment
2013-11-19 18:43:21 +01:00
scrawl
8b095982e9
Don't auto equip for dead actors
2013-11-19 18:42:43 +01:00
scrawl
f3ff2e4260
Handle Unreflectable flag
2013-11-19 17:33:02 +01:00
scrawl
c03c82c78a
Apply disease resistance manually as according to wiki
2013-11-19 17:15:17 +01:00
Marc Zinnschlag
8190fdb16c
Merge remote-tracking branch 'scrawl/master'
2013-11-19 16:56:18 +01:00
scrawl
654b7d9ba5
Apply disease resistance manually as according to wiki
2013-11-19 16:52:26 +01:00
scrawl
e8dcd74741
Recharge enchanted items in player's inventory over time
2013-11-19 16:42:24 +01:00
Marc Zinnschlag
9487bd33c3
removed broken save function from ESMWriter
2013-11-19 16:07:36 +01:00
Marc Zinnschlag
5e64888227
added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)
2013-11-19 15:38:26 +01:00
Marc Zinnschlag
11e254aac8
Merge remote-tracking branch 'gus/AICombat'
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
scrawl
74e42a2d02
Add missing skill increases for Enchant skill
2013-11-19 07:39:07 +01:00
scrawl
cab535dd69
Implement magic item recharging via soulgem use
2013-11-19 06:48:47 +01:00
scrawl
16e5477c60
Fix an uninitalized member
2013-11-19 02:17:44 +01:00
gus
dff3cf162d
ToggleAI script instruction
2013-11-18 23:03:44 +01:00
Marc Zinnschlag
1c7a4d4b3a
adjust availability of main menu items based on game state
2013-11-18 15:52:25 +01:00
Marc Zinnschlag
f45cff8aff
flag game as ended when player dies
2013-11-18 15:38:08 +01:00
Marc Zinnschlag
82c8495338
removed boolean running flag with state enum
2013-11-18 15:15:47 +01:00
Marc Zinnschlag
e55691096c
Merge remote-tracking branch 'ace/win-fixes'
2013-11-18 13:46:28 +01:00
Alexander "Ace" Olofsson
4baaf9463e
Remove crashcatcher.cpp from windows builds, it can't be built or used there.
2013-11-18 12:34:25 +01:00
gus
4559e932ae
AI packages have priority and combat is triggered in actor.cpp using the Hostile setting in CreaturesState
2013-11-18 12:33:09 +01:00
scrawl
6902569d03
Implement Absorb effects (AbsorbHealth, etc)
2013-11-18 05:01:36 +01:00
scrawl
a420698237
Don't try to absorb or reflect for self casted spells
2013-11-17 23:41:24 +01:00
scrawl
0dc2e829dd
Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.
2013-11-17 23:31:08 +01:00
scrawl
fc268bf302
Initialize mFallHeight
2013-11-17 23:31:08 +01:00
scrawl
47fc3f81f5
Don't update actors while paused
2013-11-17 23:31:08 +01:00
scrawl
2a11618ee7
Make sure the equipped weapon HUD icon is updated properly
2013-11-17 23:31:07 +01:00
scrawl
b8c358df63
Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place
2013-11-17 23:31:07 +01:00
Marc Zinnschlag
d32fcb99b5
Merge remote-tracking branch 'scrawl/master'
2013-11-17 13:39:04 +01:00
scrawl
e7993ced69
Fix invalid casts
2013-11-17 04:33:04 +01:00
scrawl
07251f0fa4
Don't apply spells to dead actors
2013-11-17 04:32:56 +01:00
scrawl
b8f5cd6cb7
Forgot to apply the same fix to companion window
2013-11-16 23:55:54 +01:00
Sebastian Wick
4a816b6c17
fix context menu
2013-11-16 23:08:03 +01:00
scrawl
eb46de54e4
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-11-16 22:48:59 +01:00
scrawl
7eb1dcb682
Fix trade windows crashing after a new game
2013-11-16 22:29:40 +01:00
scrawl
e32c73725c
Merge branch 'crashcatcher'
2013-11-16 20:56:07 +01:00
scrawl
f990ba09f0
gdb detection doesn't seem to work for the forked process
2013-11-16 20:55:41 +01:00
Marc Zinnschlag
a19242b4ec
fixed expression in if statement
2013-11-16 19:31:35 +01:00
vorenon
b2d2a3dd17
Closing message boxes with numpad enter
2013-11-16 19:15:47 +00:00
Marc Zinnschlag
985ce7c552
Merge remote-tracking branch 'scrawl/crashcatcher'
2013-11-16 18:34:08 +01:00
scrawl
20d806b40c
Change is_debugger_attached to a different hack
2013-11-16 18:15:54 +01:00
Marc Zinnschlag
c5f81e3508
don't run udpates if no game is running
2013-11-16 17:46:48 +01:00
scrawl
883140babf
Add missing include for signals to make travis happy
2013-11-16 17:00:26 +01:00
scrawl
b9899696e3
Add a crash catcher for unix. When encountering a fatal signal, attach gdb and log backtrace.
2013-11-16 15:56:15 +01:00
scrawl
aa84ce3f0d
Copy paste mistake (oops)
2013-11-16 14:44:31 +01:00
Marc Zinnschlag
ec5b2e9a7e
added running flag; moved new game code to MWState
2013-11-16 12:22:28 +01:00
Marc Zinnschlag
31ec973c9c
removed default value for --start
2013-11-16 12:08:00 +01:00
Marc Zinnschlag
b3a7c8c098
removed --new-game switch
2013-11-16 11:36:32 +01:00
Marc Zinnschlag
7a4b604376
added --skip-menu switch
2013-11-16 11:33:20 +01:00
Marc Zinnschlag
f19973450f
moved exit game flag from Environment to StateManager
2013-11-16 11:07:23 +01:00
Marc Zinnschlag
79b7fa258b
added new mwstate subsystem
2013-11-16 10:31:46 +01:00
scrawl
7474e87edc
Implement RestoreHealth/Magicka/Fatigue
2013-11-16 05:06:54 +01:00
scrawl
bb43ec9b35
Implement damage tick effects
2013-11-16 03:16:21 +01:00
scrawl
b1a29eb27e
Implement Resist & Weakness effects
2013-11-16 02:34:43 +01:00
scrawl
d49b6f19ff
Don't advance acrobatics skill for NPCs
2013-11-16 02:11:11 +01:00
scrawl
aa4b2d9504
Fix uninitialized mSkill/mAttribute for spellmaker spells
2013-11-16 01:19:39 +01:00
scrawl
c73217627e
Move code for listing effect sources to the spell management classes
2013-11-15 20:29:47 +01:00
Marc Zinnschlag
eddd6bf48d
enabled load and save items in main menu
2013-11-15 10:29:53 +01:00
scrawl
d619d0fa25
Don't grab the cursor while the console is opened
2013-11-15 03:39:25 +01:00
scrawl
065f14579f
Fix a container window regression (oops)
2013-11-15 02:57:21 +01:00
scrawl
f7befa3e54
Remove a no longer required method
2013-11-15 02:20:04 +01:00
scrawl
00af6b5617
Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World.
2013-11-15 02:08:36 +01:00
scrawl
427de69b79
Allow stacking enchanted items when charge is full
2013-11-14 21:02:37 +01:00
scrawl
49125fa26e
Fix restacking unequipped items
2013-11-14 19:54:00 +01:00
scrawl
da85f3e575
Use the formula from the wiki for spell success.
2013-11-14 19:19:32 +01:00
scrawl
4083c55848
Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed.
2013-11-14 19:18:27 +01:00
scrawl
5458207325
Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0.
2013-11-14 18:41:34 +01:00
scrawl
9c5847e2f4
Fix VFX not getting removed when an actor dies
2013-11-14 14:52:30 +01:00
scrawl
e26cc31e3b
Disable projectiles for now
2013-11-14 14:45:08 +01:00
scrawl
992a8e9c36
Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.
2013-11-14 14:41:10 +01:00
scrawl
956d8adb99
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
...
Conflicts:
apps/openmw/mwgui/inventoryitemmodel.cpp
2013-11-14 14:25:22 +01:00
scrawl
0b5f5351b5
Fix continuous FX getting removed instantly
2013-11-14 13:30:48 +01:00
Marc Zinnschlag
1c020b74c8
hid ID column in info tables (not relevant for the user)
2013-11-14 13:14:37 +01:00
Marc Zinnschlag
9f0dac00ec
silenced a warning
2013-11-14 12:22:24 +01:00
Marc Zinnschlag
2af7f60488
flag reordered records as modified
2013-11-14 12:21:10 +01:00
Marc Zinnschlag
a44fad4c59
disabled revert for info tables (no easy way to make this work)
2013-11-14 11:55:02 +01:00
Marc Zinnschlag
d49b8e7443
Merge branch 'dialogue'
2013-11-14 11:40:50 +01:00
Marc Zinnschlag
780ea3a41f
added support for record reordering to model (only implemented in info collection)
2013-11-14 11:39:14 +01:00
scrawl
da5c59c8af
addEffect should check effectId, not model.
2013-11-13 19:07:44 +01:00
scrawl
ff7e4174f9
Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item.
2013-11-13 18:51:28 +01:00
scrawl
a6e2f43b75
Stop continuous VFX when the effect is no longer active.
2013-11-13 15:44:43 +01:00
Marc Zinnschlag
68598f9b63
fixed handling of user directory defaultfilters file; some cleanup
2013-11-13 14:56:04 +01:00
scrawl
9b0e82a37f
Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)
2013-11-13 14:02:15 +01:00
Marc Zinnschlag
a8274e5c86
Merge remote-tracking branch 'potatoesmaster/inventory-fix'
2013-11-13 13:55:24 +01:00
Marek Kochanowicz
821d0c5c2d
Corrected filter template loading.
2013-11-13 11:38:29 +01:00
scrawl
0627e23d3c
Fix wrong skill level for spell success formula.
2013-11-13 01:26:25 +01:00
Emanuel Guevel
baf13483c0
Update actor model only when in the current cell
2013-11-13 00:04:04 +01:00
scrawl
60bec03987
Rename variables called 'slots' to work around wrong code parsing in QT Creator.
2013-11-12 23:23:19 +01:00
scrawl
027f4152e4
Missing flagAsModified()
2013-11-12 23:17:03 +01:00
scrawl
3c6a391507
Rename arguments again
2013-11-12 23:12:56 +01:00
scrawl
700d06764c
Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack.
2013-11-12 22:58:56 +01:00
scrawl
0dab7031c0
Make sure effects are destroyed with the animation
2013-11-12 02:22:44 +01:00
scrawl
eccb8f38ba
Apply "cast when strikes" enchantments when hitting with a weapon
2013-11-12 02:07:51 +01:00
scrawl
5f209b120b
Use the new ContainerStore::remove method.
2013-11-12 01:26:16 +01:00
scrawl
ffdb91bb21
Add particles for Cast + Hit. Not looking quite right yet.
2013-11-11 23:43:28 +01:00
Marc Zinnschlag
2fff7fc843
save info records
2013-11-11 12:21:26 +01:00
scrawl
6f3d737498
Missing const, thanks to jeaye
2013-11-10 23:27:11 +01:00
scrawl
1773c70455
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
2013-11-10 22:03:17 +01:00
Marc Zinnschlag
ef8360f346
silenced a warning
2013-11-10 21:45:27 +01:00
Marc Zinnschlag
cfbf444628
Merge remote-tracking branch 'potatoesmaster/inventory-remove'
2013-11-10 21:30:19 +01:00
Nikolay Kasyanov
05e19b37e3
Removed obsolete comment
2013-11-10 22:25:29 +04:00
Nikolay Kasyanov
dafe80874a
Added empty line
2013-11-10 22:24:31 +04:00
Nikolay Kasyanov
96714fc2c1
OpenCS: proper working dir & library path on OS X
2013-11-10 22:19:32 +04:00
Nikolay Kasyanov
fa13818360
OS X: OpenCS packaging
2013-11-10 22:04:13 +04:00
Nikolay Kasyanov
dfa900e4e3
OS X: Fixed “macro redefined” warning
2013-11-10 20:59:10 +04:00
Nikolay Kasyanov
0494fa543f
OpenCS: set current directory to bundle location on OS X, like in OpenMW binary
2013-11-10 20:39:35 +04:00
Nikolay Kasyanov
df5b52b45b
OpenCS.app icon & bundle properties
2013-11-10 20:11:53 +04:00
Nikolay Kasyanov
04edd25add
OpenCS as a separate app bundle
2013-11-10 19:09:05 +04:00
scrawl
6cd373c5c6
Only allow using powers once every 24 h. Apply on touch effects.
2013-11-10 15:40:31 +01:00
scrawl
71828351e6
Code cleanup: use enum instead of integer
2013-11-10 15:28:26 +01:00
Marc Zinnschlag
8c4303399f
Merge branch 'master' into dialogue
...
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loadinfo.hpp
2013-11-10 13:21:39 +01:00
Marc Zinnschlag
583f1ae9c2
fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection
2013-11-10 13:00:46 +01:00
Marc Zinnschlag
ec6018928c
some fixes to info record sorting (doesn't address the main problem)
2013-11-10 12:09:49 +01:00
Marc Zinnschlag
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
2013-11-10 11:49:48 +01:00
Emanuel Guevel
bbfd7f4c9d
Disable equipped item re-stacking when the item is removed from inventory
...
The item was not removed if it was re-stacked.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
d2dcf0b203
Add a warning comment to RefData::setCount()
2013-11-10 02:45:17 +01:00
Emanuel Guevel
467bd91651
Update actor model on inventory change
2013-11-10 02:45:17 +01:00
Emanuel Guevel
f428921b93
Always update the source container view on drag&drop
...
This fix the indicator not being displayed for items auto-equipped
after an other item is removed.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
4fcf427e1f
InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged
...
The unequipped item is also re-stacked if needed.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
37e91a278e
Add InventoryStore::unequipItem()
2013-11-10 02:45:17 +01:00
Emanuel Guevel
12dbbde1e3
InvStore::unequipSlot: return an iterator to the unequipped item
2013-11-10 02:45:17 +01:00
Emanuel Guevel
59c963b6cc
Auto-equip items when a clothe or an armor is removed from inventory
...
This fix auto-equip on corpses.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
750f1fd760
Edit ContainerStore::stacks for clarifications and correctness
...
Rename arguments and fix some potential errors (add checks).
2013-11-10 02:45:16 +01:00
Emanuel Guevel
26e4ccb8c2
Cosmetic changes
...
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
2013-11-10 02:45:16 +01:00
Emanuel Guevel
aefa54d72d
Pass item count to ManualRef constructor
...
This remove the need to call setCount in multiple places.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
0691978603
Add item count to ManualRef constructor as optional argument
2013-11-10 02:45:16 +01:00
Emanuel Guevel
f4f2586e8c
Remove duplicate code for PlaceAtMe/PlaceAtPC using a template
2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef
Move some deleteObject logic from OpDelete to MWWorld::deleteObject
2013-11-10 02:45:16 +01:00
Emanuel Guevel
2786530430
Edit InventoryStore::equip() to call the new unequipSlot function…
...
…to unequip previously equipped item.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
52cef19982
Update weapon/magic icons when items are removed from player inventory
2013-11-10 02:45:16 +01:00
Emanuel Guevel
d05baa8c22
Add method InventoryStore::unequipSlot()
...
This will permit to do run a treatment when an item is unequipped.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297
Call ContainerStore::remove() to remove items from inventory
...
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
23b8206bdc
Add remove methods to MWWorld::ContainerStore
2013-11-10 02:45:16 +01:00
Marc Zinnschlag
a198751f21
Merge remote-tracking branch 'scrawl/magic'
2013-11-09 17:00:27 +01:00
Marc Zinnschlag
935d9241d8
first attempt at proper info record loading: partially incorrect and way too slow
2013-11-09 11:42:19 +01:00
scrawl
5c148a3d41
Fix effect source display
2013-11-09 11:09:44 +01:00
Marc Zinnschlag
8be3ffc2a0
Merge remote-tracking branch 'scrawl/magic'
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-11-09 10:54:51 +01:00
scrawl
3e58655a90
Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!
2013-11-09 10:49:00 +01:00
scrawl
3ea7d58ca8
Advance skill on successfull spell cast
2013-11-09 10:34:46 +01:00
scrawl
976344f0a3
Handle CastOnce enchantments
2013-11-09 08:07:40 +01:00
scrawl
1051611ffa
Added spell failure sound
2013-11-09 07:59:17 +01:00
scrawl
cbe96a2170
Refactor ActiveSpells to track range type. Added basic self range magic.
2013-11-09 07:51:46 +01:00
Marc Zinnschlag
3d8da2b9e0
proper sorting for newly created records and some case smashing fixes
2013-11-08 12:16:41 +01:00
Marc Zinnschlag
a06aa881cb
make sure case handling in info IDs is consistent
2013-11-08 12:03:03 +01:00
Marc Zinnschlag
982024a328
Topic range access in InfoCollection
2013-11-08 11:52:30 +01:00
Marc Zinnschlag
0745a86039
added InfoCreator
2013-11-08 11:51:59 +01:00
Bret Curtis
5a071b0f81
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-08 09:08:56 +01:00
Bret Curtis
36efe9605f
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-07 23:05:45 +01:00
Marc Zinnschlag
fb417f9880
Merge remote-tracking branch 'scrawl/openmw-27' into openmw-27
2013-11-07 09:19:55 +01:00
Jordan Ayers
3fbf918751
Chargen Review Dialog: Init fix.
...
Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
2013-11-06 23:19:53 -06:00
Jordan Ayers
d48cc27a89
Chargen fix: Back sequence control.
...
Related to bug #894 .
Eliminate double windows when using 'Back' from the review screen.
Force consistent back behavior (handling was changing after
a individual change button had been used).
2013-11-06 23:19:53 -06:00
Jordan Ayers
e94da61ff0
Chargen cleanup.
...
Move common gui state pop out of if checks.
Move health update before gui state push (used as input for some windows).
2013-11-06 23:19:53 -06:00
Marc Zinnschlag
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
scrawl
9e2b1942fc
Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.
2013-11-05 22:50:53 +01:00
scrawl
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
2013-11-05 19:50:24 +01:00
Marc Zinnschlag
c545b3682a
compose info record IDs from actual record ID and parent topic ID (to make sure IDs are unique)
2013-11-05 12:57:55 +01:00
Marc Zinnschlag
2d4a6c0edf
cleaned up ID handling in INFO record (including a ESMTool bug fix)
2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88
added missing columns to topic info table
2013-11-05 11:41:48 +01:00
Marc Zinnschlag
245d7b0ae4
Merge remote-tracking branch 'scrawl/windowclosefix'
2013-11-05 08:19:53 +01:00
Marc Zinnschlag
f4e6f31658
Merge remote-tracking branch 'scrawl/openmw-27'
2013-11-05 08:19:29 +01:00
scrawl
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
2013-11-05 03:02:28 +01:00
scrawl
3a827d9c12
Deleted Obliviontt.zip
2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson
468e8e3635
Missing iostream include
2013-11-04 10:36:22 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
graffy76
6d439d032f
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
2013-11-03 21:38:10 -06:00
graffy76
ed913936f8
Eliminated game & addon keys from profile configuration
2013-11-03 21:36:41 -06:00
graffy76
dace904490
changed game/addon to content for writing to openmw.cfg from launcher
2013-11-03 16:45:18 -06:00
Marc Zinnschlag
3ac58b387b
fixed wording of an error message
2013-11-03 22:08:38 +01:00
graffy76
1d4b5a2425
Fix broken launcher content file display / selection scheme
...
Disable selection of content files with missing dependencies (grayed
out)
2013-11-03 14:02:41 -06:00
graffy76
12c06a5615
Fixed broken dependency check
2013-11-03 06:21:28 -06:00
Marc Zinnschlag
4724df7e9b
added topic/journal column to info tables
2013-11-03 10:48:50 +01:00
graffy76
973803eb2f
Fixed pathing issues in launcher
2013-11-03 00:02:46 -05:00
Lukasz Gromanowski
afce10cf37
Fixes #597 : Assertion `dialogue->mId == id' failed in esmstore.cpp
...
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-11-02 16:39:05 +01:00
graffy76
8d12e2b99d
fixed merge conflicts
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/launcher/settings/gamesettings.hpp
components/contentselector/model/contentmodel.cpp
2013-11-02 09:31:23 -05:00
graffy76
cddece4f9e
Another stab at fixing the pathing problem...
2013-11-01 21:47:26 -05:00
scrawl
e6960d915a
Add simple Ogre widget
2013-11-02 02:51:38 +01:00
Marc Zinnschlag
15b7d3263c
subclass ESM::DialInfo to keep track of parent topic
2013-11-01 17:43:45 +01:00
graffy76
0cb591e4f6
Fixed path problem with adjuster widget and local data path.
2013-10-31 18:12:13 -05:00
Marc Zinnschlag
ea0e8be0d3
disallow sorting (via column headers) in info tables
2013-10-31 13:40:14 +01:00
Marc Zinnschlag
90aa8f9db6
fixed dialogue record loading with multiple content files
2013-10-31 13:11:15 +01:00
Marc Zinnschlag
767cb54e7c
added missing columns to journal info table
2013-10-31 12:54:55 +01:00
Marc Zinnschlag
69f28ee4be
split info records between journal and topic info tables
2013-10-31 12:16:45 +01:00
gus
683b8d77dd
build fix (thanks travis)
2013-10-31 11:02:26 +01:00
gus
d587f3c946
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/docs/vmformat.txt
2013-10-31 09:51:17 +01:00
gus
02ded18fc5
Linux backslash fix
2013-10-31 09:43:12 +01:00
gus
2a927f65d3
perfomances optimisations (pathfinding is computed less often, max 4 times per sec)
2013-10-30 20:52:23 +01:00
gus
650a112e2e
better timer
2013-10-30 20:42:50 +01:00
scrawl
636d399c7f
Refactored Ogre initialisation into a component
2013-10-30 14:04:33 +01:00
scrawl
4f35fd8184
Removed a workaround from Renderer, some cleanup
2013-10-30 13:05:28 +01:00
Marc Zinnschlag
ba88c94d58
first attempt at an info record collection
2013-10-29 13:18:22 +01:00
Marc Zinnschlag
45f5a66bcc
use result of getAppendIndex instead of always appending at the end
2013-10-29 09:27:23 +01:00
gus
a6e7c6c104
disable AI combat for creatures
2013-10-28 23:04:46 +01:00
gus
5b20cce849
CMake fix
2013-10-28 18:36:09 +01:00
gus
0e86209224
linux fix :p
2013-10-28 18:33:10 +01:00
gus
b7a9243173
fighting should stop when the target is dead
2013-10-28 18:22:36 +01:00
gus
12d8b4e0f8
bugfix
2013-10-28 18:13:07 +01:00
gus
2d84f7d33d
NPC run
2013-10-28 18:10:00 +01:00
gus
d7584f9df7
getLineOfSight, no script instruction yet
2013-10-28 18:01:40 +01:00
Marc Zinnschlag
f5fbe7361f
Merge remote-tracking branch 'lgro/saving' into saving
2013-10-28 08:35:51 +01:00
graffy76
b51bef0d98
fixed missing adjuster widget in file dialog open view
2013-10-27 20:21:19 -05:00
Lukasz Gromanowski
d51c9b64dd
Issue #913 : Merge --master and --plugin switches
...
Launcher part of master/plugin switches merge.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 20:03:12 +01:00
Lukasz Gromanowski
489475a32f
Corrected compilation error (g++ 4.8.2) triggered by not found declaration
...
in argument-dependent lookup at the point of instantiation.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-27 19:57:05 +01:00
Marc Zinnschlag
c2bbbef637
Merge remote-tracking branch 'rainChu/drowning-gauge'
2013-10-27 16:10:11 +01:00
gus
2515a1239e
improved combat conditions
2013-10-27 14:22:51 +01:00
Marc Zinnschlag
9a80e11182
reimplemented add and appendBlankRecord via insertRecord
2013-10-27 14:13:10 +01:00
gus
968968502e
NPC always face you when fighting
2013-10-27 14:03:58 +01:00
Marc Zinnschlag
525d6fadec
added Collection insert function for arbitrary position and reimplemented appendRecord in via this function
2013-10-27 14:00:25 +01:00
gus
a0edb55f60
only NPC with fight over 80 will attack you now
2013-10-27 13:50:29 +01:00
gus
882b136b35
bugfix of bugfix ^^
2013-10-27 13:21:16 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
graffy76
ea7a8eb2a4
last commit
2013-10-26 23:04:39 -05:00
graffy76
5e123d3f52
Hide adjusterwidget for open files view
2013-10-26 22:57:22 -05:00
graffy76
9b483c3ae3
Fix for file path issues
2013-10-26 22:55:44 -05:00
graffy76
ba365ff49e
Fixed merge conflicts with saving branch
2013-10-25 19:23:03 -05:00
scrawl
8c9a5de26f
Fix an irritating error message
2013-10-25 23:47:53 +02:00
graffy76
9ce4a04a2d
merge from saving
...
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector
Conflicts:
apps/launcher/datafilespage.cpp
apps/opencs/editor.cpp
apps/opencs/view/doc/filedialog.cpp
apps/opencs/view/doc/filedialog.hpp
2013-10-25 14:44:22 -05:00
graffy76
1a23cccce3
Implemented Launcher namespace
2013-10-25 11:17:26 -05:00
graffy76
16d87ea1d1
Merge branch 'master' into esxSelector
2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731
Fixed filedialog new / edit content path issue
2013-10-24 17:33:28 -05:00
graffy76
b48f066f33
Reimplemented content selector for filedialog and datafilespage classes
2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76
Revert "Implemented ContentSelector as a singleton "charm" modifier for"
...
This reverts commit 24b167b755
2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6
Reimplemented constentselector view class
2013-10-22 21:52:35 -05:00
Marc Zinnschlag
67bc0a0c70
additional modification to the IDValidator (restricting relaxed mode slightly more)
2013-10-22 11:32:10 +02:00
Marc Zinnschlag
dc473221e7
added ID-argument to CollectionBase::getAppendIndex (required for info record collection)
2013-10-22 11:21:12 +02:00
Marc Zinnschlag
aa61948801
relaxed rules for new IDs when ID is also a user visible text
2013-10-22 11:08:37 +02:00
Marc Zinnschlag
3146af34d6
some fixes for the merged filter branch
2013-10-21 19:28:57 +02:00
Marc Zinnschlag
fdba029566
Merge remote-tracking branch 'sirherrbatka/filters' into saving
2013-10-21 18:59:12 +02:00
Marek Kochanowicz
70602c2c36
Removed changes in the unimplemented copy ctor.
2013-10-21 18:24:16 +02:00
Marek Kochanowicz
5e1bdd605b
Corrected formatting in document.hpp
2013-10-21 18:15:26 +02:00
Marc Zinnschlag
88e09159c4
splitting off characters menu from mechanics menu (was getting too big)
2013-10-21 18:04:40 +02:00
Marc Zinnschlag
743c6ea5b1
save dialogue records
2013-10-21 16:47:32 +02:00
Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
2013-10-21 16:45:43 +02:00
Marek Kochanowicz
b23df42817
Removed old comment. Changed to set resources path correctly.
2013-10-21 16:06:16 +02:00
Marc Zinnschlag
3b85d97087
handle deleted dialogue records
2013-10-21 15:38:13 +02:00
Marc Zinnschlag
dc12648a3e
add fixed dialogue records when creating a new omwgame file
2013-10-21 14:26:54 +02:00
Marc Zinnschlag
c0e5501431
disallow the deletion of non-topic, non-journal dialogue records
2013-10-21 13:58:47 +02:00
Marc Zinnschlag
0be157efea
set dialogue type for newly created dialogue records
2013-10-21 13:39:13 +02:00
Marc Zinnschlag
75c5316ad7
added dialogue type column to topics table
2013-10-20 17:26:09 +02:00
Marc Zinnschlag
adf3a41a83
added topic and journal tables
2013-10-20 17:15:32 +02:00
Marc Zinnschlag
ebf7732912
some cleanup
2013-10-20 15:48:39 +02:00
Marek Kochanowicz
96b6787255
Getting rid of extension. Correcting tiny mistake in filters file.
2013-10-20 10:56:27 +02:00
Marek Kochanowicz
184456892b
Added check to load custom filters set when present.
2013-10-19 18:43:47 +02:00
Marek Kochanowicz
4e26a61db3
Removed command line handling. Maybe zini will let me to implement it later. Implemented switch to handle resources directory. TODO: check for defaultfilters on data path.
2013-10-18 22:11:14 +02:00
Marek Kochanowicz
a7002e8a09
Implements switch (--help and --resources), and copying defaultfilters.omwaddon.project. Seems to work.
2013-10-17 18:21:41 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
Marc Zinnschlag
8c139783b7
silenced a warning
2013-10-16 21:33:11 +02:00
Marc Zinnschlag
19bd0f90b9
Merge remote-tracking branch 'rainChu/torches'
2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
65818155d8
Fixed punctuation consistency
2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad
e11da5c0a3
Added a constructor to Light CustomData
2013-10-16 15:13:36 -04:00
Marek Kochanowicz
3000386443
failed attempt on switch adding.
2013-10-16 13:07:26 +02:00
Alex "rainChu" Haddad
2643214ca6
Lights extinguish underwater
2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad
30ee3c5cf6
Equipped torches and lights run out of fuel
2013-10-15 21:50:14 -04:00
Emanuel Guevel
ba4b8a37e2
Remember pressed message box button longer
...
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.
Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
2013-10-14 12:55:06 +02:00
Marc Zinnschlag
db7ea30483
allow float values in cell for value tests
2013-10-14 11:15:36 +02:00
Marc Zinnschlag
679754b305
corrected an error message
2013-10-14 11:06:59 +02:00
Marc Zinnschlag
9b0766b678
minor fix in ValueNode::toString
2013-10-14 10:58:11 +02:00
Marc Zinnschlag
4905f1c8ab
make testing empty cells against an empty string yield true
2013-10-13 21:54:36 +02:00
Marc Zinnschlag
ce8694c84e
Merge remote-tracking branch 'scrawl/master'
2013-10-13 18:55:49 +02:00
scrawl
683ad40e21
No need for this ifdef since there is a default argument.
2013-10-13 18:28:22 +02:00
scrawl
fa264935ff
We can apply vsync at runtime now that the Ogre bug is fixed.
2013-10-13 17:56:26 +02:00
scrawl
f504ab42fe
Turn off vsync while in the loading screen
2013-10-13 17:52:14 +02:00
Marc Zinnschlag
b8ae195a46
Merge branch 'scene'
2013-10-13 15:42:27 +02:00
Marc Zinnschlag
4624bed899
changed handling of scene toolbar button icons
2013-10-13 15:41:48 +02:00
Marc Zinnschlag
fc5afe430b
Merge remote-tracking branch 'potatoesmaster/fatigue-restoration'
2013-10-13 14:40:48 +02:00
Emanuel Guevel
dcfff79460
Regenerate fatigue over time
2013-10-13 00:40:27 +02:00
Marc Zinnschlag
708cde2688
Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection'
2013-10-12 23:18:19 +02:00
Jordan Ayers
141382b8c0
COC Command: Exterior cell selection fix.
...
Return the northernmost cell of the easternmost matching column for Ext. cells.
2013-10-12 14:48:37 -05:00
Marc Zinnschlag
608d154ad7
Merge remote-tracking branch 'rainChu/master'
2013-10-12 20:31:33 +02:00
Alex "rainChu" Haddad
cfc3093320
Reverted conditional compiling
2013-10-12 10:46:44 -04:00
Marc Zinnschlag
b5d620a8dc
fixed string filter on enum column when column is empty
2013-10-12 16:35:59 +02:00
Marc Zinnschlag
a29b8667ef
fixed string filter on boolean columns when testing against the value false
2013-10-12 16:29:36 +02:00
Marc Zinnschlag
a77044cda4
fixed column numbering
2013-10-12 16:15:47 +02:00
Marc Zinnschlag
2606feec3a
Merge remote-tracking branch 'lgro/cfg_without_data_path'
2013-10-12 13:52:38 +02:00
Marc Zinnschlag
3c580fbc59
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
2013-10-12 13:40:29 +02:00
Marc Zinnschlag
458c752425
Merge remote-tracking branch 'mckibbenta/tgm'
2013-10-12 13:38:10 +02:00
Marc Zinnschlag
87cd5d4267
Merge remote-tracking branch 'potatoesmaster/DisableLevitation'
2013-10-12 13:31:06 +02:00
Marc Zinnschlag
9c4d88cd76
Merge remote-tracking branch 'potatoesmaster/acrobatics'
2013-10-12 13:20:12 +02:00
Marc Zinnschlag
c8dc6a70b7
Merge remote-tracking branch 'greye/master'
2013-10-12 13:14:47 +02:00
Marc Zinnschlag
c8695db66f
Merge remote-tracking branch 'wheybags/unshield_fixes'
2013-10-12 13:03:38 +02:00
Lukasz Gromanowski
5ce1f50fab
Cleanup in MWGui::WindowManager constructor initialzation list.
...
Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:
https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-10 23:06:37 +02:00
Jordan Ayers
6e4978643c
Magic Effect descriptions: support feet / level modes.
...
Show proper suffixes for all magnitudes.
Drop extra 'times' symbol in 'timesInt format (not consistent
with other magnitude displays).
2013-10-09 00:08:11 -05:00
Jordan Ayers
6ab7002908
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
2013-10-07 22:28:55 -05:00
Jordan Ayers
065f435225
Format fix: remove extra spaces from ranged TimesINT formatting.
2013-10-07 20:02:20 -05:00
gus
94069e3a7e
bugfix
2013-10-07 20:30:12 +02:00
graffy76
17950210fa
Merge branch 'master' into esxSelector
2013-10-07 06:52:20 -05:00
Marc Zinnschlag
74cee66273
consolidated magic numbers for button size
2013-10-07 11:24:53 +02:00
gus
1ac3d99c78
pathfinding now works in AICombat.
2013-10-07 10:20:02 +02:00
Marc Zinnschlag
4d6c3cdf09
removed more garbage
2013-10-07 08:55:04 +02:00
graffy76
4c72a9ffdf
Fixed non-loading files
2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4
Implemented profile function in launcher datafiles page
...
Implemented dependency sorting to ensure dependent files appear latest
in the list.
2013-10-06 21:13:47 -05:00
Jordan Ayers
6303e56ce4
Magic Effect Display cleanup: Don't put spaces in percentages.
2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e
Magic Effect Display improvement.
...
Related to Bug #794 .
Always show one decimal point precision for Fortify Max. Magicka effect.
2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16
Magic effect display improvement.
...
Related to Bug #794 .
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
2013-10-06 19:32:40 -05:00
Emanuel Guevel
2abe5c1c9a
Acrobatics: do not apply fall damages when slowfalling spell effect is active
...
If spell effect ends up in mid-air, calculate fall height from then.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
4265dddc40
Add MWWorld::isSlowFalling(Ptr)
2013-10-02 23:34:25 +02:00
Emanuel Guevel
6e09a5fb4a
Acrobatics: reinit fall height at current height rather than zero
...
To prevent problems.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
2b992ef3b5
Acrobatics: use calculated fatigueTerm
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4c151e59a2
Acrobatics: do not touch modified stats
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4860514865
Acrobatics: cosmetic changes
2013-10-02 23:34:24 +02:00
mckibbenta
857deb3723
Merge branch 'master' into tgm
2013-10-02 13:54:03 -04:00
mckibbenta
073f64c8bb
stop weapon condition degredation (for the player) with tgm on
2013-10-02 13:46:33 -04:00
Emanuel Guevel
496f786c2a
Implement Disable/EnableLevitation script functions
...
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
Alex "rainChu" Haddad
f1b4c2e400
Fixed first person offset to use world transform
...
It slipped my mind that some necks might not be perfectly vertical.
2013-10-02 07:03:39 -04:00
Alex "rainChu" Haddad
ed0c31b485
Refactored, moved logic out of NpcAnimation
...
The logic is now handled by RenderingManager, and Camera sets its
animation's first person offset height. Due to how NpcAnimation seems to
be updated, it has to be the one to actually set its own nodes, in the
case of the hands. Otherwise, the hands would not move without a messier
hack.
2013-10-02 05:16:52 -04:00
graffy76
a5a0f61533
Fixed missing profiles combobox
2013-10-01 22:36:49 -05:00
graffy76
00c78a4aa1
Implementing ContentSelector class in DataFilesPage
...
Moved AdjusterWidget / FileWidget to ContentSelectorView
2013-10-01 21:29:45 -05:00
Emanuel Guevel
b8c60dabb3
Reintroduce Acrobatics changes made by Glorf
...
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad
0ddb5097fc
Revert "Bug #840 , First Person Sneaking Camera Height"
...
This reverts commit 296abfd48f
2013-10-01 11:44:45 -04:00
Alex "rainChu" Haddad
296abfd48f
Bug #840 , First Person Sneaking Camera Height
...
Also, added comments to existing code in the area.
2013-10-01 10:48:34 -04:00
Alex "rainChu" Haddad
4496244b14
Tabs to spaces
...
My own code uses only tabs - I forgot to change the setting on my IDE,
sorry!
2013-10-01 05:36:13 -04:00
Alex "rainChu" Haddad
eae02ea00d
Cleaned up my hackish code for WinMain
2013-09-30 03:33:31 -04:00
Alex "rainChu" Haddad
00a776a1a8
Fixed compilation failure on my machine
...
Fixed shared records not being populated before the player record is
moved.
2013-09-30 02:54:20 -04:00
greye
4cdb57e388
workaround segfault on --new-game switch
2013-09-30 10:30:40 +04:00
Alex "rainChu" Haddad
bffbfff41c
My own fix to make it hackily compile
2013-09-30 00:32:06 -04:00
graffy76
24b167b755
Implemented ContentSelector as a singleton "charm" modifier for
...
FileDialog...
2013-09-29 12:19:07 -05:00
Tom Mason
dd0a416249
cleaned up bloodmoon_fix_ini
2013-09-29 16:59:52 +01:00
Tom Mason
fd169c2399
fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder
2013-09-29 15:49:47 +01:00
Lukasz Gromanowski
ef617d408b
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches in launcher.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-09-29 09:14:40 +02:00
Lukasz Gromanowski
9c2145eda1
Issue #913 : Merge --master and --plugin switches
...
Merged master/plugin switches into content in openmw
and mwiniimporter.
Extension in content files is now required.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-09-29 09:11:57 +02:00
gus
83a375b55d
AI now continue to hit you.
...
TODO: change the way time is handled
2013-09-28 21:17:06 +02:00
Marc Zinnschlag
7be1f1afc2
implemented SceneToolMode as a horizontal panel with radiobutton-type buttons
2013-09-28 13:10:42 +02:00
gus
2537384c50
bug fix
2013-09-28 12:25:37 +02:00
Marc Zinnschlag
0c5f07a65a
added SceneToolMode class
2013-09-28 11:27:24 +02:00
Marc Zinnschlag
84cadc10f4
added scene toolbar buttons (still not doing anything)
2013-09-28 11:06:56 +02:00
Marc Zinnschlag
9ea092927f
added basic scene subview (no functionality yet)
2013-09-28 09:25:54 +02:00
Marc Zinnschlag
6143ec33e0
giving Documents direct access to ConfigurationManager
2013-09-27 15:24:58 +02:00
Marc Zinnschlag
e7c48cbe58
load project files
2013-09-27 15:04:30 +02:00
Marc Zinnschlag
62148b3247
moved implementation of searchColumnIndex and findColumnIndex functions from IdTable to CollectionBase
2013-09-27 15:04:09 +02:00
Marc Zinnschlag
baae548106
added project scope filter saving
2013-09-27 13:56:40 +02:00
Marc Zinnschlag
6ac4dedfbe
added missing column enum
2013-09-27 13:56:23 +02:00
Marc Zinnschlag
31346dde58
fixed uninitialise scope value for filters
2013-09-27 13:55:28 +02:00
Marc Zinnschlag
6f2c418a5c
(slightly) improved error reporting during save operations
2013-09-27 13:54:51 +02:00
Marc Zinnschlag
23095ec3ec
added missing scope column to filter table
2013-09-27 13:54:21 +02:00
Marc Zinnschlag
5779f799ab
create project file when saving content file
2013-09-27 11:36:06 +02:00
Marc Zinnschlag
1363e86828
made verifier ignore deleted records
2013-09-27 10:08:09 +02:00
gus
9353f4d14f
WIP AI combat
2013-09-25 18:01:36 +02:00
Marc Zinnschlag
96fd1c35bf
preserve author/descriptin meta data
2013-09-24 17:17:01 +02:00
Marc Zinnschlag
830530bd06
set record count in TES3 header
2013-09-24 17:08:24 +02:00
Marc Zinnschlag
e4fdebc85b
added saving for referenceable records
2013-09-24 13:53:19 +02:00
Marc Zinnschlag
c42e74dadf
make 4 byte record type accessable from record struct
2013-09-24 13:17:28 +02:00
graffy76
3b40192e90
Merge branch 'master' into esxSelector
2013-09-23 22:03:42 -05:00
Marek Kochanowicz
ae5e8b95ff
Solving Issue912
2013-09-23 20:12:04 +02:00
Marc Zinnschlag
0f1c4cb00e
cleanup
2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c
Switched to using proper enums as opposed to ints.
2013-09-23 08:31:36 -04:00
graffy76
d7cff6361e
Fixed filter issue (all addons for a gamefile are enabled for checking).
...
Note: Other dependencies are not yet automatically selected when an
addon is checked.
2013-09-23 06:51:49 -05:00
Berulacks
0c518fb047
Replaced tabs with spaces.
2013-09-23 07:36:50 -04:00
Berulacks
c423479f20
Fixed bug #887
2013-09-23 07:31:14 -04:00
Marc Zinnschlag
6d9ff39390
set dependencies when saving (requires further refinements)
2013-09-23 12:16:56 +02:00
Marc Zinnschlag
74d683b530
fixed save path for newly created addons
2013-09-23 11:58:11 +02:00
Marc Zinnschlag
63e0cf5154
fixed missing initialisation of adjuster widget in file dialogue
2013-09-23 11:26:29 +02:00
Marc Zinnschlag
d4b2a6b9f1
Merge remote-tracking branch 'graffy76/esxSelector' into saving
2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e
Implemented file/adjuster widgets into new addon creation dialog
2013-09-22 23:52:53 -05:00
Marc Zinnschlag
a6ea670255
use IdTypeDelegate in report table
2013-09-22 13:54:01 +02:00
Marc Zinnschlag
1c4a4b4f26
generalised RefIdTypeDelegate into IdTypeDelegate
2013-09-22 13:39:44 +02:00
Marc Zinnschlag
f2875e234c
added missing position columns to reference table
2013-09-22 10:43:09 +02:00
graffy76
70ac14b8ba
Merge branch 'master' into esxSelector
2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427
Renamed esxSelector to contentSelector
...
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
2013-09-21 23:06:29 -05:00
Marc Zinnschlag
94bb97e766
replacing tabs with spaces
2013-09-21 08:40:00 +02:00
Marc Zinnschlag
96b181bb54
Merge remote-tracking branch 'xethik/master'
2013-09-21 08:07:00 +02:00
Xethik
094e4d93b7
Generally speaking, you should never compare iterators from two different compilers
...
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
2013-09-20 21:38:10 -04:00
Xethik
58bb0b8773
Bug #907
...
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
2013-09-20 21:26:12 -04:00
graffy76
7b7dfa122d
Merge branch 'master' into esxSelector
2013-09-19 16:24:28 -05:00
Marc Zinnschlag
99fe6e68c7
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-19 15:14:35 +02:00
Marc Zinnschlag
8d4f4e395f
update syntax highlighting when ID list changes
2013-09-19 14:26:09 +02:00
Marc Zinnschlag
ba5e2a0330
changed ID listing to include deleted records by default
2013-09-19 13:42:19 +02:00
Marc Zinnschlag
9c751ae370
separate highlight colour for IDs
2013-09-19 12:30:42 +02:00
Marc Zinnschlag
3d2281fe80
added signals and functions to Data for handling ID list changes
2013-09-19 12:11:27 +02:00
Marc Zinnschlag
78f7f80fc3
configured script highlighting with extensions
2013-09-19 08:58:27 +02:00
graffy76
0eb06ada39
Implemneting drag and drop
2013-09-18 02:36:23 -05:00
scrawl
d5ef843f56
Fix a missing model update
2013-09-16 19:22:08 +02:00
Marc Zinnschlag
acfd78c62a
implemented saving for all supported record types except cells, referencables and references
2013-09-16 14:17:04 +02:00
Marc Zinnschlag
03054c8160
forgot to write record ID
2013-09-16 14:10:05 +02:00
Marc Zinnschlag
bf0fba68af
added save stage for globals
2013-09-16 12:51:57 +02:00
mckibbenta
6bb6ba6372
added god mode comment
2013-09-15 16:12:59 -04:00
mckibbenta
3035675a26
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-09-15 15:49:18 -04:00
mckibbenta
644f081c60
minor changes
2013-09-15 15:48:32 -04:00
Marc Zinnschlag
db70095148
write TES3 header
2013-09-15 15:31:44 +02:00
Marc Zinnschlag
231419028d
minor fix
2013-09-15 15:03:17 +02:00
Marc Zinnschlag
fa25a068a8
basic saving (no data is written to file yet)
2013-09-15 15:00:41 +02:00
Marc Zinnschlag
8326ac9b6f
replaced dummy save implementation with a threaded dummy save implementation
2013-09-15 12:53:59 +02:00
Marc Zinnschlag
d71d282952
more Operation enhancements in preparation for save operation
2013-09-15 12:03:36 +02:00
Marc Zinnschlag
414e6abb95
more signal cleanup
2013-09-15 11:35:12 +02:00
Marc Zinnschlag
a5aebfb760
minor cleanup
2013-09-15 09:32:20 +02:00
mckibbenta
c9f1bd8735
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-09-14 16:38:46 -04:00
Marc Zinnschlag
b7bffc8a79
removed Verifier class (using Operation class without subclassing now)
2013-09-14 15:16:31 +02:00
Marc Zinnschlag
f4c03c6a29
added ordered-flag to Operation (currently ignored)
2013-09-14 15:12:24 +02:00
Marc Zinnschlag
077a157841
moved Operation and Stage from model/tools to model/doc
2013-09-14 14:56:23 +02:00
Marc Zinnschlag
c961abce96
added warning message to startup window
2013-09-14 14:00:07 +02:00
Marc Zinnschlag
9637e1641b
fix for building with system tinyxml
2013-09-14 13:33:49 +02:00
Marc Zinnschlag
07ff0a8de9
possible build fix for Windows
2013-09-12 20:52:05 +02:00
Marc Zinnschlag
bf8a25c2c6
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-12 19:07:35 +02:00
mckibbenta
89b7d6121d
Initial toggleGodMod/tgm instruction. Currently only affects player health.
2013-09-12 08:30:00 -04:00
mckibbenta
85b8af6262
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-12 08:08:07 -04:00
scrawl
09e692f1f6
Fixed polish font
2013-09-10 22:11:57 +02:00
Marc Zinnschlag
554c44892a
Merge branch 'newgame'
2013-09-10 16:45:09 +02:00
Marc Zinnschlag
e9f14449eb
added AdjusterWidget
2013-09-10 16:45:01 +02:00
gus
f9bfbc8764
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
2013-09-10 16:18:39 +02:00
gus
46a734852b
adding script instruction getLOS + some test about AI
2013-09-10 16:16:13 +02:00
Marc Zinnschlag
2dc3c0ae4f
integrated startup icons
2013-09-09 09:41:43 +02:00
Marc Zinnschlag
25b7cd33ea
added FileWidget; fixed OpenCS configuration
2013-09-08 14:31:20 +02:00
Marc Zinnschlag
ecedb60169
splitting new game and new addon functions (new game currently not working)
2013-09-08 12:06:28 +02:00
Marc Zinnschlag
f7940d7d1a
focus load document button by default in startup window
2013-09-08 11:24:06 +02:00
Marc Zinnschlag
2d9e9fe3e1
Merge branch 'startup'
2013-09-08 09:34:41 +02:00
Marc Zinnschlag
cae5eb424d
cleaned up opening the settings dialogue from a view
2013-09-08 09:33:45 +02:00
Marc Zinnschlag
efdf2961f0
open user settings dialogue centered
2013-09-08 09:28:43 +02:00
Marc Zinnschlag
0e81fb32dd
hooked up edit config signal from startup window
2013-09-08 09:26:43 +02:00
Marc Zinnschlag
17bf7e59a4
added proper startup dialogue (still missing icons)
2013-09-08 09:15:26 +02:00
graffy76
a6e7cf9a8c
Implementing drag and drop
2013-09-07 15:57:40 -05:00
Tom Mason
7b9c5c75e7
silenced unshield
2013-09-07 16:16:09 +01:00
Tom Mason
2b50e34566
Fixed issue with copy_file
...
from: https://forum.openmw.org/viewtopic.php?f=20&t=1718&hilit=0.26&start=50#p18705
2013-09-07 15:41:51 +01:00
Marc Zinnschlag
9b7cd5958f
Merge remote-tracking branch 'scrawl/master'
2013-09-07 08:23:25 +02:00
scrawl
10c21579bc
Item stacking case sensitivity fix
2013-09-07 01:00:38 +02:00
Marc Zinnschlag
3d66f7521e
Merge remote-tracking branch 'marcrbouvier/master'
2013-09-06 08:44:59 +02:00
Marc Bouvier
784cba21f2
[Feature #881 ] Change Tabs to Spaces
...
Some of the tabs were not made of spaces, so Git defaults tabs to the
length of 8 spaces. OpenMW uses 4 spaces per tab.
2013-09-05 23:02:51 -05:00
Marc Zinnschlag
dc345dd43d
Merge branch 'filter'
2013-09-05 15:47:52 +02:00
Marc Zinnschlag
8f0ab29a9f
allow the use of keywords for strings without quotation marks
2013-09-05 15:47:38 +02:00
Marc Zinnschlag
645b50ef36
added support for half-sided intervals to filter parser
2013-09-05 15:38:28 +02:00
Marc Zinnschlag
f3ce9c22a1
rewrote value node to support half-sided intervals (meaning infinity or -infinity for the missing half)
2013-09-05 15:22:14 +02:00
Marc Zinnschlag
9332684335
allow the use of value types in string filters
2013-09-05 15:05:49 +02:00
Marc Zinnschlag
f2e86e860e
allow the use of record types in string filters
2013-09-05 14:39:56 +02:00
Marc Zinnschlag
8bebe7179c
some UniversalId fixes
2013-09-05 13:58:36 +02:00
Alexander "Ace" Olofsson
5e42c73356
Better fix for unshield, comments on changes, no more commented out code.
2013-09-05 10:39:17 +02:00
mckibbenta
ae02499eff
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-04 21:15:44 -04:00
Alexander "Ace" Olofsson
22a5f7198f
A few fixes to build on Windows
2013-09-04 23:25:47 +02:00
Marc Zinnschlag
842a616909
more cleanup
2013-09-03 14:18:34 +02:00
Marc Zinnschlag
6cd7da6547
Merge remote-tracking branch 'marcrbouvier/master'
2013-09-03 13:47:07 +02:00
Marc Bouvier
6b11f59ed4
[Feature #881 ] Rename QLocalServer
...
The server name should be more unique to the project so there isn't a
interprocess clash.
2013-09-03 06:24:11 -05:00
Marc Zinnschlag
80f8024da7
allow specifying record modification status column enum via strings
2013-09-03 13:03:02 +02:00
Marc Zinnschlag
f80373a849
removed two unused files
2013-09-03 12:53:45 +02:00
Marc Zinnschlag
1744a64f77
in filters allow specifiying boolean columns as strings
2013-09-03 12:32:06 +02:00
Marc Bouvier
0ae2bb2fae
[Feature #881 ] Code Formatting
...
Code formatted to the OpenMW policy.
2013-09-03 05:22:48 -05:00
Marc Bouvier
563bd0b430
[Feature #881 ] Raise OpenCS New Window After Re-execution
...
The OpenCS startup window of the existing exist is raised when trying to
start a new instance. This is done by the new instance connection to the
existing instance's QLocalServer. Once the connection is established the
existing instance raises the startup window.
2013-09-03 04:12:19 -05:00
Marc Bouvier
51332b86a1
[Feature #811 ] Only 1 Instance of OpenCS is Allowed
...
If another instance of OpenCS is started, then it will terminate. This
is done by creating a QLocalServer with a unique ID. If another
QLocalServer with the same ID attempts to be opened, then the creation
of the QLocalServer will fail and the application will terminate.
2013-09-03 01:44:21 -05:00
mckibbenta
e545f49807
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-09-02 18:40:37 -04:00
Marc Zinnschlag
9cb121bd04
allow specifying enums as text in filters
2013-09-02 12:23:19 +02:00
Marc Zinnschlag
649ef6f120
moved list of enum literals from ViewManager to Columns (which makes them available to the rest of model now)
2013-09-02 11:58:05 +02:00
Marc Zinnschlag
e03de11fa8
Merge remote-tracking branch 'corristo/master'
2013-09-02 10:57:01 +02:00
Marc Zinnschlag
7076ea9467
Merge remote-tracking branch 'scrawl/map'
2013-09-02 10:55:12 +02:00
Marc Zinnschlag
5f380bc085
Merge remote-tracking branch 'lgro/unittests'
2013-09-02 10:54:51 +02:00
Nikolay Kasyanov
f9cfe654f2
Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154
...
(Qt redefines min OS X version and SDL in turn checks this version and
doesn't accept version set by Qt)
2013-09-01 23:17:41 +04:00
scrawl
3ddeb075fb
Fix a cell border seam on the map
2013-08-31 04:36:23 +02:00
Lukasz Gromanowski
2c49458b6c
Added unittests for FileFinder::FileFinderStrict class.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-31 00:13:42 +02:00
Lukasz Gromanowski
0e83b50659
Changed test dir for SearchTest.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 23:24:33 +02:00
Lukasz Gromanowski
2baaef7d87
Added unittests for FileFinder::FileFinder class.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 23:23:34 +02:00
Lukasz Gromanowski
303e02cab5
Added unittests for FileFinder::find function.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 22:45:30 +02:00
Lukasz Gromanowski
515a865daa
Changed ASSERT_EQ to ASSERT_TRUE/FALSE.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 22:44:03 +02:00
Lukasz Gromanowski
da0b90ee45
Converted tests from components/misc into google unittests.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-08-30 21:57:06 +02:00
Chris Robinson
82a09a988b
Minor pathfinding cleanup
2013-08-29 19:17:27 -07:00
Chris Robinson
8f23b330d3
Remove unnecessary initialization
2013-08-29 17:41:20 -07:00
Chris Robinson
9499ac4fd5
Increase the distance for reaching a path node
2013-08-29 17:41:20 -07:00
Chris Robinson
f9dbce685a
Avoid killing AIWander and AITravel when far away
...
This fixes the problem of certain NPCs not wandering because they
happened to spawn near a cell border away from the player, which
immediately "completed" the wander package.
AIWander can't cause NPCs to cross cell boundaries, so there's no risk
of them walking into an unloaded to. AITravel will now simply stop
moving, and resume later when the cell is loaded.
2013-08-29 17:41:20 -07:00
mckibbenta
f65172bdca
Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm
2013-08-29 20:26:36 -04:00
mckibbenta
eef9df504a
fiddlings
2013-08-29 20:25:36 -04:00
scrawl
c8e31725dc
Fix weather sounds persisting on a new game
2013-08-29 15:16:08 +02:00
Marc Zinnschlag
9f0b34eae0
fixed reference loading code (editor)
2013-08-29 13:27:54 +02:00
Marc Zinnschlag
ce90c2f3be
Merge remote-tracking branch 'kcat/master'
2013-08-28 21:05:07 +02:00
Chris Robinson
e589d0ec91
Werewolves can't activate activators
2013-08-28 11:36:22 -07:00
Chris Robinson
84d259ab8e
Avoid reconstructing strings for updating the dynamic stats
...
Attributes still do this, but they change infrequently enough that it doesn't
matter.
2013-08-28 10:50:29 -07:00
scrawl
5918b84666
Don't crash on resize events during load
2013-08-28 17:05:28 +02:00
Marc Zinnschlag
94e255ea47
Merge branch 'filter'
2013-08-28 12:42:03 +02:00
Chris Robinson
92082dae66
Modify the current magicka and fatigue when the base changes
2013-08-27 22:44:52 -07:00
Chris Robinson
305b5fec0f
Avoid needlessly copying the MagicEffects
2013-08-27 21:40:31 -07:00
Chris Robinson
281fdbd81b
Cleanup some redundancy
2013-08-27 17:56:47 -07:00
Chris Robinson
33c173a23a
Update the watched Ptr when changing it
2013-08-27 17:22:07 -07:00
Chris Robinson
39af9a13fa
Remove some unused functions
2013-08-27 17:13:49 -07:00
Chris Robinson
189541aa72
Apply drowning damage based on the update duration
...
1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat.
2013-08-27 17:08:23 -07:00
Chris Robinson
f216b25be8
Slightly randomize time between environment sounds
...
We should use the "Minimum Time Between Environmental Sounds" and
"Maximum Time Between Environmental Sounds" INI/fallback settings, but we don't
have them.
2013-08-27 16:04:19 -07:00
Chris Robinson
02df8ab841
Store the underwater sound to easily stop it
2013-08-27 13:48:20 -07:00
Chris Robinson
16331bf1ed
Avoid a hack to play the underwater sound properly
2013-08-27 13:26:57 -07:00
Marc Zinnschlag
26b3d93293
streamlined filter syntax
2013-08-27 18:58:23 +02:00
scrawl
839d251cc5
Renamed Terrain::Terrain to Terrain::World to make VC happy
2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
Marc Zinnschlag
2e9948e86a
improved one-shot filter handling; allow empty pre-defined filters
2013-08-26 14:40:34 +02:00
Marc Zinnschlag
aa935ff03d
update tables on filter record changes
2013-08-26 12:49:13 +02:00
Marc Zinnschlag
20bd0707dc
avoid use of column number literals
2013-08-26 12:25:52 +02:00
Marc Zinnschlag
937f5b11a2
fixed broken record deletion
2013-08-26 12:25:19 +02:00
Marc Zinnschlag
dcc55b60c3
Merge remote-tracking branch 'kcat/misc-cleanup'
2013-08-26 08:51:19 +02:00
mckibbenta
60fa69139e
minor changes
2013-08-25 19:20:14 -04:00
Chris Robinson
f2889e4bb5
Remove unused functions and parameters
2013-08-25 16:08:45 -07:00
Chris Robinson
3843357cd2
Fix actor stepping
2013-08-25 16:08:43 -07:00
Chris Robinson
0463dc0653
Use a smaller static geometry size for interior cells
2013-08-25 16:08:43 -07:00
Chris Robinson
bd6dd071aa
Use the non-accumulation root's parent as the accumulation root
...
This relies on the non-accumulation root not being the skeleton root. I haven't
found an instance where this isn't the case.
2013-08-25 16:08:42 -07:00
scrawl
3f8a69b4ad
Don't crash when trying to delete a reference that doesn't exist anymore
2013-08-26 00:14:02 +02:00
scrawl
5af89a9e8f
Fix an AABB assert for loading empty exterior cells
2013-08-26 00:13:42 +02:00
scrawl
c6d2d1999a
Fix an item duplication glitch
2013-08-25 17:40:08 +02:00
mckibbenta
06701467ab
Merge branch 'master' into tgm
2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b
initial do-nothing implementation; registered opcode
2013-08-24 21:19:12 -04:00
Marc Zinnschlag
d007d4dc9a
allow colons in names (filter)
2013-08-24 19:12:47 +02:00
Marc Zinnschlag
7e02c9acf2
added filter text column to filter table
2013-08-24 18:53:11 +02:00
Marc Zinnschlag
25e6380884
implemented use of predefined filters
2013-08-24 17:40:00 +02:00
Marc Zinnschlag
d1516792ce
made document data available to filter parser
2013-08-24 17:17:22 +02:00
Marc Zinnschlag
7aee1da5c6
fixed some columns
2013-08-24 16:51:49 +02:00
Marc Zinnschlag
51fbb0f3f4
fixed a segfault when opening views for tables that do not allow the creation of new records
2013-08-24 15:33:46 +02:00
Marc Zinnschlag
948cb0ef34
Merge remote-tracking branch 'marcrbouvier/master'
2013-08-24 15:13:07 +02:00
Marc Zinnschlag
f605dcdd24
Merge branch 'filter'
2013-08-24 14:51:05 +02:00
Marc Zinnschlag
78c7de440d
simplified filter nodes even more
2013-08-24 14:49:05 +02:00
Marc Zinnschlag
cf58670c85
removed global filter scope (would have caused sync problems between projects)
2013-08-24 14:46:42 +02:00
Marc Zinnschlag
3cf60da5a7
added numeric value filter node
2013-08-24 14:43:38 +02:00
Chris Robinson
ca24a809fc
Use the position of the actor to determine if they're swimming
2013-08-23 13:44:16 -07:00
Chris Robinson
3fa65f21dd
Use a proper cone shape with a contact test to check for melee hits
2013-08-23 12:27:40 -07:00
Chris Robinson
f5d03a16c1
Rename getFacedObject and getFacedHandle for melee hits
2013-08-23 12:27:39 -07:00
Marc Zinnschlag
537ab38985
fixed type in error message
2013-08-23 14:49:41 +02:00
Marc Zinnschlag
c56007cceb
fixed a record counting bug (was using the wrong model)
2013-08-23 14:11:33 +02:00
Marc Zinnschlag
2823e5693d
Merge remote-tracking branch 'scrawl/hit'
2013-08-22 15:35:17 +02:00
Marc Zinnschlag
63b1df85e7
fixed string parsing
2013-08-22 15:22:39 +02:00
Marc Zinnschlag
f615a9397b
made text node filter case-insensitive
2013-08-22 15:16:22 +02:00
Marc Zinnschlag
de956737fe
added text filter node
2013-08-22 14:50:42 +02:00
Marc Zinnschlag
decd826208
fixed an include guard
2013-08-22 14:00:55 +02:00
Marc Zinnschlag
ba6edc55d4
added not filter node
2013-08-22 13:45:50 +02:00
Marc Zinnschlag
806e9a2888
added and and or filter nodes
2013-08-22 13:14:35 +02:00
scrawl
22d5598082
Fix bad_cast exception when hitting creatures
2013-08-22 12:17:12 +02:00
scrawl
1adce8afb3
Fix ambient light getting set from the cell data for non-interior cells
2013-08-22 10:47:48 +02:00
Marc Zinnschlag
50041fc211
simplified filter system by taking out filter references and user values for now (these are post-1.0 features anyway)
2013-08-22 09:17:57 +02:00
Marc Bouvier
2e8b0cf502
Remove Directory Paths in Qt Classes Includes
...
Qt recommends that the path location not be used when including a class.
Also, this is how other files include Qt classes in the OpenCS app. This
change is for consistency only.
2013-08-21 17:14:29 -05:00
Marc Zinnschlag
e03e2f0817
Merge remote-tracking branch 'scrawl/master'
2013-08-21 19:50:08 +02:00
scrawl
758d989a03
If multiple plugins have land data for the same cell, the last plugin should win
2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2
Use a proper node hierarchy; disconnect the root when entering interior
2013-08-21 17:26:11 +02:00
Chris Robinson
c855ab65cf
Non-colliding objects are considered flying
2013-08-21 07:24:54 -07:00
Chris Robinson
602be9bbe7
Avoid swimming into the air from underwater
2013-08-21 07:24:54 -07:00
Chris Robinson
9f09bb6f6f
Use separate inputs for swimming and flying
2013-08-21 07:24:54 -07:00
Chris Robinson
a546ace94d
Remove an unused method
2013-08-21 07:24:54 -07:00
vorenon
3bf3bd4b8c
Silenced some warnings
2013-08-21 13:53:49 +02:00
Chris Robinson
1a9672e31b
Don't update player physics more than 60 times a second
...
Bullet and/or our collision handling code doesn't like timesteps much
smaller than that. Ideally we should do physics in 60fps (or even 30fps)
steps and use prediction and interpolation to get more, but that's not
straight forward and needs a fixed timestep loop to lock physics and
logic together.
2013-08-20 11:31:49 -07:00
graffy76
e6fdc7e7fd
...
2013-08-20 12:34:39 -05:00
Marc Zinnschlag
a61215dab1
some general filter parser cleanup
2013-08-20 16:04:06 +02:00
graffy76
6898321676
Reenabling features
...
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
2013-08-20 08:16:56 -05:00
Chris Robinson
0e56b2facb
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 04:42:28 -07:00
Chris Robinson
d9040df9d6
Increase the max number of physics iterations
...
Should help with highly tessellated collision meshes with high
framerates.
2013-08-20 04:41:52 -07:00
scrawl
ecf7786d11
terrain_num_lights was removed
2013-08-20 12:31:47 +02:00
scrawl
fa76d1631b
Some terrain fixes
2013-08-20 12:08:46 +02:00
scrawl
0545622f5a
Fix werewolf state not getting completely reset when starting a new game
2013-08-20 11:24:19 +02:00
Chris Robinson
a993af53e7
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 02:21:44 -07:00
Chris Robinson
a17997a973
Continually add bits of input velocity to inertia when falling
2013-08-20 02:10:18 -07:00
Marc Zinnschlag
0c8f85f17d
Merge remote-tracking branch 'wheybags/master'
2013-08-20 11:05:50 +02:00
graffy76
24e38846da
Fixed broken profile actions
2013-08-20 03:53:23 -05:00
graffy76
b52645bf2a
Fixes to accommodate master/plugin loading
2013-08-20 03:23:32 -05:00
scrawl
8c8653160d
Crash fix, material fix
2013-08-20 09:52:27 +02:00
Tom Mason
7f0f9037be
fix for older versions of unshield
2013-08-19 22:57:21 +01:00
scrawl
13afcc9324
Don't link to OgreTerrain
2013-08-19 22:22:14 +02:00
Tom Mason
06ff40eda7
only use unshield on not windows
2013-08-19 20:20:08 +01:00
Tom Mason
865a7c63df
cmake for system libunshield
2013-08-19 20:20:00 +01:00
Tom Mason
d3748cd5bb
Install uncompressed data files from cd
2013-08-19 20:19:53 +01:00
Tom Mason
9d1daf7dc2
enum was unnecessary
2013-08-19 20:19:47 +01:00
Tom Mason
641b7b0336
anonymous namespace
2013-08-19 20:19:41 +01:00
Tom Mason
454b64974d
filenames
2013-08-19 20:19:35 +01:00
Tom Mason
3264b5974e
fix invalid syntax
2013-08-19 20:19:25 +01:00
Tom Mason
90a892d304
unshield fixes
2013-08-19 20:19:11 +01:00
Tom Mason
ceb3317807
Integrate unshield with launcher
2013-08-19 20:19:01 +01:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
Chris Robinson
d727b15580
Fix tracing down
2013-08-19 20:39:37 +02:00
Chris Robinson
394fc75697
Clean up the trace struct
2013-08-19 20:39:37 +02:00
Chris Robinson
b351109649
Get rid of the old newtrace method
2013-08-19 20:39:37 +02:00
Chris Robinson
14acacf401
Use a better method to do actor physics traces
2013-08-19 20:39:37 +02:00
Chris Robinson
76b812f75f
Improve actor movement collision handling
2013-08-19 20:39:37 +02:00
Chris Robinson
584eec3743
Store the object class in the LiveCellRef
2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed
New terrain renderer - improvements:
...
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
- Fixes several blending issues and cell border seams
- Fix map render to use the terrain bounding box instead of an arbitrary height
- Different LODs are now properly connected instead of using skirts
- Support self shadowing
- Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
- Support a fixed function fallback (though the splatting shader usually performs better)
- Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
2013-08-19 20:34:20 +02:00
Chris Robinson
cf6e3ab933
Fix a potential divide-by-zero
2013-08-19 09:36:51 -07:00
Chris Robinson
dca599b8c5
Add NPC landing sounds for soundgen keys
2013-08-19 08:58:50 -07:00
Chris Robinson
2ec39f3622
Don't start the jump animation until after the actor is airborn
...
A bit counter-intuitive, but otherwise certain jump animations will improperly
add an offset to the initial inertia.
2013-08-19 08:24:47 -07:00
Chris Robinson
ac3d3df9fc
Implement jumping animations
2013-08-19 08:10:18 -07:00
Chris Robinson
48e594b7c4
Improve stepping down when starting on the ground
2013-08-19 08:09:23 -07:00
Chris Robinson
3ca4d54bf9
Better handle animations with a 0-length loop
2013-08-19 07:26:42 -07:00
Chris Robinson
1aa92067c2
Fix tracing down
2013-08-19 04:56:02 -07:00
Chris Robinson
6e9f15793d
Implement a jumping state
2013-08-18 23:42:56 -07:00
graffy76
e614ec3353
Fixing profile code in progress...
2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a
Moved esx selector classes out of global namespace
2013-08-18 15:11:29 -05:00
Marc Zinnschlag
c87a279444
added error reporting in the filter edit widget (change the text colour for now)
2013-08-18 17:54:18 +02:00
Marc Zinnschlag
c7e97a83e1
automatically build column map on filter change
2013-08-18 17:28:04 +02:00
Chris Robinson
7770203dff
Some physics cleanup
...
Gets rid of some unneeded/unused variables, and halves the 'on ground'
offset.
2013-08-18 08:24:39 -07:00
Marc Zinnschlag
ea8b9ce45b
apply filter to table after filter text change
2013-08-18 16:53:28 +02:00
Marc Zinnschlag
470f890a9a
fixed BooleanNode constructor
2013-08-18 16:52:51 +02:00
graffy76
a14e0b32d8
Restructured esxselector directory
...
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
2013-08-18 09:48:13 -05:00
graffy76
45277c0082
Minor changes
...
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
2013-08-18 09:34:33 -05:00
Chris Robinson
b0f8045c72
Improve mid-air control
2013-08-18 05:59:06 -07:00
Chris Robinson
8c3564326e
Improve movement inertia
...
Handles all 3 axis. Incoming velocity is only added to inertia when
leaving the ground, and does not continually add to it.
2013-08-18 05:38:50 -07:00
Marc Zinnschlag
c38860fa72
added parser and custom filter edit widget (parser not functional yet; always returns a false boolean node)
2013-08-18 14:17:18 +02:00
Chris Robinson
9d56e2d86d
Apply movement by queueing it to do later
2013-08-17 22:34:38 -07:00
graffy76
2878f51cd3
Reimplemented dependency selection feature
...
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
2013-08-17 19:40:28 -05:00
Chris Robinson
96bab88da6
Add physics methods to queue and apply movements
2013-08-17 07:48:45 -07:00
Chris Robinson
0481e64b02
Fix tracing down
2013-08-17 05:09:34 -07:00
Chris Robinson
8bcce0fb55
Clean up the trace struct
2013-08-17 05:09:33 -07:00
Chris Robinson
62c7b3698d
Get rid of the old newtrace method
2013-08-17 05:09:33 -07:00
Chris Robinson
65ce3c6ba5
Use a better method to do actor physics traces
2013-08-17 05:09:32 -07:00
Chris Robinson
d82f54c771
Improve actor movement collision handling
2013-08-17 05:09:30 -07:00
graffy76
b24dd5c6ac
Continued migration of code to ContentSelector
2013-08-17 05:55:43 -05:00
graffy76
61602789e1
Began migrating code to ContentSelector base
2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971
Moved init code to master / plugin proxy classes
2013-08-16 21:20:48 -05:00
graffy76
7389507eb5
Created masterproxylist class
2013-08-16 21:12:30 -05:00
graffy76
2bc56d0b5c
Fixed missing item list in launcher combobox
2013-08-16 20:59:58 -05:00
graffy76
b850fe0289
Removed vertical headers from plugin view
2013-08-16 18:59:01 -05:00
graffy76
49c4e1bf9e
Removed master table widget
2013-08-16 18:23:02 -05:00
graffy76
84e5c2610a
Implemented combobox for game file selection
2013-08-16 18:00:23 -05:00
graffy76
bfb71f23c9
Changed filter mechanism for game / addons
...
Filters by number of master references, regardless of extension
2013-08-16 17:26:23 -05:00
Marc Zinnschlag
236dc9fc43
replaced binary filter node with a n-ary node
2013-08-16 14:18:31 +02:00
Marc Zinnschlag
528e047fd5
repalced std::auto_ptr with boost::shared_ptr in filter nodes
2013-08-16 13:57:54 +02:00
Chris Robinson
21121d5ba5
Store the object class in the LiveCellRef
2013-08-16 04:18:48 -07:00
Chris Robinson
08d1d486a4
Merge remote-tracking branch 'zini/master' into ptr-improvements
2013-08-15 17:42:16 -07:00
Marc Zinnschlag
d122699b2f
and another fix for the same issue :(
2013-08-15 18:29:09 +02:00
Chris Robinson
58481ec7c3
Merge remote-tracking branch 'zini/master' into ptr-improvements
2013-08-15 07:11:38 -07:00
Marc Zinnschlag
7b4d8afde7
fix to previous commit
2013-08-15 15:53:50 +02:00
Chris Robinson
fdbf09ed40
Merge remote-tracking branch 'zini/master' into ptr-improvements
...
Conflicts:
apps/openmw/mwworld/containerstore.cpp
2013-08-15 05:56:24 -07:00
Marc Zinnschlag
e94fcce622
accessing references via their ID now also works for references in containers in active cells
2013-08-15 14:45:13 +02:00
Chris Robinson
2853b56ed5
Throw an exception when trying to get an empty Ptr's type
2013-08-15 04:52:01 -07:00
Chris Robinson
0f2b2ff1ce
Small header cleanup
2013-08-15 01:21:43 -07:00
Chris Robinson
86f2cd5848
Use dynamic_cast to get the LiveCellRef
2013-08-14 20:26:50 -07:00
Chris Robinson
48c07fbd98
Remove some unnecessary fields from Ptr
2013-08-14 17:05:42 -07:00
Chris Robinson
74f855e948
Move common LiveCellRef fields to the base class
2013-08-14 01:55:51 -07:00
Chris Robinson
11166a1a17
Don't store the type name string in the Ptr
...
This should get rid of all heap allocations caused by constructing or copying
Ptr objects.
2013-08-14 00:45:28 -07:00
Chris Robinson
b6d2888c48
Avoid using boost::any in MWWorld::Ptr
...
Reduces dependency on Boost, and should improve performance a bit when
copying or constructing Ptr objects.
2013-08-14 00:45:27 -07:00
Marc Zinnschlag
aee0336780
Merge remote-tracking branch 'kcat/script-functions'
2013-08-14 09:05:40 +02:00
Chris Robinson
73437dfdca
GetEffect can accept an effect ID string as well
2013-08-13 19:18:21 -07:00
Chris Robinson
c1dfa980bf
Combine ShowVarsImplicit and ShowVarsExplicit
...
Also removes an unnecessary else statement
2013-08-13 17:31:15 -07:00
Marc Zinnschlag
e2e76147c8
Merge remote-tracking branch 'potatoesmaster/magic'
2013-08-13 15:36:43 +02:00
Chris Robinson
30973352e8
Implement ShowVars (SV) console function
2013-08-13 04:54:41 -07:00
Chris Robinson
2353ac1739
Properly implement SetWerewolfAcrobatics
2013-08-13 04:54:41 -07:00
Emanuel Guevel
ad3646cb15
Fix spell icons displayed when effect ended
2013-08-13 04:57:45 +02:00
Emanuel Guevel
a47c76001c
Apply trap magic effects
2013-08-13 04:56:15 +02:00
Emanuel Guevel
37ea0f3fb9
Display refusal message when weapon/magic icons are clicked as werewolf
2013-08-12 15:36:16 +02:00
Emanuel Guevel
997f37700d
Display HUD icons for hidden windows
2013-08-12 15:06:09 +02:00
Emanuel Guevel
c27c33f542
Fix pinned windows hiding
...
They were always displayed in console mode and in game (even if they
were force hidden).
2013-08-12 15:04:41 +02:00
Marc Zinnschlag
789a66eaa7
added filter box and basic record filter UI (not functional yet; only supporting on-the-fly filters for now)
2013-08-11 20:39:21 +02:00
Chris Robinson
6fd4cdb5fb
Play randomized werewolf sounds
2013-08-11 00:53:17 -07:00
Chris Robinson
00d6690b4d
Ignore encumbrance in werewolf form
...
According to UESP, inventory weight is ignored. Not sure if this
includes feather and burden effects.
2013-08-10 20:25:18 -07:00
Chris Robinson
180f0d0fe9
Restart from the loop point if replaying the same animation
2013-08-09 21:25:28 -07:00
Chris Robinson
5968165de0
Merge remote-tracking branch 'zini/master' into werewolf
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2013-08-09 07:00:00 -07:00
Chris Robinson
a28c36de17
Don't count as running if not actually moving along (local) X/Y
2013-08-09 06:53:07 -07:00
Chris Robinson
c2d8eb377f
Play some appropriate sounds in werewolf form
2013-08-09 06:40:16 -07:00
Marc Zinnschlag
f5b06d5d52
basic filter tree structure
2013-08-09 14:49:05 +02:00
Chris Robinson
db1036e5e5
Handle SetWerewolfAcrobatics
2013-08-09 05:37:56 -07:00
Chris Robinson
ae183cb3e4
Handle werewolf stats
2013-08-09 05:14:58 -07:00
Marc Zinnschlag
a95715b61d
added description field to filter record
2013-08-09 13:45:50 +02:00
Chris Robinson
72a399054f
Don't assume only players activate doors
2013-08-09 01:35:29 -07:00
Chris Robinson
46bc7bd9c8
Some cleanup since NpcStats is now also CreatureStats
...
This isn't a thorough cleaning, so keep an eye out for more
2013-08-09 01:14:08 -07:00
Marc Zinnschlag
fb0b57efaa
Merge remote-tracking branch 'vorenon/bug876'
2013-08-09 09:38:10 +02:00
Chris Robinson
75b6515915
Inherit NpcStats from CreatureStats
2013-08-08 23:28:02 -07:00
Chris Robinson
89c7f5bc70
Handle object activation as a werewolf
2013-08-08 22:34:53 -07:00
Chris Robinson
6110a0ee3b
Don't allow resting as a werewolf
2013-08-08 18:30:47 -07:00
Chris Robinson
75131e6a48
Rebuild the actor after switching between werewolf forms
2013-08-08 17:16:24 -07:00
Chris Robinson
5fbfce6d1e
Don't show WerewolfRobe objects in the inventory
...
Pretty ugly hard-coding, but this is likely what vanilla does since it
has no option to mark clothes or armor as unplayable like Oblivion does.
2013-08-08 16:05:26 -07:00
Chris Robinson
d77d60cbc2
Remove an unneeded forceUpdate method
2013-08-08 15:37:08 -07:00
vorenon
a718a62ef5
Fix for bug 876
2013-08-09 00:06:34 +02:00
PLkolek
86020ad94d
Added underwater and drowning sounds.
2013-08-08 20:57:15 +02:00
Marc Zinnschlag
f6226e4859
added Creator class for filters
2013-08-08 15:55:23 +02:00
Chris Robinson
e3d5a1b38d
Dialog function 72 is not player-specific
...
It's used to force any NPC in werewolf form to play the appropriate
growls for combat.
2013-08-08 06:02:16 -07:00
Chris Robinson
960ea3d96c
Add/remove a WerewolfRobe when werewolf form is toggled
2013-08-08 04:40:31 -07:00
Chris Robinson
3cff7b1e42
Don't assume icons have a period in their filename
2013-08-08 04:40:31 -07:00
Chris Robinson
1f6055d54b
Don't try to apply body skins for werewolves
...
They instead use a hidden WerewolfRobe object for their body
2013-08-08 04:40:31 -07:00
Chris Robinson
946ca7f931
Return the appropriate name for werewolf NPCs
2013-08-08 04:40:31 -07:00
Chris Robinson
dfdd2dc308
Handle swimleft and swimright soundgen keys
2013-08-08 04:40:31 -07:00
Chris Robinson
109df46590
Fix werewolf claw damage multiplier
2013-08-08 04:40:31 -07:00
Chris Robinson
9694b18d1b
Update part skeletons immediately when added
2013-08-08 04:40:30 -07:00
Chris Robinson
f73578a832
Remove unnecessary mBodyPrefix field
2013-08-08 04:40:30 -07:00
Chris Robinson
5051544144
Remove some duplicate code
2013-08-08 04:40:30 -07:00
Chris Robinson
ceed2e30b8
Handle NPCs being a werewolf in NpcAnimation
...
Note that the body mesh comes from having a WerewolfRobe force-equipped.
2013-08-08 04:40:30 -07:00
Chris Robinson
5ac82a50b7
Remove unused function
2013-08-08 04:40:30 -07:00
Marc Zinnschlag
e9521dc8f1
Merge remote-tracking branch 'potatoesmaster/pinning'
2013-08-08 13:06:58 +02:00
Marc Zinnschlag
bf839d19cf
Merge branch 'columns'
2013-08-08 12:50:57 +02:00
Marc Zinnschlag
0944338c27
avoid the use of hardcoded column numbers
2013-08-08 12:49:30 +02:00
Emanuel Guevel
1cbfcc3910
Fix HUD weapon icon when turning from werewolf to normal
...
The werewolf hand icon remained until the inventory menu was opened.
2013-08-08 10:56:44 +02:00
Chris Robinson
2bac4566c0
Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/statsextensions.cpp
2013-08-08 00:09:29 -07:00
Chris Robinson
4985e17865
Fix werewolf claw damage multiplier
2013-08-07 19:15:36 -07:00
Chris Robinson
4641737fc4
Update part skeletons immediately when added
2013-08-07 19:15:36 -07:00
Chris Robinson
dc0360b1f6
Remove unnecessary mBodyPrefix field
2013-08-07 19:15:36 -07:00
Chris Robinson
0f52ed9a9b
Remove some duplicate code
2013-08-07 19:15:36 -07:00
Chris Robinson
deee14ccfd
Handle NPCs being a werewolf in NpcAnimation
...
Note that the body mesh comes from having a WerewolfRobe force-equipped.
2013-08-07 19:15:36 -07:00
Chris Robinson
ab44cd63a1
Remove unused function
2013-08-07 19:15:35 -07:00
Emanuel Guevel
b2e5e8dd0d
Saner inventory window pinning/hiding
...
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
2013-08-07 23:30:08 +02:00
Alex
b9579e085f
cleanup
2013-08-07 15:40:57 -04:00
Alex
a0931b01fe
Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg
2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32
mild cleanup
2013-08-07 13:16:20 -04:00
PLkolek
8f4506f5b6
Implemented drowning.
...
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
2013-08-07 16:46:46 +02:00
Emanuel Guevel
48d2554ac3
Auto-equip when items are added to the inventory
...
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
2013-08-07 15:17:55 +02:00
Emanuel Guevel
e0d0cdd18a
Do not auto-equip items continuously
...
This was called every couple of frames.
2013-08-07 14:30:13 +02:00
Chris Robinson
076e7d8e16
Make insertBegin internal
2013-08-07 03:56:07 -07:00
Chris Robinson
2b2101958d
Destroy the scene node we create
2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531
Remove unused/unneeded parameters
2013-08-07 03:56:06 -07:00
Emanuel Guevel
fd0a159a64
MWScript: update first unused opcode number
2013-08-07 12:05:53 +02:00
Emanuel Guevel
47b8a31317
Fixes suggested by KittyCat
2013-08-07 12:05:53 +02:00
Marc Zinnschlag
932fffd1a7
Merge remote-tracking branch 'kcat/light-objects'
2013-08-07 11:21:01 +02:00
Chris Robinson
b4b095ca72
Don't try to get the center of a null bounding box
2013-08-07 01:32:36 -07:00
Chris Robinson
80d271aeb1
Remove unused stuff
2013-08-07 01:31:01 -07:00
Marc Zinnschlag
76b9d3dbc1
columns are now identified via an enum instead the name string
2013-08-07 09:36:05 +02:00
Chris Robinson
3555476dfd
Use Animation-derived objects for generic objects
2013-08-06 19:49:07 -07:00
Chris Robinson
a9dca21d05
Create the Animation SceneNode in the constructor
2013-08-06 19:49:05 -07:00
Chris Robinson
48784c7e2f
Use for_each and functors to avoid some for loops
2013-08-06 19:49:05 -07:00
Chris Robinson
de95926e9f
Use controllers to animate lights in ObjectLists
2013-08-06 19:49:04 -07:00
Chris Robinson
8984d8f8ee
Use a map to simplify NPC part referencing
2013-08-06 19:49:02 -07:00
Chris Robinson
e976bb16c5
Add a light for torches
2013-08-06 19:49:02 -07:00
Chris Robinson
57fb065a86
Add Ogre::Light objects to the object list
...
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
2013-08-06 19:49:01 -07:00
Chris Robinson
a9cc3a2844
Ensure a valid CellStore for Ptr::isInCell
2013-08-06 19:49:01 -07:00
Chris Robinson
1f436f9886
Render torches
2013-08-06 19:49:01 -07:00
Chris Robinson
8f69c51b24
Avoid some unnecessary references
2013-08-06 19:49:00 -07:00
Chris Robinson
2c03fec4bb
Use the fatigue term for jumping
2013-08-06 19:49:00 -07:00
Chris Robinson
eab4e09566
Handle the pick/probe in the character controller
2013-08-06 19:48:59 -07:00
scrawl
3f7daa4884
Forgot to change initTerrainTextures
2013-08-07 02:58:03 +02:00
Alex
de1f423bd7
initial move of script opcodes and registerExtensions functions to components/compiler
2013-08-06 20:38:41 -04:00
scrawl
76e538c22a
Unused variable fix
2013-08-07 02:03:23 +02:00
scrawl
726c93c365
Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10
2013-08-07 01:34:17 +02:00
Marc Zinnschlag
03af7175dd
Merge remote-tracking branch 'potatoesmaster/bug-839'
2013-08-06 17:39:29 +02:00
Emanuel Guevel
c59ad62c57
Fix UndoWerewolf script instruction
2013-08-06 14:30:01 +02:00
Emanuel Guevel
5188a1c2cd
Implement script instructions Become/UndoWerewolf
2013-08-06 12:34:35 +02:00
Emanuel Guevel
20d40c4368
Implement MWWorld::World::setWerewolf()
2013-08-06 12:34:35 +02:00
Emanuel Guevel
aa563e947e
Implement MWWorld::InventoryStore::unequipAll()
2013-08-06 12:34:35 +02:00
Emanuel Guevel
ddc92d1fbd
Set appropriate weapon icon when player is a werewolf
2013-08-06 12:34:35 +02:00
Emanuel Guevel
d054366460
Permit to force hiding GUI windows
2013-08-06 12:34:35 +02:00
scrawl
4caac0d859
Fix idle animations repeating
2013-08-05 02:06:23 +02:00
vorenon
76a1abe9fa
Don't allow the use of the "jump" key while sneaking - Update
2013-08-04 20:10:33 +02:00
vorenon
56cb36caf1
Don't allow the use of the "jump" key while sneaking
2013-08-04 19:45:41 +02:00
Emanuel Guevel
71da2f0a12
Do not allow magic/combat stance unless magic/inventory window are accessible
2013-08-04 00:21:27 +02:00
Marc Zinnschlag
41b2fa985b
silenced some warnings
2013-08-03 15:26:53 +02:00
Marc Zinnschlag
9123afa863
Merge remote-tracking branch 'gus/MeleeCombat2'
2013-08-03 15:23:36 +02:00
Marc Zinnschlag
3170490a8e
silenced some warnings
2013-08-03 15:21:11 +02:00
Marc Zinnschlag
253e00e3a0
Merge remote-tracking branch 'gus/MeleeCombat2' into columns
2013-08-03 15:18:39 +02:00
Marc Zinnschlag
501753c01b
Merge remote-tracking branch 'scrawl/master' into columns
2013-08-03 15:06:30 +02:00
gus
a23e7fac93
clean up
2013-08-03 13:58:16 +02:00
scrawl
982f743ddd
Fix wrong idle animations played
2013-08-03 13:13:33 +02:00
gus
c8bb32c40d
small maths correction
2013-08-03 12:29:18 +02:00
gus
a25ee360dc
use angles and GMST. not sure this work as it should
2013-08-03 12:16:51 +02:00
Marc Zinnschlag
8f330e7e3c
Merge remote-tracking branch 'potatoesmaster/sneak'
2013-08-03 11:49:20 +02:00
gus
830762722d
first attempt: hit detection with a sphere (not finished)
2013-08-03 11:26:36 +02:00
Emanuel Guevel
a9483dbdf1
Show sneak indicator when sneaking
...
Temporary solution, as the indicator should be shown only when the
player is not detected by any other actor.
2013-08-03 03:03:29 +02:00
Emanuel Guevel
8f8362d2c4
Expose sneak indicator widget through WindowManager
2013-08-03 03:03:29 +02:00
Emanuel Guevel
9757694060
Update sneaking indicator position with other widgets
2013-08-03 02:43:56 +02:00
Emanuel Guevel
4685aea2a1
mwiniimport: ignore empty values
2013-08-03 00:21:05 +02:00
vorenon
aa45127895
Adjusted swish sounds
...
Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.
2013-08-02 16:33:39 +02:00
Marc Zinnschlag
d2f96deb98
renamed columns.hpp to columimp.hpp
2013-08-02 10:42:52 +02:00
Chris Robinson
f57c829cba
Play the appropriate swish sound and follow-up animation
2013-08-02 00:21:02 -07:00
Chris Robinson
b70975a74d
Move getEvasion to CreatureStats
2013-08-02 00:21:01 -07:00
Chris Robinson
9e7d670745
Inline Class::get(const Ptr& ptr)
2013-08-02 00:20:59 -07:00
Marc Zinnschlag
ca94d1a2fb
Merge remote-tracking branch 'swick/inventorypos'
...
Conflicts:
apps/openmw/mwgui/inventorywindow.cpp
2013-07-31 22:16:56 +02:00
Marc Zinnschlag
24273f338b
Merge remote-tracking branch 'scrawl/master'
2013-07-31 22:12:07 +02:00
Sebastian Wick
7ed763262f
GUI mode dependent position
2013-07-31 21:40:29 +02:00
scrawl
fe51a00112
Fix the initial player inventory being added twice when starting a new game
2013-07-31 21:00:58 +02:00
scrawl
f1f6336a4a
Fixed screenshot keybinding, and make it bindable
2013-07-31 20:24:44 +02:00
Marc Zinnschlag
5cafe65cd7
Merge remote-tracking branch 'scrawl/cppcheck'
2013-07-31 20:00:35 +02:00
scrawl
d106ed3b08
Fixed alchemy
2013-07-31 19:03:51 +02:00
Marc Zinnschlag
4dfd5282ab
Merge remote-tracking branch 'kolek/enchantingwindow'
2013-07-31 19:01:49 +02:00
Marc Zinnschlag
25917b00ec
Merge remote-tracking branch 'scrawl/master'
2013-07-31 19:00:24 +02:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
scrawl
43e0df479e
Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping
2013-07-31 16:30:22 +02:00
PLkolek
f297c21e4d
Old door sound fades out on door open/close. Door sound is synchronised to angle on action.
2013-07-31 15:46:23 +02:00
PLkolek
8bc8c38f2d
Spell cost is updatedon every change in enchanting and spellmaking.
2013-07-31 13:33:30 +02:00
PLkolek
7fd7621458
Fixed area slider in self enchantments.
2013-07-31 12:26:34 +02:00
Marc Zinnschlag
6ce2b962e1
Merge remote-tracking branch 'scrawl/inventory'
2013-07-31 09:15:22 +02:00
Marc Zinnschlag
eedced729f
Merge remote-tracking branch 'scrawl/master'
2013-07-31 09:14:12 +02:00
Marc Zinnschlag
7639506e49
Merge remote-tracking branch 'scrawl/ai'
2013-07-31 09:07:46 +02:00
scrawl
16cacb338a
Initialize MWMechanics::AiSequence from ESM::AiPackageList
2013-07-31 00:55:08 +02:00
scrawl
45006ea193
Fix inventory/container content loading so that it's done for dynamically spawned objects as well
2013-07-31 00:02:24 +02:00
scrawl
90a5d8b6f5
Fix uninitialized AL listener position/orientation when the game is paused during the first frame
2013-07-30 23:24:18 +02:00
Marc Zinnschlag
958b0c4915
Merge remote-tracking branch 'scrawl/untilhealed'
2013-07-30 22:41:05 +02:00
scrawl
da01ec4f52
Only show the "Rest until healed" button when stats are not full
2013-07-30 22:07:27 +02:00
scrawl
04b90b7d14
Other actors no longer collide with an actor that has collision disabled
2013-07-30 22:00:48 +02:00
scrawl
472a381263
Fix health meter (again)
2013-07-30 16:09:12 +02:00
Marc Zinnschlag
adb05737ee
Merge branch 'master' into filter
...
Conflicts:
apps/opencs/model/world/universalid.cpp
apps/opencs/view/doc/view.cpp
apps/opencs/view/world/subviews.cpp
2013-07-30 15:55:50 +02:00
Marc Zinnschlag
2e667f1d94
Merge branch 'bottombar'
2013-07-30 12:55:12 +02:00
Marc Zinnschlag
434f97c95c
fixed two missing icons
2013-07-30 12:55:02 +02:00
Marc Zinnschlag
102700a498
added specialised Creator for references
2013-07-30 12:53:03 +02:00
Marc Zinnschlag
57be764cce
added specialised Creator for referenceable records
2013-07-30 12:34:18 +02:00
Marc Zinnschlag
3642562959
Merge remote-tracking branch 'scrawl/master'
2013-07-30 08:11:40 +02:00
scrawl
426e3ec6c6
Fix enemy health meter for creatures
2013-07-30 06:17:21 +02:00
scrawl
3961c276b8
Added enemy health meter
2013-07-30 06:00:20 +02:00
Marc Zinnschlag
e27ba55541
Merge remote-tracking branch 'swick/countdialog'
2013-07-29 21:38:04 +02:00
Sebastian Wick
40d3efc671
use cancel methid
2013-07-29 18:35:23 +02:00
Sebastian Wick
7b40e57ba1
Allow the 'Activate' key to close the countdialog window; cleanups
2013-07-29 18:27:00 +02:00
Marc Zinnschlag
90ab7b2bf5
Merge remote-tracking branch 'swick/viewmodetransission'
2013-07-29 17:08:49 +02:00
Sebastian Wick
7c24c0a64e
fix uninitialized variables
2013-07-29 16:45:35 +02:00
Sebastian Wick
d2b7cb5bb2
First/Third person transitions with mouse wheel
2013-07-29 16:43:16 +02:00
Marc Zinnschlag
34c825ce52
added icons and type listing to UniversalId class
2013-07-29 16:21:42 +02:00
Marc Zinnschlag
661b290c49
automatically scroll table to the position of a newly created record
2013-07-29 15:00:41 +02:00
Sebastian Wick
1b310c5c5b
use SDL resolutions in the ingame settings
2013-07-29 13:34:56 +02:00
Marc Zinnschlag
3fa4a194a7
Merge remote-tracking branch 'scrawl/master'
2013-07-29 09:59:23 +02:00
scrawl
6164e5bae6
Restored window resizing
2013-07-29 02:32:08 +02:00
Chris Robinson
3744850545
Fix hand-to-hand health damage reduction
2013-07-28 16:07:09 -07:00
Chris Robinson
39507e3f0f
Decrease armor condition on successful hits
2013-07-28 15:51:17 -07:00
Chris Robinson
1af48ab6e0
Decrease weapon condition on successful hits
2013-07-28 15:17:01 -07:00
Chris Robinson
465f4d2063
Properly handle starting an animation at the end
2013-07-28 09:56:03 -07:00
Marc Zinnschlag
82958e6514
added custom creator for cell records
2013-07-28 18:08:57 +02:00
Chris Robinson
54f91d4b3a
Implement hand-to-hand attacks
2013-07-28 06:48:25 -07:00
Marc Zinnschlag
899e18b2cf
report ID errors also via input field tool tips
2013-07-28 15:28:35 +02:00
Marc Zinnschlag
5ec9d370cb
check if ID is already in use when creating new IDs
2013-07-28 15:27:15 +02:00
Marc Zinnschlag
124a70906f
added creator edit lock
2013-07-28 14:51:47 +02:00
Marc Zinnschlag
32c697abc6
validate IDs entered by the user
2013-07-28 14:40:11 +02:00
Marc Zinnschlag
4f6e99c391
more compact layout for the bottom box
2013-07-28 14:00:26 +02:00
Marc Zinnschlag
00fcb79f08
moved record creation to GenericCreator class (now taking ID from user instead of using a procedurally generated one)
2013-07-28 13:43:16 +02:00
Marc Zinnschlag
2d46a1db2f
changed CreateCommand to work directly on the model instead of the proxy
2013-07-28 13:39:33 +02:00
Chris Robinson
a34f0de3e1
Play the correct medium armor foot sounds
2013-07-28 04:17:36 -07:00
Chris Robinson
db4f34b332
Play hit sounds when hitting creatures and NPCs
2013-07-27 11:20:39 -07:00
Chris Robinson
1a40d01afa
Fix NPC armor rating calculation and reduce redundant lookups
2013-07-27 09:31:16 -07:00
Chris Robinson
f73008546f
Keep a sound updated with its object's position
2013-07-27 07:24:18 -07:00
Chris Robinson
c94653dc49
Implement the ModRegion script function
2013-07-27 07:10:18 -07:00
Marc Zinnschlag
f93af52486
handling down a reference to Data and the undo stack to the creators
2013-07-27 13:28:12 +02:00
Chris Robinson
1174b85ac8
Implement Disable/EnableTeleporting script functions
2013-07-27 00:14:55 -07:00
Marc Zinnschlag
fee748d4b5
added creator bar UI and cancel button
2013-07-26 21:09:23 +02:00
Chris Robinson
3298eb1b37
Implement HitOnMe script function
2013-07-26 10:50:23 -07:00
Chris Robinson
5379e607cb
Handle the OnPCHitMe script variable
2013-07-26 10:50:23 -07:00
Chris Robinson
f215d2cc30
Only raise weapon skills for the player
2013-07-26 10:50:23 -07:00
Chris Robinson
bec420c69b
Add Class::onHit for creatures
2013-07-26 10:50:23 -07:00
Chris Robinson
dd6edd21f8
Add a separate on-hit method to handle objects being hit
2013-07-26 10:50:23 -07:00
Marc Zinnschlag
b8ac45defe
added creator to bottom box layout and re-routed add record event to bottom box
2013-07-26 18:22:31 +02:00
Marc Zinnschlag
d899cbb449
removed some junk
2013-07-26 18:14:34 +02:00
Marc Zinnschlag
ed83e2e70a
added creator to bottom box; more cleanup
2013-07-26 12:51:45 +02:00
Marc Zinnschlag
6c4bdc0101
minor cleanup; less pointer usage
2013-07-26 12:42:15 +02:00
Marc Zinnschlag
ba5ca5beed
replaced createAndDelete flag with a new class hierarhy (Creator)
2013-07-26 12:35:17 +02:00
Emanuel Guevel
aa14656ff2
esmtool: fix swapped comparison operators
2013-07-26 10:24:15 +02:00
Marc Zinnschlag
3fbbbdc64b
Merge remote-tracking branch 'scrawl/master'
2013-07-26 08:06:53 +02:00
Chris Robinson
a569ae367e
Fix hit chance calculation
2013-07-25 13:09:26 -07:00
Chris Robinson
6195062d72
Try to figure out what gets hit
...
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
2013-07-25 12:58:43 -07:00
Chris Robinson
b3a057d679
Handle hit chance and damage calculation
...
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
2013-07-25 08:15:42 -07:00
Marc Zinnschlag
4327b81bc3
fixed column handling in table (had problems with filtered out columns before)
2013-07-25 14:38:53 +02:00
Marc Zinnschlag
55e7e71c11
added optional per-subview status bar
2013-07-25 14:29:56 +02:00
Chris Robinson
1dcc893703
Merge remote-tracking branch 'zini/master' into combat
2013-07-25 01:16:49 -07:00
Chris Robinson
4ad28ed369
Don't play a weapon-down sound when unreadying a spell
2013-07-25 00:46:20 -07:00
Chris Robinson
92cc566fdc
Rename the Class::attack method to Class::hit
2013-07-25 00:30:01 -07:00
Chris Robinson
0db02af807
Set up the weapon state in the CharacterController constructor
2013-07-24 21:08:16 -07:00
Chris Robinson
d9a9c3d6bd
Handle the "land" soundgen type
2013-07-24 10:36:04 -07:00
Chris Robinson
705498ec24
Play a swish sound when attacking
2013-07-24 10:34:53 -07:00
Chris Robinson
d8ec813939
Say something from the "hit" dialog topic when losing health
2013-07-24 10:02:50 -07:00
Chris Robinson
59f1bc7542
Use time values for the aniamtion's start, stop, and loop points
...
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
2013-07-24 08:38:36 -07:00
Chris Robinson
bf1d907d07
Don't play casting animations for enchantments
2013-07-24 05:39:15 -07:00
Chris Robinson
cc8e8c1272
Use the attack strength as determined by how long the attack was held
2013-07-24 03:18:53 -07:00
Chris Robinson
0c8d4d9be2
Add beginnings of melee hits
2013-07-24 02:51:42 -07:00
Chris Robinson
45302f9e25
Handle controllers in the NPC's bound object parts
2013-07-23 22:05:03 -07:00
Marc Zinnschlag
a80e80dd94
added layout to table sub view
2013-07-23 21:59:02 +02:00
Chris Robinson
11b094559f
Play the appropriate casting animation sound
2013-07-23 11:12:19 -07:00
Emanuel Guevel
70a5a83419
Change the formula used to calculate initial NPC health
2013-07-23 16:48:54 +02:00
Chris Robinson
17282c69b1
Handle spell-casting animation sequences
2013-07-23 07:30:54 -07:00
Chris Robinson
4d157cb19a
Handle marksmen weapon attack sequences
2013-07-23 06:13:08 -07:00
Chris Robinson
fecb8c1cc4
Fix the completion amount for 0-length anims
2013-07-23 05:30:37 -07:00
Chris Robinson
d5d832846e
Rename the follow-up upper character state enum
2013-07-23 04:56:49 -07:00
Chris Robinson
537d5c4934
Avoid trying to play animations without any animation sources
2013-07-23 04:36:25 -07:00
Chris Robinson
ad6d663e09
Remove some unnecessary debug messages
2013-07-23 03:44:52 -07:00
Chris Robinson
24567294ff
Move NPC state update handling into a separate method
2013-07-23 03:26:24 -07:00
Chris Robinson
22e07968af
Store the current weapon group name
2013-07-23 02:50:52 -07:00
Chris Robinson
0240efa6cf
Improve weapon attack logic to better handle picks, probes, and h2h
2013-07-23 02:28:58 -07:00
Chris Robinson
ef17fdeb15
Remove some unused methods
2013-07-23 01:37:41 -07:00
Marc Zinnschlag
ec575200e3
Merge remote-tracking branch 'gus/MeleeCombat2'
...
Conflicts:
apps/openmw/mwrender/animation.cpp
2013-07-23 09:12:23 +02:00
Marc Zinnschlag
7600d6c04b
basic filter table
2013-07-22 21:18:47 +02:00
Marc Zinnschlag
66534a45da
replaced double click in table with a context menu item (edit) because double click was interfering with basic table functionality
2013-07-21 17:53:39 +02:00
Emanuel Guevel
48f0e64ec3
Fix health calculation at character creation
2013-07-21 11:02:03 +02:00
Emanuel Guevel
1c330fc899
Use the correct formula for NPC health initialization
2013-07-21 10:13:46 +02:00
Emanuel Guevel
2356e6218e
Complete health increase on level up
2013-07-20 22:14:10 +02:00
Emanuel Guevel
2a0644a7c3
Move some levelup logic from mwgui to mwmechanics
2013-07-20 22:14:10 +02:00
Emanuel Guevel
7837dcdc19
Calculate NPC health on loading instead of updating it continually
...
Only NPC with auto-calculated stats are concerned.
2013-07-20 22:14:10 +02:00
Emanuel Guevel
074e241c32
MWMechanics::DynamicStat: fix members initialization
2013-07-20 22:14:09 +02:00
Marc Zinnschlag
a8168c58c2
Merge remote-tracking branch 'kolek/thirdpersonzoom'
2013-07-20 18:29:59 +02:00
Kolzi
d12bac2d9e
Third person zoom - fixed code review issues.
2013-07-20 16:55:35 +02:00
Marc Zinnschlag
0fad2e7f40
restructured main menu
2013-07-20 13:46:56 +02:00
Marc Zinnschlag
2497c18702
replaced settings change notifications for columns with a more robust implementation
2013-07-20 13:19:27 +02:00
Kolzi
1b7966ca27
Can zoom in and out in third person view.
2013-07-19 16:12:01 +02:00
Chris Robinson
0cb7d186e7
Use Play_TypeFoot for 'left' and 'right' soundgen keys
2013-07-18 21:50:11 -07:00
Chris Robinson
14e0c182f3
Allow specifying the sound type to playSound and playSound3D
2013-07-18 21:50:11 -07:00
Chris Robinson
ac4dfd3b39
Play the appropriate foot sound based on footwear
2013-07-18 21:50:11 -07:00
scrawl
bf332b633e
Make VideoPlayer::playVideo block until the video finishes
2013-07-18 14:14:10 +02:00
Marc Zinnschlag
365ea11e86
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
2013-07-18 13:51:24 +02:00
Marc Zinnschlag
fdd47e5b73
silenced a warning
2013-07-18 13:50:12 +02:00
graffy76
0ae254f6a8
Fixed segfault opening tables
2013-07-18 06:31:47 -05:00
Chris Robinson
9c13568bb7
Remove idles from the state list and rename it
2013-07-18 01:49:53 -07:00
Chris Robinson
e803cdbe7f
Handle swimdeath and missing death animations
2013-07-18 01:13:53 -07:00
Chris Robinson
f01b0b48cc
Don't start with an idle state if dead
2013-07-18 00:35:03 -07:00
Chris Robinson
e78bdd2a5d
Clear 'swim' from the animation name as a backup instead of 'sneak'
2013-07-18 00:22:40 -07:00
Chris Robinson
9ea6b22a83
Handle soundgen animation keys
2013-07-17 23:58:21 -07:00
Chris Robinson
d6324d71bf
Ensure mechanics actors/objects are cleared before adding them
2013-07-17 21:39:21 -07:00
Chris Robinson
c7692acb79
Update the player's Ptr in mwrender when changing cells
2013-07-17 19:11:03 -07:00
graffy76
6486f342b5
Fixed setting synchronization issue
...
Moved default settings to CSMSettings::UserSettings.
Other minor code changes / cleanup
2013-07-17 20:19:01 -05:00
Marc Zinnschlag
1b4cd787a5
Merge remote-tracking branch 'kcat/animation-state'
2013-07-17 11:33:04 +02:00
Chris Robinson
0cd4df3edf
Stop playing idles on death
2013-07-17 02:19:22 -07:00
Chris Robinson
e2e278d06d
Fix some animations not playing properly
...
Default movement animation speed multiplier should be 1, not 0. Only
randomize death1...death5 for NPCs.
2013-07-17 02:06:31 -07:00
scrawl
dfe912dcab
Enum renaming
2013-07-16 23:38:55 +02:00
scrawl
91e95e1404
Use the correct slash, chop or thrust animation
2013-07-16 23:32:41 +02:00
gugus
9043fe427f
Merge pull request #4 from scrawl/melee
...
Fixes weapon input to use A_Use instead of hardcoding to mouse button
2013-07-16 07:35:21 -07:00
scrawl
9536b5050b
Fixes weapon input to use A_Use instead of hardcoding to mouse button
2013-07-16 16:25:41 +02:00
gus
66e3eacace
fix bows
2013-07-16 15:14:34 +01:00
gus
701ff94887
bugfix for lockpick
2013-07-16 14:46:44 +01:00
gus
20341ae8b7
simplification + taking into account weapon speed. Seems too fast, but i'm not sure
2013-07-16 14:10:14 +01:00
gus
8fc6e73649
post-merge fix
2013-07-16 11:51:18 +01:00
gus
ee47e99dad
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2
...
Conflicts:
apps/openmw/mwmechanics/character.cpp
apps/openmw/mwmechanics/character.hpp
2013-07-16 11:40:19 +01:00
Marc Zinnschlag
47f7bbd48a
fixed OpenCS crash during cell loading when loading multiple ESX files
2013-07-16 12:08:35 +02:00
gus
f6e3445414
Jittering gone + bugfix: chop animation works!
...
TODO: fix this unequip stuff
2013-07-16 09:50:59 +01:00
Chris Robinson
e5e9c83ed5
Merge remote-tracking branch 'zini/master' into animation-state
2013-07-16 01:33:46 -07:00
Chris Robinson
a932a89e02
Specify the velocity-based animation speed multiplier when playing it
2013-07-16 01:30:03 -07:00
Chris Robinson
f296d13c20
Add a speed multiplier to the animation state
2013-07-16 00:43:31 -07:00
Chris Robinson
3a1facefdf
Store a pointer to the character controller for non-actor objects
2013-07-15 23:47:04 -07:00
Chris Robinson
06e631f213
Track death separately in the character controller
2013-07-15 23:43:33 -07:00
Chris Robinson
4ae65c20e6
Separate movement and idle states
...
This allows us to better handle cases of "missing" animations. Mainly for
first-person, but also for spells and certain weapon types.
2013-07-15 22:56:23 -07:00
scrawl
94d45e1518
Fix twohanded weapons not unequipping when equipping a torch
2013-07-15 23:21:01 +02:00
scrawl
daf9dca121
Fix exception when starting a new game
2013-07-15 20:37:36 +02:00
gus
f7f23ac5d8
improvement of the chop animation. Still some jittering.
2013-07-15 17:18:16 +01:00
gus
f7b711aabe
bugfix
2013-07-15 16:37:32 +01:00
gus
076f98cbba
change way animations keys are handled (thanks KittyCat!)
2013-07-15 16:37:25 +01:00
Marc Zinnschlag
fd9cc1c282
Merge remote-tracking branch 'vorenon/container'
2013-07-15 09:33:16 +02:00
Marc Zinnschlag
a0022e711b
Merge remote-tracking branch 'scrawl/raycast'
2013-07-15 09:20:16 +02:00
vorenon
66eb82b363
oops again
2013-07-15 02:26:22 +02:00
vorenon
33779ae23c
oops
2013-07-15 02:23:18 +02:00
vorenon
d4739a451a
added ability to close container windows with the activation key
2013-07-15 02:18:24 +02:00
scrawl
c81b852071
Fixes inaccurate ray casts; rely on getCameraToViewportRay
2013-07-15 00:39:37 +02:00
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
2013-07-14 23:54:28 +02:00
Marc Zinnschlag
1bc343f363
Merge remote-tracking branch 'kcat/first-person'
2013-07-14 21:28:09 +02:00
scrawl
fa5198d7b2
Fix an assertion
2013-07-14 14:59:24 +02:00
scrawl
61661c8653
Fix first person meshes casting shadows
2013-07-14 14:55:07 +02:00
scrawl
a049638e7f
Fixes character previews getting shadowed randomly
2013-07-14 14:54:40 +02:00
Marc Zinnschlag
6a5ab34971
Merge branch 'region'
2013-07-14 12:19:02 +02:00
Chris Robinson
3771e5839e
Allow some more third person fallbacks in first person
2013-07-13 17:03:10 -07:00
Chris Robinson
5ee889e8b6
Attach the camera to the Head node in first-person
2013-07-13 16:12:38 -07:00
gus
3947f44aa3
Porting old work
2013-07-13 22:24:52 +01:00
Chris Robinson
2d7620e774
Rotate the neck when looking up and down in first-person
2013-07-13 12:39:06 -07:00
Marc Zinnschlag
4cce466dc7
inverted region map y-axis
2013-07-13 16:34:10 +02:00
Chris Robinson
4df1f198a7
Avoid a map lookup for every skin body part when updating
2013-07-12 22:32:09 -07:00
Chris Robinson
6de56615aa
Avoid casting shadows in first-person view
2013-07-12 22:32:05 -07:00
Chris Robinson
025fa4e0d5
Use a multimap for the bodypart map
2013-07-12 22:32:04 -07:00
Chris Robinson
a5e4faaed2
Show arms and body parts in first person
...
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
2013-07-12 22:31:59 -07:00
Chris Robinson
908f010c74
Reset the NPC object root when switching POV
...
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
2013-07-12 22:31:57 -07:00
Chris Robinson
7883087586
Store a pointer to the character controller in the map
2013-07-12 22:31:50 -07:00
Marc Zinnschlag
c26a6f884f
added region map tooltips
2013-07-12 12:55:14 +02:00
greye
29b7734b52
add qualifiers for names in templates to make gcc 4.7+ happy
2013-07-12 08:33:02 +04:00
Marc Zinnschlag
c808bf2b23
updating region map on changes to region and cell records
2013-07-11 15:05:28 +02:00
Marc Zinnschlag
b17f383c6d
Merge remote-tracking branch 'graffy76/RefIdTypeDelegate'
...
Conflicts:
apps/opencs/view/world/table.cpp
2013-07-11 09:09:52 +02:00
graffy76
11178cc470
Repo permissions commit fix #3
2013-07-10 21:44:25 -05:00
graffy76
bb049806df
Repo permissions commit fix #2
2013-07-10 21:13:59 -05:00
graffy76
ae4e3181d9
Fixing repo permissions commit #1
2013-07-10 17:29:07 -05:00
scrawl
bbb5d2b98a
Change tooltip positioning to resemble vanilla
2013-07-10 03:40:13 +02:00
Marc Zinnschlag
d389b70ec4
added missing case folding
2013-07-09 14:22:58 +02:00
Marc Zinnschlag
121978a69e
some cleanup; added handling of deleted cells (now displayed instead of ignored)
2013-07-09 14:20:28 +02:00
Marc Zinnschlag
116320cc0d
dealing with invalid regions and cells without regions
2013-07-08 17:13:58 +02:00
