Andrei Kortunov
c2706ac3e7
Merchant repair and travel window scroll fix
2017-04-23 09:15:25 +04:00
scrawl
0e37e71ea2
Merge pull request #1266 from akortunov/handsfallbackfix
...
Improved hands bodyparts selection fallback
2017-04-23 00:36:48 +02:00
Andrei Kortunov
4544caf7f3
Improved bodypart select fallback ( fixes #2594 )
2017-04-22 22:23:10 +04:00
David Cernat
4ebc9f1314
Merge pull request #204 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2017-04-22 14:33:26 +03:00
MiroslavR
0737d6cb72
Merge pull request #1270 from Allofich/scriptfix
...
Check for NULL before running voice dialogue scripts
2017-04-22 01:58:20 +02:00
Allofich
f34e35eb19
Check for NULL before running voice scripts
...
(Fixes #3834 )
2017-04-22 07:51:31 +09:00
David Cernat
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
2017-04-21 21:07:37 +03:00
scrawl
8fbf9dc597
Merge pull request #1253 from akortunov/pinned
...
Remember "pinned" windows across game restarts
2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f
Move updatePinnedWindows() function to private section
2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa
Remove unused code
2017-04-21 18:39:01 +04:00
Allofich
143ee387cc
Add enabled check to animation script commands
...
(Fixes #3793 )
2017-04-21 23:27:24 +09:00
scrawl
fc56fc0b81
Merge pull request #1265 from akortunov/develop
...
Use "sLevel" GMST instead of hardcoded text in load game menu
2017-04-21 15:30:15 +02:00
scrawl
2c879ddbbf
Merge pull request #1264 from Allofich/script
...
Run scripts for voiced dialogue
2017-04-21 15:26:09 +02:00
Andrei Kortunov
e717d046f2
Escaped class name string
2017-04-21 17:21:57 +04:00
scrawl
1956602aa2
Merge pull request #1262 from Allofich/warnings
...
Fix more warnings
2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce
Use sLevel GMST instead of hardcoded text in load game menu
2017-04-21 09:40:25 +04:00
David Cernat
fec82dc033
Merge pull request #202 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017
2017-04-21 07:58:13 +03:00
Andrei Kortunov
6c1e3a0618
Merged from upstream master
2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f
Fix shadowing warnings
2017-04-21 11:06:18 +09:00
Allofich
60c67bc327
Run scripts for voiced dialogue
...
(Fixes #3787 )
2017-04-21 10:39:11 +09:00
scrawl
c2240e3af1
Call the WindowManager::updatePlayer after the startup script is run
2017-04-21 00:51:13 +02:00
scrawl
1ffb9e1bf3
Remove renderWorldMap()
2017-04-21 00:50:22 +02:00
scrawl
bfdde0262f
Merge pull request #1260 from akortunov/levitationfix
...
Purge existing levitation effects when levitation is disabled (fixes #3766 )
2017-04-21 00:25:09 +02:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
David Cernat
10d554af5b
[Client] Make NPCs react to DedicatedPlayer & DedicatedActor attacks
2017-04-20 17:00:40 +03:00
Andrei Kortunov
90d90b6d81
Fixed dynamic stats tooltips in review menu
2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c
Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes
2017-04-20 17:20:20 +04:00
Allofich
2e5fd74db0
Fix invalid iterator warning
2017-04-20 19:30:35 +09:00
David Cernat
edb155869b
Merge pull request #201 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2017
2017-04-19 22:12:33 +03:00
David Cernat
6aa0fa85ab
[Client] Send and read ActorAttack packets
2017-04-19 22:10:06 +03:00
David Cernat
2e8714afaa
[Client] Rethink and restructure tes3mp combat code so it works for NPCs
2017-04-19 22:06:04 +03:00
scrawl
df3b4fe6a5
Merge pull request #1259 from Allofich/warnings
...
Fix a few Cppcheck warnings
2017-04-19 20:32:40 +02:00
David Cernat
6c2bbd6608
[Client] Fix assignAttackTarget() not assigning LocalPlayer as target
2017-04-19 20:51:31 +03:00
Andrei Kortunov
f0f1df3a96
Properly clear inventory
2017-04-19 20:54:09 +04:00
Allofich
e87d2aa1af
Remove unused function
2017-04-20 01:47:30 +09:00
Allofich
60a2625b89
Add parentheses to clarify calculations
2017-04-20 01:38:21 +09:00
scrawl
30081393a6
Add InventoryWindow::clear() as part of world cleanup
2017-04-19 18:28:49 +02:00
Allofich
f299f26720
Remove unused variable
2017-04-20 01:22:33 +09:00
Allofich
5a00b239ac
Reduce scope of variables
2017-04-20 01:22:30 +09:00
Allofich
c655875584
Change mWaterEnabled from float to bool
2017-04-20 01:09:52 +09:00
David Cernat
61cedfa192
[Client] Add CellController methods to fetch Actors without needing Ptrs
2017-04-19 18:20:12 +03:00
Andrei Kortunov
04eb4ea6b6
Check for disabled levitation ( fixes #3766 )
2017-04-19 18:38:25 +04:00
David Cernat
0ef9e014eb
[Client] Add resetAttack() and getSpellSuccess() to MechanicsHelper
2017-04-19 17:09:35 +03:00
scrawl
50f3794d12
Merge pull request #1258 from akortunov/drownfix
...
Fixed drowning widget initialization with non-default "fHoldBreathTime" GMST value
2017-04-19 16:08:55 +02:00
Andrei Kortunov
3c4c47d1e6
Reduced scope of fHoldBreathTime variable
2017-04-19 15:52:15 +04:00
David Cernat
c3375ba86f
[Client] Add MechanicsHelper::assignAttackTarget()
2017-04-19 11:05:13 +03:00
David Cernat
17c4b6d4de
[Client] Add MechanicsHelper methods for easily getting Attacks from Ptr
2017-04-19 10:36:23 +03:00
Andrei Kortunov
c3fd327bb2
Fixed drowning widget initialization
2017-04-19 08:48:16 +04:00
scrawl
f90e5081f9
Merge pull request #1257 from akortunov/chargen
...
Chargen menus fixes
2017-04-18 22:23:30 +02:00
David Cernat
82e455f736
[Client] Organize headers
2017-04-18 18:51:40 +03:00
David Cernat
014ff7a059
[Client] Replace usage of Networking::isDedicatedPlayer()
2017-04-18 18:07:39 +03:00
David Cernat
1f6d05dfe5
[Client] Remove unused Networking::attack() method
2017-04-18 17:45:26 +03:00
David Cernat
53081a6a6f
[Client] Clean up more checks by using PlayerList::isDedicatedPlayer()
2017-04-18 12:38:26 +03:00
Koncord
0a9768860b
[Client] Add Processors to subgroups in cmakelists
2017-04-18 16:50:51 +08:00
Koncord
9cbb8af9d2
[Client] Remove WorldController from cmakelists
2017-04-18 16:04:58 +08:00
Koncord
67aba35d37
[Client] Simplify Processors
2017-04-18 15:05:39 +08:00
Koncord
1db30a65cb
[Client] Remove unecessary calls
2017-04-18 14:42:43 +08:00
Koncord
6969742ef0
[Client] Enable actor processors
2017-04-18 14:38:23 +08:00
Koncord
2c62c501f6
[Client] Add & init Actor processors
2017-04-18 14:37:35 +08:00
Koncord
7ec897a829
[Client] Add ActorProcessor
2017-04-18 14:37:35 +08:00
David Cernat
29f9453554
[Client] Clean up headers in Networking
2017-04-18 09:32:40 +03:00
Koncord
8128a5c39c
[Client] Use protected member instead local variable
2017-04-18 13:15:31 +08:00
Koncord
25fef1a7b8
[Client] FIx conflicts
2017-04-18 12:17:58 +08:00
Koncord
578d305d86
[Client] Enable world processors
2017-04-18 11:51:05 +08:00
Koncord
7dcaef5a5a
[Client] Init world processors
2017-04-18 11:50:22 +08:00
Koncord
fd3a7d2ad0
[Client] Add world processors
2017-04-18 11:50:22 +08:00
Koncord
f0805ca6f7
[Client] Fix typo
2017-04-18 11:50:22 +08:00
Koncord
740bfea0b2
[Client] Use processors for player packets
2017-04-18 11:49:00 +08:00
Koncord
e98fa6ad07
[Client] Add ProcessorInitializer
2017-04-18 11:45:54 +08:00
Koncord
f09dc2b65b
[Client] Add player processors
2017-04-18 11:38:40 +08:00
Koncord
a6111b6599
[Client] Add PlayerProcessor & WorldProcessor
2017-04-18 11:38:40 +08:00
David Cernat
07c2d4251e
[Client] Add and use mwmp::PlayerList::isDedicatedPlayer()
2017-04-17 20:36:20 +03:00
David Cernat
7c45888f05
[Client] Reorder methods in DedicatedPlayer
2017-04-17 19:34:32 +03:00
David Cernat
0aaf68c994
[Client] Rename mwmp::Players into mwmp::PlayerList for clarity
2017-04-17 19:10:33 +03:00
David Cernat
c05c456b11
[Client] Clean up parts of LocalPlayer and DedicatedPlayer
2017-04-17 18:50:20 +03:00
David Cernat
a650683bae
[General] Add and use Target struct in mwmp::Attack
2017-04-17 18:31:39 +03:00
David Cernat
9882ceedf3
[General] Remove attackerGuid from mwmp::Attack because it is redundant
2017-04-17 18:03:33 +03:00
David Cernat
caf5428532
[General] Rename mwmp::Attack vars in preparation for Actor support
2017-04-17 17:24:11 +03:00
David Cernat
2050d06b31
[Client] Process PlayerAttack in MechanicsHelper::processAttack()
2017-04-17 16:09:07 +03:00
David Cernat
cf155c9279
[Client] Add MechanicsHelper and move linear interpolation code to it
2017-04-17 14:37:19 +03:00
David Cernat
2565816b22
[Client] Delimit and clarify combat changes made by tes3mp
...
Additionally, revert unneeded small changes to the formatting of OpenMW code
2017-04-17 11:55:22 +03:00
David Cernat
9f226253d4
[General] Rename mwmp::Attack's refid into refId for consistency
2017-04-17 09:35:18 +03:00
David Cernat
b09e6644a9
[Client] Prevent infinite guard arrest loops
2017-04-16 20:26:06 +03:00
Andrei Kortunov
aac78d29a4
Service menus layout fixes
2017-04-16 20:30:20 +04:00
David Cernat
f0f0b2dcc9
[General] Send and read ActorSpeech packets
2017-04-16 18:43:13 +03:00
David Cernat
d2178e5414
[Client] Assign LocalActor movement settings before rotations get reset
2017-04-16 17:09:47 +03:00
David Cernat
1fb11dafef
[General] Send and read ActorStatsDynamic packets
2017-04-16 16:42:07 +03:00
David Cernat
678edffb5a
[Client] Rename updateDynamicStats() into updateStatsDynamic()
2017-04-16 14:11:55 +03:00
David Cernat
870886192b
[General] Rename DYNAMICSTATS into STATS_DYNAMIC
2017-04-16 09:00:18 +03:00
David Cernat
f64580bc10
[Client] Enable head rotation AI for DedicatedActors
2017-04-16 08:42:49 +03:00
David Cernat
8ebe7ed683
[Client] Remove isLocalActor (no longer needed) from LiveCellRefBase
2017-04-16 07:54:44 +03:00
David Cernat
ca8fd1aa72
[General] Remove ActorHeadRotation packet because it would be too spammy
2017-04-15 15:49:40 +03:00
David Cernat
2872675f5e
[General] Send and read ActorAnimPlay packets
2017-04-15 13:42:30 +03:00
David Cernat
56aeb85965
[Client] Update method names in ActorList
2017-04-15 11:45:20 +03:00
David Cernat
5c1d7f614a
[Client] Rename readDrawStates() into readAnimFlags()
2017-04-15 10:47:53 +03:00
David Cernat
bf17464074
Merge pull request #198 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
2017-04-15 05:36:50 +03:00
Andrei Kortunov
c93cf822c7
Reviewmenu: read name, race, class and birthsign from player stats (fixes bug #2628 )
2017-04-14 23:21:20 +04:00
Andrei Kortunov
fb0c4700a4
Save a proto gender in racemenu
2017-04-14 23:19:48 +04:00
scrawl
f63b1e81cd
Merge pull request #1228 from akortunov/master
...
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02:00
David Cernat
e7960eee76
[General] Rename DrawState packets into AnimFlags ones for clarity
2017-04-14 16:00:34 +03:00
David Cernat
11a9e3bdb1
Merge pull request #197 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
2017-04-14 05:57:28 +03:00
scrawl
17125e6c4d
Merge pull request #1256 from Allofich/equip
...
Adjustments to RemoveItem behavior
2017-04-14 01:08:29 +02:00
David Cernat
de8d28e2c3
[Client] Improve logic for updating LocalActors & sending their packets
2017-04-13 18:59:22 +03:00
David Cernat
426d5a7fc2
[Client] Add missing usage of sendDrawStateActors()
2017-04-13 18:56:38 +03:00
Andrei Kortunov
dc036e96d4
fixed magicka calculation on chargen (bug #3694 )
2017-04-13 18:30:36 +04:00
Allofich
6e405aed8c
Adjustments to RemoveItem behavior
...
(Fixes #3796 )
2017-04-13 22:33:13 +09:00
David Cernat
d2fe777f89
[General] Send and read ActorDrawState packets
2017-04-13 15:26:48 +03:00
David Cernat
9c731990a9
[Client] Use clearer var names in LocalPlayer::updateDrawStateAndFlags()
2017-04-13 14:10:42 +03:00
David Cernat
10ad5b2a99
[General] Remove BaseActor's AnimStates that are no longer needed
2017-04-13 13:06:09 +03:00
David Cernat
c6cd0a2953
Merge pull request #196 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
2017-04-13 07:07:49 +03:00
scrawl
8d8f293a65
Merge pull request #1246 from akortunov/develop
...
Menu improvements
2017-04-12 23:57:00 +02:00
scrawl
d8943d911c
Merge pull request #1254 from Allofich/warning
...
Remove unnecessary line
2017-04-12 23:49:29 +02:00
Allofich
470988f9ef
Minor changes to getActorsSidingWith
2017-04-13 04:45:44 +09:00
Andrei Kortunov
c3d49d5ca5
Fixed inventory crash and skipmenu launch
2017-04-12 22:57:32 +04:00
Allofich
6272e1c674
Cache allies found while iterating engageCombat
...
(Fixes #3814 )
2017-04-13 02:02:38 +09:00
Allofich
5020d03c78
Remove unnecessary line
2017-04-12 22:59:28 +09:00
Andrei Kortunov
72a16dc78b
Merge branch 'master' into pinned since added PR #1250
2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d
Add option to show reach and attack speed for melee weapons
2017-04-12 09:12:25 +04:00
scrawl
993860a4b1
Merge pull request #1250 from resilar/mapbutton
...
Hide WorldButton when in game mode
2017-04-11 21:34:53 +02:00
scrawl
8f335b3484
Merge pull request #1245 from akortunov/tgm
...
Vanilla-like tgm
2017-04-11 21:34:44 +02:00
David Cernat
0d196af685
[General] Add placeholders for 7 new ActorPackets
2017-04-11 11:37:38 +03:00
David Cernat
9852076590
[Client] Send all NPC data to newly arriving players
2017-04-10 18:24:30 +03:00
David Cernat
15f91e7825
[Client] Add CellController methods for getting and checking Cells
2017-04-10 18:13:22 +03:00
David Cernat
69f820f3a0
[Client] Rename CellController's getCell() into getCellStore()
2017-04-10 17:30:57 +03:00
David Cernat
d14102716d
[Client] Retool LocalActors and DedicatedActors for ActorPosition packet
2017-04-10 17:10:18 +03:00
David Cernat
cbd2af972d
[Client] Get movement settings for NPCs before they are reset
2017-04-10 17:06:44 +03:00
David Cernat
2709de83fb
[Client] Use clearer variable names in LocalPlayer::UpdatePosition()
2017-04-10 14:53:59 +03:00
David Cernat
b6c3830ea0
[General] Rename WorldObject's pos into position for consistency
2017-04-10 09:25:20 +03:00
Andrei Kortunov
95ce7637f3
Adds persisted pin (feature #2834 , bug #2489 )
2017-04-10 10:18:00 +04:00
David Cernat
174f316787
[General] Rename PacketActorFrame into PacketActorTest
2017-04-10 08:37:18 +03:00
David Cernat
a5d0486c82
[General] Set actor data correctly
2017-04-10 07:22:03 +03:00
David Cernat
b9d68c0ab2
Merge pull request #195 from OpenMW/master
...
Add OpenMW commits up to 10 Apr 2017
2017-04-10 01:20:42 +03:00
David Cernat
c52084a028
[General] Use BaseActorLists in ActorPackets
2017-04-09 16:32:44 +03:00
David Cernat
070c6a3bd4
[General] Add ActorPacketController & make controller var names clearer
2017-04-09 08:51:28 +03:00
David Cernat
a1d0b4908f
[Client] Fix Travis CI build by not using nullptr
2017-04-08 16:46:38 +03:00
David Cernat
c8a486de6c
[Client] Fix Ptr initialization in mwmp::Cell
2017-04-08 16:02:59 +03:00
David Cernat
0ccbe70e61
[Client] Rename methods to make their purpose clearer
2017-04-08 14:31:22 +03:00
David Cernat
6da6c4e62d
[Client] Prevent NPCs from attacking a player engaged in dialogue
2017-04-08 13:06:42 +03:00
David Cernat
b883b4c7ce
[Client] Reorder includes
2017-04-08 12:54:38 +03:00
David Cernat
3d6dc74bdc
[Client] Fix logic for mwmp::Cell initialization
2017-04-08 12:33:41 +03:00
David Cernat
417284c701
[Client] Implement head rotation sync for NPCs
2017-04-08 11:40:19 +03:00
David Cernat
f52fc19762
[Client] Reorder methods and don't set variables that are no longer used
2017-04-08 10:58:25 +03:00
David Cernat
d3f3fb5d05
[Client] Correctly implement movement animation sync for NPCs
2017-04-08 08:59:21 +03:00
David Cernat
5b43e62c50
[Client] Make it possible to get DedicatedActor from CellController
2017-04-08 07:46:33 +03:00
David Cernat
e6536c7473
[Client] Disable basic NPC sync in preparation for overhaul
2017-04-07 16:04:21 +03:00
David Cernat
1101ff1e28
[Client] Update DedicatedActors every frame to allow interpolation
2017-04-07 15:51:34 +03:00
David Cernat
ae92117d21
[Client] Add missing return
2017-04-07 11:32:42 +03:00
David Cernat
18be1880f0
[Client] Make it possible to get LocalActor from CellController
2017-04-07 10:16:23 +03:00
David Cernat
10be52d40d
[Client] Add localActorsToCells map to more easily find LocalActors
2017-04-07 08:12:50 +03:00
David Cernat
e89265e469
[Client] Turn CellController's cellsActive into a map instead of a deque
2017-04-07 05:52:07 +03:00
David Cernat
d829d219c3
[General] Add (very) partial animation sync for NPCs
2017-04-06 15:11:51 +03:00
David Cernat
e8638d9884
[Client] Add basic position sync for NPCs
2017-04-06 11:46:56 +03:00
David Cernat
89ed318d3c
[Client] Remove usage of nullptr that Travis CI is getting stuck on
2017-04-06 06:17:27 +03:00
David Cernat
67ec81ad0c
[Client] Use utility function for converting strings in mwmp::Cell
2017-04-06 05:45:49 +03:00
David Cernat
d4a12856ee
[Client] Enable AI for LocalActors
2017-04-06 04:59:55 +03:00
David Cernat
0d766a7a04
[Client] Add and use mwmp::Cell class
2017-04-06 04:00:50 +03:00
David Cernat
9beaf9b7a1
[Client] Initialize and update LocalActors while their cells are active
2017-04-06 00:49:20 +03:00
David Cernat
8df9d55331
[Client] Create placeholder DedicatedActor class
2017-04-06 00:48:20 +03:00
David Cernat
d24cde16dd
[General] Add simple BaseActor and LocalActor classes
2017-04-05 12:52:27 +03:00
David Cernat
679e790d8d
[Client] Rename WorldController into CellController to avoid confusion with Networking's WorldPacketController
2017-04-05 12:00:21 +03:00
David Cernat
c2d6265ffd
[Client] Reorder methods in WorldEvent, placing packet senders at bottom
2017-04-05 09:12:02 +03:00
David Cernat
9759764699
[Client] Clean up getting and resetting of WorldEvent
2017-04-05 09:04:41 +03:00
David Cernat
d7a760490e
[Client] Simplify sending of world packets, part 2
2017-04-05 08:43:35 +03:00
David Cernat
b55a3d5eb2
[Client] Add placeholder editActors() method for random creature sync
2017-04-05 08:07:53 +03:00
David Cernat
4abe295a80
[Client] Simplify sending of world packets by adding WorldEvent methods
2017-04-05 07:54:23 +03:00
David Cernat
1d23a48a42
[Client] Print mpNums when objects are found in a cell
2017-04-05 07:10:22 +03:00
David Cernat
0df14320e0
[Client] Set mMpNum to 0 for ManualRef
2017-04-05 06:58:59 +03:00
David Cernat
6c60c9c78e
[Client] Clean up debug messages for when objects are found in a cell
2017-04-05 06:30:12 +03:00
David Cernat
bb9ea6ccd4
[Client] Also include list of creatures in reply to ActorList
2017-04-05 06:22:01 +03:00
David Cernat
ca92be14a5
[Client] Reply to ActorList request with list of NPCs
2017-04-05 05:54:25 +03:00
David Cernat
8c2469bf6d
[General] Add placeholder ActorList, ActorAuthority & ActorFrame packets
2017-04-05 04:06:45 +03:00
David Cernat
8b8c01f389
[General] Make ID_OBJECT_PLACE take effect only when sent back by server
2017-04-04 11:43:33 +03:00
David Cernat
2bd81c3de0
[Client] Use mpNum for every WorldObject
2017-04-04 11:07:16 +03:00
David Cernat
4644235cf6
[Client] Use mpNum in exact searches for objects
2017-04-04 10:07:15 +03:00
David Cernat
8cc61b6048
[General] Generate mpNums on the server when forwarding ID_OBJECT_PLACE
2017-04-04 09:23:34 +03:00
David Cernat
31cd836558
[General] Small tweaks to debug info
2017-04-04 08:24:11 +03:00
David Cernat
06acd3cbc4
[Client] Add a multiplayer object index and matching methods to CellRef
2017-04-04 07:42:02 +03:00
David Cernat
e5cf632e1d
[Client] Stop creating new reference numbers for placed/spawned objects
2017-04-04 06:01:48 +03:00
def
785b3c3d01
Hide WorldButton when in game mode
2017-04-03 09:40:12 +03:00
Andrei Kortunov
31bd70f334
Added missed recharge and repair sounds
2017-04-02 23:19:43 +04:00
David Cernat
e7b5097c13
[Client] Print plugin paths correctly for Windows
2017-04-01 05:57:27 +03:00
David Cernat
dff52d8fbe
Merge pull request #191 from OpenMW/master
...
Add OpenMW commits up to 31 Mar 2017
2017-04-01 03:27:44 +03:00
Andrei Kortunov
df5a43363a
Confirmation dialogs size fix
2017-03-30 17:05:56 +04:00
scrawl
3c9f3a0f7f
Merge pull request #1242 from Allofich/warnings
...
Fix AppVeyor warnings
2017-03-29 07:28:00 +02:00
David Cernat
7647715dac
Merge pull request #190 from OpenMW/master
...
Add OpenMW commits up to 27 Mar 2017
2017-03-28 08:05:23 +03:00
Andrei Kortunov
edadcb338c
Savegame dialog improvements
2017-03-27 23:10:57 +04:00
scrawl
9e7ade4ba4
Merge pull request #1244 from akortunov/develop
...
MyGUI vertical alignment
2017-03-27 20:14:09 +02:00
Allofich
db2f97f308
Fix shadowing warning
2017-03-27 20:22:20 +09:00
Andrei Kortunov
7d09a5d644
Progress bars vertical alignment
2017-03-27 13:33:28 +04:00
scrawl
a036a98fd0
Merge pull request #1243 from akortunov/develop
...
Journal improvements
2017-03-27 02:56:35 +02:00
scrawl
b064dd29cc
Fix reset of blend function (Bug #3811 )
2017-03-27 02:51:23 +02:00
Andrei Kortunov
658ab5e941
Minor journal improvements
2017-03-26 22:56:36 +04:00
scrawl
2a74f79bf1
Merge pull request #1240 from Allofich/follow
...
Adjust AI follow distances
2017-03-26 20:35:11 +02:00
Allofich
6253a5218e
Adjust AI follow distances
...
(Fixes #3225 )
2017-03-27 03:31:25 +09:00
scrawl
0a061d45b7
Merge pull request #1239 from akortunov/projectilefix
...
Disable explosion effect for 0-range projectiles (bug #3730 )
2017-03-26 20:30:43 +02:00
Andrei Kortunov
14b59e0e4b
Vanilla-like tgm ( fixes #3798 )
2017-03-25 22:40:11 +04:00
Andrei Kortunov
860b556713
Disables explosion effect for 0-range projectiles ( fixes #3730 )
2017-03-25 19:53:24 +04:00
MiroslavR
da6b28eb40
Fix selling success chance ( Fixes #3802 )
2017-03-25 15:21:16 +01:00
scrawl
97dbd07ed2
Merge pull request #1236 from akortunov/guifixes
...
Minor GUI fixes
2017-03-25 13:36:58 +01:00
Andrei Kortunov
7bd0c74aa8
Fixes mWatchedTimeToStartDrowning initialization (fixes bug #3801 )
2017-03-25 14:15:16 +04:00
Andrei Kortunov
e383e4d023
Disabled hit overlay for damage/absorb mana/fatigue spells
2017-03-25 14:10:19 +04:00
scrawl
373bd78cf3
Merge pull request #1233 from akortunov/guifixes
...
Vanilla style drowning widget
2017-03-24 18:10:11 +01:00
Andrei Kortunov
b89fdcfd27
Vanilla style drowning widget (partially fixes bug #3801 ).
2017-03-24 09:41:18 +04:00
David Cernat
c10dd1b002
Merge pull request #188 from OpenMW/master
...
Add OpenMW commits up to 24 Mar 2017
2017-03-24 07:24:55 +02:00
scrawl
338592b99b
Don't clear the animation queue when turning (Bug #3581 )
...
Otherwise, the turnAnimationThreshold would make it difficult to estimate when we can start playing the animation.
2017-03-23 20:05:06 +01:00
scrawl
a5d7b36c28
Don't clear idle animation when movement ends (Bug #3581 )
...
This caused problems when AiWander tried to start an idle animation in the frame after movement stops.
2017-03-23 20:05:05 +01:00
scrawl
c611ddba8d
Remove stray term
2017-03-23 20:05:05 +01:00
scrawl
f230df3d1c
Merge pull request #1232 from akortunov/tooltipfix
...
Tooltip maximum width cap
2017-03-23 17:12:36 +01:00
Andrei Kortunov
1a47b9727b
Changed tooltip maximum width (bug #3800 )
2017-03-23 14:31:01 +04:00
scrawl
02c6c1897e
Merge pull request #1230 from Allofich/stats
...
Change bounds behavior of stat script commands
2017-03-22 20:22:45 +01:00
Allofich
5282556ae0
Show names on combat actors when RMB GUI is active
...
Fixes (#3797 )
2017-03-22 20:04:29 +09:00
Allofich
57aeec59d5
Change bounds behavior of stat script commands
...
Fixes (#3776 )
2017-03-22 15:17:44 +09:00
Andrei Kortunov
1286754fb3
Add a new option to show arrow damage (feature #2923 )
2017-03-18 08:07:36 +04:00
David Cernat
5eb183bacf
Merge pull request #186 from OpenMW/master
...
Add OpenMW commits up to 15 Mar 2017
2017-03-15 23:13:24 +02:00
Andrei Kortunov
eb81ab5b24
Disables weapon and spells cycling in GUI mode (bugs #2409 , #2483 , #2645 )
2017-03-15 17:07:25 +04:00
David Cernat
60037e4081
Merge pull request #185 from OpenMW/master
...
Add OpenMW commits up to 14 Mar 2017
2017-03-15 11:20:06 +02:00
scrawl
e987fe85d0
Add abort flag to TerrainPreloadItem
2017-03-14 21:28:57 +01:00
scrawl
42e9891504
Fix issues caused by loading multiple views into the same terrain View
2017-03-14 20:27:55 +01:00
scrawl
97ed999097
Fix cleanup issue
2017-03-14 20:02:22 +01:00
scrawl
c22fde2bcd
Preload terrain while reading savegame
2017-03-14 19:27:56 +01:00
scrawl
9371100fde
Reuse the intersection visitor and set a traversal number to allow the terrain component to manage its view more efficiently
2017-03-14 19:27:56 +01:00
scrawl
59bf100907
Fill exteriorPositions in preloadFastTravel
2017-03-14 19:27:56 +01:00
scrawl
03c07d3bd5
Remove old code
2017-03-14 19:27:56 +01:00
scrawl
86e75f0987
Preload terrain even when cell preloading is disabled
2017-03-14 19:27:56 +01:00
scrawl
d055dc25bf
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
2017-03-14 19:27:56 +01:00
scrawl
6ccb6009ee
Use the View-based preloading for TerrainGrid as well
2017-03-14 19:27:56 +01:00
scrawl
3c29e2dbeb
Refactor ownership of terrain views
2017-03-14 19:27:56 +01:00
scrawl
28fd492711
Don't use terrain LOD for the map camera
2017-03-14 19:27:56 +01:00
scrawl
e7a0878c10
Add CompositeMapRenderer info to the stats panel
2017-03-14 19:27:56 +01:00
scrawl
ec0b743123
Revert "Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer."
...
This reverts commit 7d72c70c93ee3c0cc3d00d37b22c339d0103cd19.
2017-03-14 19:27:56 +01:00
scrawl
4549196b31
Use the new way of terrain preloading in CellPreloader/Scene
2017-03-14 19:27:56 +01:00
scrawl
1c15686353
Remove non required use of WorkQueue
2017-03-14 19:27:56 +01:00
scrawl
19d516cbda
Use the QuadTreeWorld based on distant terrain setting now that it sort of works.
2017-03-14 19:27:56 +01:00
scrawl
4dbd224249
Hide the terrain in non-exterior cells
2017-03-14 19:27:56 +01:00
scrawl
c684860e3b
Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer.
2017-03-14 19:27:55 +01:00
scrawl
2d549d088e
Get the world size from the ESM::Land store
2017-03-14 19:27:55 +01:00
scrawl
14225a42c6
Remove unused pointer to IncrementalCompileOperation
2017-03-14 19:27:55 +01:00
scrawl
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
2017-03-14 19:27:55 +01:00
scrawl
e323b2fa7b
Use the SceneManager's ShaderManager
2017-03-14 19:27:55 +01:00
scrawl
0fc465da59
Store the min/max height in LandData
2017-03-14 19:27:55 +01:00
scrawl
051c17a184
Make reportStats const
2017-03-14 19:27:55 +01:00
scrawl
2c68ed4fb4
Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread
2017-03-14 19:27:55 +01:00
scrawl
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
2017-03-14 19:27:55 +01:00
scrawl
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
2017-03-14 19:27:55 +01:00
scrawl
b898315962
cellpreloader: abort all tasks first before waiting
2017-03-14 19:27:55 +01:00
scrawl
5f76317807
Wait for completion of CreateMapItem on exit to avoid potential threading issue
2017-03-14 19:27:55 +01:00
scrawl
804f873649
terrain: factor out texture caching into a separate class
2017-03-14 19:27:55 +01:00
scrawl
ccfebdd2c3
Set the underwater fog relative to default view distance
2017-03-14 19:27:44 +01:00
David Cernat
d94850fbdf
Merge pull request #184 from OpenMW/master
...
Code style
2017-03-14 13:24:24 +02:00
scrawl
fe439e7bbf
Add missing default material state for character preview
2017-03-14 05:02:31 +01:00
scrawl
37c71c15f2
Remove redundant state
2017-03-14 04:57:36 +01:00
scrawl
4c9bbce1e2
Fix node mask being reset
2017-03-14 01:01:50 +01:00
David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
2017-03-13 18:20:07 +02:00
MiroslavR
a8517c34eb
Code style
2017-03-13 13:57:05 +01:00
scrawl
a556475fae
Explicitely set the user data type to avoid const/non-const mismatch
2017-03-13 02:48:23 +01:00
scrawl
5de5be77f3
Fix Ptr/ConstPtr userdata mismatch (Bug #3784 )
2017-03-13 02:48:23 +01:00
Mitchell Schwitzer
421b92ae05
fix styling & add missing lines regarding max proficency
2017-03-12 17:24:43 -07:00
Mitchell Schwitzer
f31e5ba85e
fix display maximum proficency reached
2017-03-12 17:02:07 -07:00
Mitchell Schwitzer
7960d5a9a7
fix skill progress bar v2
...
both widgets display their own progess indicator. it was being set for
value (when you hovered over the level of your skill, eg the "5" in
"Acrobatics 5"), but not for the name.
this fixes that, but the progress information is being stored/displayed
by two different widgets for one skill
2017-03-12 16:52:29 -07:00
Mitchell Schwitzer
465b7361e1
fix skill window update
...
invoke winMgr->updateSkillArea() in mechanicsmanagerimp.cpp after looping
over ESM::Skill::SkillEnum if any updates have occurred.
2017-03-12 15:18:02 -07:00
scrawl
809f5cd01b
Fix bad override
2017-03-08 01:28:56 +01:00
MiroslavR
af1fe64408
GetSoundPlaying called on an equipped item now also looks for sounds played by the equipping actor ( Fixes #3781 )
2017-03-07 19:00:09 +01:00
Koncord
2a723279b1
[Client] Send ID_GAME_PREINIT packet
2017-03-06 22:52:18 +08:00
Koncord
690211ad99
[General] Extract BaseEvent & BasePlayer from packets to functions
...
Move Send and Read functions to BasePacket
2017-03-06 18:40:07 +08:00
Koncord
6076346df4
[Client] Add Networking::preInit() method
2017-03-05 16:55:05 +08:00
David Cernat
df051a777a
Merge pull request #181 from OpenMW/master
...
Add OpenMW commits up to 4 Mar 2017
2017-03-04 22:56:16 +02:00
scrawl
4123398cbc
Change no-grab setting to respect the value given
2017-03-04 21:48:31 +01:00
scrawl
7eb48ea83b
Don't wrap mouse to window bounds when the gamepad axis did not move and fix off-by-one error
2017-03-04 21:48:31 +01:00
scrawl
42a04de37c
Fix a crash that occurred when a carried light fails to be attached.
2017-03-04 21:48:31 +01:00
scrawl
2776727794
Allow gamepad and mouse/keyboard to be used at the same time ( Fixes #3093 )
2017-03-04 21:48:31 +01:00
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
Koncord
cea1425db1
[Client] Remove redundant newlines & keep ~120 columns
2017-03-04 14:55:35 +08:00
Koncord
4015c3e9a9
[Client] Use constant instead magic value in Lerp function
2017-03-04 14:24:26 +08:00
Koncord
a10cf4360c
[Client] Print all esm/esp files in load queue with idx & CRC32 checksum
2017-03-04 13:23:26 +08:00
Koncord
9199446edd
[Client] Add Files::Collections to Main::init() arguments
2017-03-04 13:11:46 +08:00
David Cernat
9cffc1f661
[Client] Don't open up main menu when player's death animation finishes
2017-03-04 02:29:57 +02:00
David Cernat
0d32bf5943
[General] Add extra death debug, don't request data from player on death
2017-03-04 00:29:01 +02:00
David Cernat
c4b11a1251
[Client] Remove now unused sendData() and BitStream declarations
2017-03-04 00:17:16 +02:00
David Cernat
cf6de6c474
[Client] Update old packet-sending code in LocalPlayer and GUIChat
2017-03-03 23:36:29 +02:00
David Cernat
a2ef39c655
Merge pull request #178 from OpenMW/master
...
Add OpenMW commits up to 2 Mar 2017
2017-03-02 22:14:15 +02:00
David Cernat
6887930c04
[Client] Let scripts handle respawn point instead of hardcoding it
2017-03-02 22:12:46 +02:00
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
David Cernat
db8218545f
Merge pull request #177 from OpenMW/master
...
Add OpenMW commits up to 1 Mar 2017
2017-03-01 18:24:26 +02:00
scrawl
2873c10284
Clean the object root of StateSets and hidden nodes
2017-03-01 03:09:32 +01:00
scrawl
4e0011bfc8
Improve NPC loading performance by caching the cleaned objectRoot
2017-03-01 03:00:49 +01:00
Rafael Moura
6c2ce2b2a1
Porting more ContainerStoreIterator usage to const version #4
...
removed const_cast revision
2017-02-28 19:11:00 +00:00
Rafael Moura
7fa2703715
Porting more ContainerStoreIterator usage to const version #3
2017-02-28 14:31:51 +00:00
David Cernat
03984685e5
[Client] Remove unnecessary type specifiers
2017-02-28 12:35:51 +02:00
David Cernat
5c269a5f8d
[General] Rename ID_GAME_DIE and ID_GAME_RESURRECT
2017-02-28 01:38:25 +02:00
Rafael Moura
18a4b64f1a
Porting more ContainerStoreIterator usage to const version #2
2017-02-27 21:50:10 +00:00
David Cernat
e6bc7ad463
[General] Make all flying players fly correctly, including TCL users
2017-02-27 23:01:33 +02:00
David Cernat
48125913c3
Merge pull request #175 from OpenMW/master
...
Add OpenMW commits up to 27 Feb 2017
2017-02-27 12:09:47 +02:00
David Cernat
02487dce13
[Client] Prevent invalid race used by other player from freezing client
2017-02-27 01:45:27 +02:00
scrawl
0772a03e98
Print the object ID that animateCollisionShapes did not find the node for
2017-02-27 00:41:27 +01:00
David Cernat
4110fac629
Merge pull request #174 from OpenMW/master
...
Add OpenMW commits up to 26 Feb 2017, part 2
2017-02-27 01:05:02 +02:00
David Cernat
8c8414f098
[Client] Spawn DedicatedPlayer in center of exterior cell 0,0
2017-02-27 01:02:59 +02:00
scrawl
d4781d419f
Merge pull request #1220 from MiroslavR/tcl_collision
...
Fix actors colliding with noclipping player
2017-02-26 23:27:40 +01:00
Rafael Moura
05cc69f6f1
Porting more ContainerStoreIterator usage to const version
2017-02-26 21:24:51 +00:00
scrawl
6f4c03aa32
Avoid retrieving setting every frame
2017-02-26 17:34:24 +01:00
David Cernat
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
2017-02-26 16:59:53 +02:00
David Cernat
341ec28b1f
[Client] Don't allow actors to cast spells that don't exist on client
2017-02-26 15:34:15 +02:00
MiroslavR
498a3d450b
Fix actors colliding with noclipping player
2017-02-26 04:28:28 +01:00
David Cernat
9035908f6d
[Client] Spawn DedicatedPlayer in exterior 0,0 (for other master files)
2017-02-25 23:18:50 +02:00
David Cernat
ff0d21ef38
[Client] Spawn in 0,0 if Pelagiad doesn't exist (for other master files)
2017-02-24 19:42:33 +02:00
David Cernat
aab5b69c80
[Client] Unready weapon & spell upon death to avoid attack inability bug
2017-02-24 11:50:43 +02:00
David Cernat
328e3b6618
Merge pull request #167 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2017
2017-02-24 06:57:39 +02:00
scrawl
75677f03e7
Remove SceneManager::notifyAttached
2017-02-24 02:58:41 +01:00
scrawl
afa39d121f
Fix 'part has no parent' warning caused by destructing in the wrong order
2017-02-24 02:58:41 +01:00
scrawl
a55604c549
Avoid unnecessary AABB update when actor position has not changed
2017-02-24 02:58:41 +01:00
scrawl
fb073e5c14
Avoid unnecessary AABB update for rotationally invariant collision shapes
2017-02-24 02:58:41 +01:00
scrawl
5198fc897d
Fix collision glitch caused by Bullet AABB not being updated when an actor moves without turning
2017-02-24 02:58:41 +01:00
scrawl
25ca89b560
Avoid redundant allocations in Store::search
2017-02-23 23:28:50 +01:00
scrawl
732212070d
crashcatcher: complain when launching gdb fails
2017-02-23 23:28:49 +01:00
Koncord
cbace41e14
[Client] Fix crash on LInux
2017-02-23 17:40:22 +08:00
David Cernat
ed2176c984
[Client] Reuse 1 BaseEvent over and over instead of creating new ones
2017-02-23 09:19:09 +02:00
David Cernat
1b59ce8c8f
[Client] Send ID_PLAYER_DRAWSTATE when teleported by server
2017-02-23 06:26:42 +02:00
Koncord
f8a25747ba
[Client] Some tabs have been killed in GUIChat
2017-02-23 11:48:10 +08:00
David Cernat
586a7f6656
[Client] Prevent DedicatedPlayer from spawning on ground from 0 fatigue
2017-02-23 04:35:07 +02:00
David Cernat
d4ff136837
[Client] Add comments about spellcasting as a result of merge conflict
2017-02-23 01:05:45 +02:00
David Cernat
38ccc2671c
Merge pull request #164 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
2017-02-23 00:52:53 +02:00
Battlerax
fd845198ad
[Client] You can now cancel the chat box by pressing enter without a message.
2017-02-22 15:03:59 -06:00
scrawl
d163228199
Fix updatePtr
2017-02-22 21:02:34 +01:00
scrawl
00d4fea91c
Derive Animation from osg::Referenced to allow the UnrefQueue to delete it
2017-02-22 15:27:20 +01:00
scrawl
a5247394dc
(Re)set the inventory listener outside of the Animation class
2017-02-22 15:08:22 +01:00
scrawl
8f79fa3d72
Add resource statistics panel opened with F4
2017-02-22 14:28:45 +01:00
Koncord
b0ebad8b83
[Client] Fix crash on Linux
2017-02-22 16:30:07 +08:00
David Cernat
90275f777e
[Client] Don't crash when dying while inside a container
2017-02-22 06:41:25 +02:00
David Cernat
67b67ce1c4
[Client] Don't automatically rescale objects on cell change
2017-02-22 04:21:25 +02:00
scrawl
b40ca9b60a
Set the window rectangle on the Viewer's EventQueue
2017-02-22 01:49:54 +01:00
David Cernat
e4ae8c5f9f
[Client] Cancel drag for teleported players, fix ID_OBJECT_SCALE debug
2017-02-22 02:44:00 +02:00
scrawl
0fbd29ccb8
Use additive alpha blending on the character preview
2017-02-21 18:29:18 +01:00
scrawl
e38221edc9
Set character preview's simulationTime to 0 to avoid flickering lights
2017-02-21 18:25:25 +01:00
scrawl
a45335ffc3
Do not reduce magicka in god mode
2017-02-21 16:33:18 +01:00
scrawl
eefe1ed1a8
Fix being affected by Silence in god mode
2017-02-21 15:48:45 +01:00
David Cernat
a1988ac6ef
Merge pull request #161 from OpenMW/master
...
Add OpenMW commits up to 21 Feb 2017
2017-02-21 07:02:59 +02:00
scrawl
b9740fd2a1
Fix btHeightFieldTerrainShape triangle layout to match rendering
2017-02-21 04:47:11 +01:00
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
2017-02-21 04:32:59 +01:00
David Cernat
37e7d2c15b
[Client] Don't get invalid cells in LocalPlayer::sendJournalEntry()
2017-02-21 02:09:39 +02:00
David Cernat
b320910c5f
[Client] Don't add/remove all spells from ingame scripts for LocalPlayer
2017-02-21 01:22:21 +02:00
David Cernat
bf2f932e18
[Client] If in a container, don't crash when teleported to another cell
2017-02-21 01:01:30 +02:00
David Cernat
f5470e0b49
[Client] Print cell descriptions for WorldEvents only once
2017-02-21 00:20:19 +02:00
David Cernat
92439e6e62
[Client] Reduce WorldPacket debug because it can cause freezes
2017-02-20 23:48:08 +02:00
scrawl
9728a6967e
Reset fall height when teleporting ( Fixes #2629 )
2017-02-20 20:27:05 +01:00
scrawl
05ad0dca34
Use ActionTeleport in COE/COC commands
2017-02-20 20:26:45 +01:00
scrawl
7e02bb7348
Preload summoned creature models before the spell is cast
2017-02-20 19:58:00 +01:00
scrawl
22482b7eec
Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes
2017-02-20 19:04:02 +01:00
Koncord
ea9c31a8f7
[Client] Add password to client params and to config file
2017-02-20 22:40:09 +08:00
David Cernat
a4526605a6
[General] Remove goldValue from ContainerItem because it is never useful
2017-02-20 12:31:11 +02:00
David Cernat
cdffbc05f7
Merge pull request #159 from OpenMW/master
...
Add OpenMW commits up to 19 Feb 2017
2017-02-19 23:47:32 +02:00
David Cernat
ed91f20cd3
[General] Print action used for ID_CONTAINER when receiving one
2017-02-19 23:11:26 +02:00
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
2017-02-19 15:18:35 +00:00
scrawl
481c440698
Print OSG version on startup
2017-02-19 13:26:45 +01:00
David Cernat
4f2b88df8a
[General] Remove owner var from ContainerItem because it is always empty
2017-02-18 23:59:02 +02:00
Rafael Moura
ecbde7b11e
Added ConstContainerStoreIterator
...
using base template for ContainerStoreIterators
less template arguments for ContainerStoreIteratorBase
2017-02-18 13:47:18 +00:00
Allofich
bc60421615
Change NPC equip logic to be more like original
...
(Bug #3754 )
2017-02-18 21:59:09 +09:00
Koncord
74cfc4a821
[Client] Use enum instead magic values
2017-02-18 15:26:11 +08:00
David Cernat
0d75264221
Merge pull request #155 from OpenMW/master
...
Add OpenMW commits up to 17 Feb 2017, part 2
2017-02-17 23:19:30 +02:00
scrawl
f2174ee9f4
Merge pull request #1217 from Allofich/follow
...
Fix loading 0-duration Follow and Escort packages
2017-02-17 21:10:15 +01:00
Allofich
3897c49e30
Fix loading 0-duration Follow and Escort packages
...
(Fixes #3755 )
2017-02-18 01:55:50 +09:00
David Cernat
e0bc557aa4
Merge pull request #154 from OpenMW/master
...
Add OpenMW commits up to 17 Feb 2017
2017-02-17 14:45:45 +02:00
MiroslavR
f883951d75
Fix incorrect calculation of armor rating (Bug #3754 )
2017-02-17 03:11:37 +01:00
Allofich
621d3e56cf
Fix Clang and OS X Travis CI warnings
2017-02-17 02:08:39 +09:00
David Cernat
5b3fabdb9d
[Client] Send ID_CONTAINER with all containers in cell when requested
2017-02-16 13:34:32 +02:00
David Cernat
c32c004516
Merge pull request #151 from OpenMW/master
...
Add OpenMW commits up to 16 Feb 2017
2017-02-16 11:53:02 +02:00
scrawl
f10edb71cc
Add environment variable for disabling IncrementalCompileOperation
2017-02-15 21:01:25 +01:00
scrawl
c4a89065a2
Preload VFX of spells selected by AI actors
2017-02-15 21:01:25 +01:00
scrawl
57b585570a
Preload magic effect visuals of the player's selected weapon/spell
2017-02-15 21:01:25 +01:00
David Cernat
3b604a432e
[General] Restructure ID_CONTAINER to allow multiple containers at once
2017-02-15 20:14:25 +02:00
David Cernat
88f891b5bd
[Client] Make it possible to easily iterate through container items
2017-02-14 23:10:45 +02:00
David Cernat
c8cbfbef62
[General] Sketch out server requests to players for container data
2017-02-14 19:31:56 +02:00
David Cernat
2ed9ae5739
Merge pull request #149 from OpenMW/master
...
Add OpenMW commits up to 14 Feb 2017
2017-02-14 10:27:53 +02:00
scrawl
183c46b0ef
Fix summoning effects
2017-02-14 07:58:16 +01:00
scrawl
a495b9b884
Fix wasteful allocations in Store<Land>::search
2017-02-14 07:58:16 +01:00
scrawl
72c6b11cf8
Move global map render to the worker thread
2017-02-14 07:58:16 +01:00
scrawl
026a05718f
Construct the WorkQueue in Engine
2017-02-14 07:58:16 +01:00
scrawl
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
2017-02-14 07:58:16 +01:00
scrawl
325bf66653
Return const Land in ESMStore
2017-02-14 07:58:16 +01:00
David Cernat
a5d7c5fd39
Merge pull request #148 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2017
2017-02-13 21:29:51 +02:00
Marc Zinnschlag
93c5630e02
Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents'
2017-02-13 10:06:08 +01:00
scrawl
051b4038d9
Merge pull request #1203 from Allofich/magic
...
Make AI not go hostile when absorbing/reflecting
2017-02-12 17:18:10 +01:00
MAtahualpa
c46eadae90
Update actionread.cpp
...
*grrr* Forgot to change the latter "mSkillID" in line 47...
2017-02-12 17:17:33 +01:00
scrawl
cdf65ef681
Merge pull request #1201 from Allofich/hit
...
Prevent AI actors from hitting unintended targets
2017-02-12 16:25:52 +01:00
scrawl
342c25dffa
Fix weather sounds playing at full volume before fading in
2017-02-12 15:44:33 +01:00
Allofich
72c3ee0a3d
Make AI not go hostile when absorbing/reflecting
2017-02-12 23:14:09 +09:00
MAtahualpa
7bc65ce05b
Update actionread.cpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:52:11 +01:00
Allofich
6b53541571
Prevent AI actors from hitting unintended targets
...
(Fixes #3254 )
2017-02-12 19:51:19 +09:00
scrawl
9fa8e88366
Revert "Don't create a CharacterController for objects with no animations"
...
This reverts commit cce42b6e9d
2017-02-12 10:22:11 +01:00
David Cernat
d528a0edb5
Merge pull request #147 from OpenMW/master
...
Add OpenMW commits up to 11 Feb 2017
2017-02-11 21:27:51 +02:00
scrawl
03a10f217a
Catch exceptions in AiSequence::execute
2017-02-11 17:53:11 +01:00
scrawl
5a12407436
Revert "Rearranged check for better performance"
...
This reverts commit 332ceb51a2
2017-02-11 17:53:11 +01:00
scrawl
f2d4f290cc
traceDown fix
2017-02-11 17:53:11 +01:00
Allofich
e047679595
Fix trying to access stats on non-actors
2017-02-11 19:59:42 +09:00
David Cernat
6763718412
Merge pull request #146 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/actors.cpp
2017-02-10 21:39:16 +02:00
scrawl
332ceb51a2
Rearranged check for better performance
2017-02-10 06:48:03 +01:00
scrawl
8752ae9c6a
Fix include
2017-02-10 06:28:23 +01:00
scrawl
bbcba57495
Disable hitAttemptActorId saving code for now
2017-02-10 06:26:32 +01:00
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
2017-02-10 06:20:04 +01:00
scrawl
dd54887783
Fix node mask of CharacterPreview being reset
2017-02-10 03:31:37 +01:00
scrawl
6ecc008813
Fix an issue uncovered by the last commit related to changing actor position without properly moving the actor
2017-02-10 02:43:49 +01:00
scrawl
cf7b0098ed
Slightly increase backoff value
2017-02-10 02:05:12 +01:00
