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
d9229071ef
[Browser] Move password column to the right and shorten its name
2017-02-21 02:56:00 +02:00
David Cernat
58795119b6
[Server] Add debug about information exchange in ID_PLAYER_CELL_CHANGE
2017-02-21 02:41:07 +02: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
David Cernat
96d01fcde4
[Server] Stop resending attacks because they cause infinite death loops
2017-02-20 22:19:39 +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
David Cernat
ca0b1a8813
[Browser] Change column names slightly
2017-02-20 20:58:56 +02: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
81513082ff
[Browser] Some tweaks to password column
2017-02-21 01:13:09 +08:00
Koncord
edfade2a90
[Server] Some fixes in requests to the master server
2017-02-21 01:02:00 +08:00
Koncord
b7ab831c46
[Server] Update MasterClient to new protocol
2017-02-20 23:14:59 +08:00
Koncord
6f2d12d2c6
[Browser] Add ability for connect to passworded servers
2017-02-20 22:40:09 +08:00
Koncord
0e92f43822
[Browser] Add version column
2017-02-20 22:40:09 +08:00
Koncord
ea9c31a8f7
[Client] Add password to client params and to config file
2017-02-20 22:40:09 +08:00
Koncord
158e9b3b09
[Server] Add ability to set password to server from config & scripts
2017-02-20 22:40:09 +08:00
Koncord
78f5a760f4
[Server] Use variable instead method in Player.
2017-02-20 20:46:20 +08:00
Koncord
ec4d016100
[Server] Don't crash server every time a player disconnects. Again.
2017-02-20 20:44:01 +08:00
Koncord
ee494887e1
[Server] Fix log message
2017-02-20 19:45:43 +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
7321774ae2
Merge pull request #160 from TES3MP/tes3mp-LoadedCell
...
[Server] Don't crash server every time a player disconnects
2017-02-20 01:49:49 +02:00
David Cernat
b829f0252a
[Server] Don't crash server every time a player disconnects
2017-02-20 01:47:39 +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
3e031faa96
[Server] Exchange position information correctly between players
2017-02-19 23:30:43 +02:00
David Cernat
ed91f20cd3
[General] Print action used for ID_CONTAINER when receiving one
2017-02-19 23:11:26 +02:00
David Cernat
24251cafd0
[Server] Send large ID_CONTAINER packets on a need-to-know basis
2017-02-19 20:20:44 +02:00
David Cernat
791089d342
[Server] Add Cell::sendToLoaded() for sending events to loaded players
2017-02-19 19:42:16 +02:00
David Cernat
eb0744aa77
[Server] Add CellController:getCell() for getting Cell through ESM::Cell
2017-02-19 19:39:53 +02:00
David Cernat
ee1ba1728e
[Server] Rename getCellByID() into getCellByName() to avoid confusion
2017-02-19 18:37:20 +02:00
David Cernat
275dfaf05f
[Server] Add Cell::getDescription() for debugging purposes
2017-02-19 17:27:38 +02:00
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
2017-02-19 15:18:35 +00:00
David Cernat
887b436ee7
[Server] Make style for new methods consistent with rest of project
2017-02-19 16:53:15 +02:00
Koncord
fd36ec7613
[Server] Iterate cells where player was loaded instead all
2017-02-19 22:43:57 +08:00
Koncord
67099e437a
[Server] Remove player from Cells when disconnected
2017-02-19 22:27:00 +08:00
Koncord
f2ce46ffed
[Server] Rename doForNearest to forEachLoaded
2017-02-19 21:32:25 +08:00
Koncord
3aae782a51
[Server] Send info about loader to others
2017-02-19 20:41:50 +08:00
Koncord
465d0fe4b4
[Server] Fix log messages in CellController
2017-02-19 20:38:17 +08:00
Koncord
ca68831395
[Server] Rename sendToNearest to sendToLoaded
2017-02-19 20:37:26 +08:00
scrawl
481c440698
Print OSG version on startup
2017-02-19 13:26:45 +01:00
Koncord
931ecd5acb
[Server] Imrpove debug info in CellController
2017-02-19 19:29:14 +08:00
Koncord
cce49e355a
[Server] Some fixes to sendToNearest & doForNearest
2017-02-19 18:44:52 +08:00
scrawl
e4741db069
Merge pull request #1213 from Allofich/equip
...
Change AI equip logic
2017-02-19 10:47:19 +01:00
Koncord
033472d939
[Server] Add doForNearest function
2017-02-19 17:42:39 +08:00
Koncord
b760015071
[Server] Send some packets only to nearest players
2017-02-19 16:46:42 +08:00
Koncord
846ceacc90
[Server] Add begin & end iterators to Cell class
2017-02-19 16:21:40 +08:00
Koncord
bbc062de62
[Server] Use lowCamelCase in Cell
2017-02-19 16:07:44 +08:00
Koncord
08f78e21c1
[Server] Use CellController in Networking
2017-02-19 13:27:39 +08:00
Koncord
8887a267c7
[Server] Add Cell and CellController
2017-02-19 13:27:10 +08:00
David Cernat
b1009ad33d
[Server] Add GetContainerItemActionCount() for getting drag count
2017-02-19 00:11:09 +02:00
David Cernat
4f2b88df8a
[General] Remove owner var from ContainerItem because it is always empty
2017-02-18 23:59:02 +02:00
MAtahualpa
fb8a2093cd
Replace "Female" check box with a combo box, part 2/2 ( fixes #3757 )
...
Replaces the "Female" check box in BodyPart records with a "Gender" combo box. This is the second of two related fixes, the first one covering NPC records.
Related issue:
- Fixes #3757 : Editor: Replace "Female" check box in BodyPart records with "Gender" combo box (https://bugs.openmw.org/issues/3757 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several BodyPart records.
2017-02-18 15:40:07 +01: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
David Cernat
fd4827b3a7
Merge pull request #157 from OpenMW/master
...
Add OpenMW commits up to 18 Feb 2017, part 2
2017-02-18 12:12:30 +02:00
Marc Zinnschlag
bef0b1f1d6
Merge remote-tracking branch 'matahualpa/openmw-cs_gender'
2017-02-18 09:57:09 +01:00
Koncord
74cfc4a821
[Client] Use enum instead magic values
2017-02-18 15:26:11 +08:00
Koncord
a95cf0e07a
[Server] Fix crash when call StopServer() function in OnServerInit()
2017-02-18 13:00:01 +08:00
Koncord
1fb2176cfa
[Server] Add forgotten type for callbacks
2017-02-18 12:58:12 +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
David Cernat
c01ab63239
[Server] Add script functions for setting container item info
2017-02-17 23:11:38 +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
scrawl
cb142f01e4
Merge pull request #1215 from MiroslavR/armor_rating
...
Fix incorrect calculation of armor rating
2017-02-17 18:52:07 +01:00
Allofich
3897c49e30
Fix loading 0-duration Follow and Escort packages
...
(Fixes #3755 )
2017-02-18 01:55:50 +09:00
MAtahualpa
520e82ed4f
Fix for commit "affc0eb..." in PR 1216 ( fixes #3756 )
...
Fixed use of tab character.
2017-02-17 17:54:38 +01:00
David Cernat
aa1549606f
[Server] Add script functions for getting container item info
2017-02-17 18:33:20 +02:00
MAtahualpa
affc0eb37f
Replace "Female" check box with a combo box, part 1/2 ( fixes #3756 )
...
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.
Related issue:
- Fixes #3756 : Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
2017-02-17 17:05:46 +01:00
David Cernat
70470e12b4
[Server] Reorder World script functions
2017-02-17 16:24:40 +02:00
David Cernat
8a5bc77699
[Server] Add GetBaseEventAction script function
2017-02-17 14:51:36 +02: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
Marc Zinnschlag
79956e4b49
Merge remote-tracking branch 'origin/master'
2017-02-17 08:54:19 +01: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
27c4015f50
[General] Remove unused packet placeholder ID_OBJECT_HEALTH
2017-02-16 18:46:39 +02:00
David Cernat
1198caddf6
[Server] Add OnContainer script callback
2017-02-16 18:34:11 +02:00
David Cernat
eba7d8408f
[Server] Use script function to get spellbook action
2017-02-16 14:23:27 +02:00
MAtahualpa
dab8b328c4
Replace light emitter check boxes with a combo box ( fixes #3752 )
...
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.
Related issue:
- Fixes #3752 : Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
2017-02-16 12:48:47 +01: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
MAtahualpa
7be46eb1f0
Fix for commit "d4972ab..." in PR 1208 ( fixes #3751 )
...
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.
Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
2017-02-16 00:08:38 +01:00
MAtahualpa
d4972ab166
Replace "Xyz blood" check boxes with a combo box ( fixes #3751 )
...
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.
Related issue:
- Fixes #3751 : OpenMW-CS: Replace "Xyz Blood" check boxes in NPC and Creature records with "Blood Type" combo box (https://bugs.openmw.org/issues/3751 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC and Creature records. Please note that this fix also prevents users from erroneously assigning two blood types at the same time. (I don't know which one would prevail in that case.)
2017-02-15 23:06:36 +01: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
Marc Zinnschlag
e46fb1770c
Merge remote-tracking branch 'matahualpa/openmw-cs_booktype'
2017-02-15 19:47:39 +01:00
David Cernat
3b604a432e
[General] Restructure ID_CONTAINER to allow multiple containers at once
2017-02-15 20:14:25 +02:00
MAtahualpa
2c34a8706b
Replace "Scroll" check box with a combo box ( fixes #3748 )
...
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.
Related issue:
- Fixes #3748 : OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-15 18:59:55 +01: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
MAtahualpa
607bd8b853
Replace "Scroll" check box with a combo box ( fixes #3748 )
...
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.
Related issue:
- Fixes #3748 : OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
2017-02-14 11:48:37 +01: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
MAtahualpa
2d1af3ee4a
Update record.cpp
...
This should be the last instance of "mSkillID". Let's see what Travis says about it...
2017-02-12 20:55:50 +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
MAtahualpa
347fb1ff4b
Update converter.hpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:51:36 +01:00
MAtahualpa
c5dcfe0794
Update refidadapterimp.cpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
2017-02-12 13:50:58 +01:00
MAtahualpa
6587880171
Update refidcollection.cpp
...
Makes Book records display skill IDs instead of attribute IDs for teached skills.
Related issue:
- Bug #3746 : OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry.
2017-02-12 13:03:37 +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
scrawl
b3d5c2bd7f
Use the actor's collision shape in findGround()
...
The cylinder base is no longer appropriate as of the change to capsules.
This also works around a bug when tracing a small cylinder/box shape apparently introduced with bullet 2.86.
2017-02-10 02:00:52 +01:00
David Cernat
f02840d638
[Client] Fix log messages when sending ID_CONTAINER
2017-02-09 21:48:22 +02:00
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2017-02-09 12:17:27 +02:00
scrawl
67e4a7e37b
Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead
2017-02-09 04:51:20 +01:00
scrawl
3f3d00ffc9
Add CellPreloader::clear to avoid potential dangling CellStore pointer and to more aggressively clear preload state from a previous game
2017-02-09 04:03:38 +01:00
scrawl
0be86f69bc
Write the player object first to increase the chance of preloading the player cells in time
2017-02-09 03:55:10 +01:00
scrawl
1d8a9ff622
Preload player cell as soon as the player is read from the savegame
...
Giving the worker thread something to do while the rest of the savegame is parsed.
2017-02-09 03:47:36 +01:00
scrawl
d141b98f0c
Add base animations to preloadCommonAssets
2017-02-09 03:32:40 +01:00
scrawl
066aa2e60e
Always run preloadCommonAssets even when the menu is skipped
...
Move to before the content files are loaded so we can do preloading in parallel with content file loading
2017-02-09 03:16:36 +01:00
scrawl
c68f662c9a
Predict player movement when preloading cells to better handle moving at high speed
2017-02-09 01:34:42 +01:00
scrawl
a46593fa74
Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread
2017-02-09 01:08:07 +01:00
scrawl
d62c4259bd
CellPreloader: load the terrain first to match the order in the main thread
2017-02-09 01:07:27 +01:00
scrawl
d1e86d22ca
Check which local map textures actually need to be updated
...
On a typical exterior cell transition, we'll save 3 of 9 map renders. When moving back and forth between 2 cells, we can even reuse 6 of 9.
2017-02-08 22:20:57 +01:00
scrawl
43d9f3d5c7
Update bullet debug drawer even when the game is paused so the collision mesh will show instantly even when the console is up
2017-02-08 18:53:24 +01:00
scrawl
249fe9077b
Handle 'tcb' command as an alias for 'tcg'
2017-02-08 18:51:07 +01:00
scrawl
206e2bf975
Fix camera rotation not being set after save game load (regressed with 1eb3384043)
2017-02-08 04:42:15 +01:00
David Cernat
b651c4deb4
[Server] In Item script functions, rename itemId into refId for clarity
2017-02-07 13:50:28 +02:00
scrawl
35bb467c7a
Fix inverted setting of variable
2017-02-07 05:28:06 +01:00
David Cernat
5038353792
[General] Rename BaseEvent's state into doorState & adjust related funcs
2017-02-06 23:09:50 +02:00
David Cernat
e52823394c
[Client] Use correct count for ID_CONTAINER when dropping items
2017-02-06 22:53:18 +02:00
