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
Koncord
0442ebd607
[Server] Remove redundant newlines & keep ~120 columns
2017-02-27 17:13:07 +08:00
Koncord
83d0cbedb2
[Server] Remove redundant type casts
2017-02-27 16:29:28 +08:00
Koncord
8f96ca22c1
[Server] Fix typo in RakNet name
2017-02-27 16:25:29 +08:00
Koncord
aa91126ce3
[Server] Minor cleanup in Networking
2017-02-27 16:23:14 +08: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
David Cernat
684517e02f
[Server] Fix Miscellaneous category of script functions
2017-02-26 23:07:52 +02:00
David Cernat
0baada0aa2
[Server] Add GetLastPlayerId() script function in Miscellaneous category
2017-02-26 23:00:51 +02:00
David Cernat
deb10919ab
[Server] Delete cells that become empty when a player disconnects
2017-02-26 19:45:04 +02:00
scrawl
6f4c03aa32
Avoid retrieving setting every frame
2017-02-26 17:34:24 +01:00
David Cernat
048ddf6a34
[Server] Use LOG_APPEND for older debug messages in Cell
2017-02-26 18:06:26 +02: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
David Cernat
fb93ce57f9
[Server] Fix debug message
2017-02-26 14:12:18 +02:00
David Cernat
ae37daca70
[Server] Ensure no information exchange takes place with nullptr player
2017-02-26 14:11:45 +02:00
David Cernat
7f51ca5298
[Server] Add permanent debug to Cell and CellController
2017-02-26 14:06:34 +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
0527690b88
[Server] Add permanent debug to ID_PLAYER_CELL_CHANGE and ID_CONTAINER
2017-02-25 21:50:41 +02:00
David Cernat
7917badedf
[Server] Set guid of baseEvent, previously done in a constructor before 7065569f9b
2017-02-25 17:37:44 +02:00
David Cernat
2fd279a5ef
[Server] Remove debug message
2017-02-25 13:26:57 +02:00
Koncord
1956045e99
[Browser] Fix continuous loop when connection was failed
2017-02-25 19:22:10 +08:00
David Cernat
4a5b8c927f
[Server] Add an extra check to Cell::sendToLoaded to be on the safe side
2017-02-25 12:44:20 +02:00
Koncord
45d081ba42
[Server] Compare new cells with loaded cells correctly
2017-02-25 16:47:11 +08:00
Battlerax
c9dc75f589
[Browser] Fixed two crashes relating to invalid data
2017-02-25 07:59:48 +03:00
Battlerax
76e866c5c9
[Browser] Crash Fix
2017-02-25 07:59:48 +03: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
Battlerax
186e3c2337
[Browser] Crash fix ( #168 )
...
* [Browser] Crash Fix
* Update NetController.cpp
2017-02-24 09:52:52 +02:00
Koncord
3adbf17545
[Server] Fix memory leak in CellController
2017-02-24 13:58:40 +08:00
Koncord
ebaf3d3cc9
[Server] FIx memory leak
2017-02-24 13:32:20 +08: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
Koncord
b33e604a61
[Server] Set sendToLoaded function as constant
...
Add assertions for CellController singleton
2017-02-24 12:33:59 +08: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
David Cernat
0d6636018f
Merge pull request #166 from OpenMW/master
...
Add OpenMW commits up to 23 Feb 2017
2017-02-23 14:37:14 +02:00
Koncord
cbace41e14
[Client] Fix crash on LInux
2017-02-23 17:40:22 +08:00
Marc Zinnschlag
765401531d
Merge remote-tracking branch 'origin/master'
2017-02-23 09:03:31 +01:00
David Cernat
ed2176c984
[Client] Reuse 1 BaseEvent over and over instead of creating new ones
2017-02-23 09:19:09 +02:00
Koncord
b158e89f77
[Server] Change signatures of GetLastEventAction & SetScriptEventAction
2017-02-23 15:17:00 +08:00
Koncord
cbe31149e3
[Server] Remove redundant constructor
2017-02-23 14:36:35 +08:00
David Cernat
af35ee38d1
[Server] Rename ClearScriptEvent into InitScriptEvent with pid argument
2017-02-23 08:23:46 +02:00
Koncord
868c837aa0
[Server] Move baseEvent from Networking.cpp to class as member
2017-02-23 13:53:10 +08:00
David Cernat
7065569f9b
[Server] Reuse 2 BaseEvents over and over instead of creating new ones
2017-02-23 07:47:00 +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
68c288761a
[Server] Send other players position to loader
2017-02-22 16:56:09 +08:00
Koncord
b0ebad8b83
[Client] Fix crash on Linux
2017-02-22 16:30:07 +08:00
Koncord
b1460cf010
[Server] Send ID_PLAYER_POS every ID_PLAYER_CELL_CHANGE
2017-02-22 14:05:40 +08:00
David Cernat
90275f777e
[Client] Don't crash when dying while inside a container
2017-02-22 06:41:25 +02:00
Koncord
443c0ed309
[Server] Fix Cell iterators
2017-02-22 12:03:03 +08: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
FedeWar
e9076088ca
Another tab fix
2017-02-21 11:51:11 +01:00
FedeWar
4e7f7cf84f
Fixed tabs
2017-02-21 11:49:04 +01:00
Koncord
3d88e657cd
[Server] Fix printVersion() for ARM
2017-02-21 18:25:41 +08:00
FedeWar
370c12e78a
Verification results are ordered by Type in alphabetical order.
2017-02-21 11:15:53 +01:00
Koncord
a75da18f31
[Server] Fix argument in log message
2017-02-21 18:14:02 +08:00
Koncord
7dde4db1fb
[Server] Add FORCE_LUA parameter to CMakeLists.txt
2017-02-21 18:04:06 +08: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
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
David Cernat
d8a9a5f6c9
[General] Send item owner in ID_CONTAINER
2017-02-06 22:45:23 +02:00
David Cernat
ad3eac624f
[Client] Disable quicksaving and quickloading
2017-02-06 21:34:54 +02:00
David Cernat
3614b21e10
[General] Send charge and goldValue in ID_CONTAINER
2017-02-06 21:28:03 +02:00
Allofich
5d2090684a
Store mHitAttemptActorId in save files
2017-02-07 01:26:26 +09:00
Allofich
25c64dbb0f
Make combat engagement logic more like vanilla
...
(Fixes #2678 , Fixes #3705 )
2017-02-07 01:25:12 +09:00
David Cernat
e703dd42aa
[Client] Rename LocalEvent into WorldEvent
2017-02-06 17:40:32 +02:00
scrawl
5a939418fc
Add missing avcodec_close ( Fixes #3741 )
2017-02-06 15:49:13 +01:00
David Cernat
182b238b5f
[General] Rename WorldEvent into BaseEvent
2017-02-06 12:53:41 +02:00
David Cernat
27242cdab9
Merge pull request #142 from OpenMW/master
...
Add OpenMW commits up to 6 Feb 2017
2017-02-06 09:13:19 +02:00
scrawl
91939c4687
Switch actors to capsule shapes now that the jumping bug is gone ( Fixes #2116 , Fixes #2909 )
...
The culprit was - surprise, surprise - d39d4f2619
2017-02-06 05:40:49 +01:00
scrawl
03aa270551
Construct PhysicActor as on ground by default to avoid a jumping animation from playing in the first frame after a savegame load
2017-02-06 05:23:00 +01:00
scrawl
bc29a99a53
Fix broken timer
2017-02-06 05:10:40 +01:00
scrawl
d39d4f2619
Revert a problematic and performance costly workaround that should never have been applied and is no longer required as of the last commit.
2017-02-06 04:52:41 +01:00
scrawl
541fbb4792
Movement solver: add usage of 'on slope' flag to improve handling of steep slopes
...
Previously we were handling 'on slope' synonymously with 'in air' which caused some odd effects.
Practical changes:
- Sliding down a slope no longer applies fall damage.
- Fixed a climbing exploit that would allow climbing steep slopes with repeated use of the Jump function.
2017-02-06 04:50:58 +01:00
scrawl
cce42b6e9d
Don't create a CharacterController for objects with no animations
2017-02-06 03:43:08 +01:00
scrawl
fe0cf5be05
StatsWindow: don't rebuild all skill widgets when one skill changes
2017-02-06 02:40:35 +01:00
scrawl
e7b6ea4e3f
Add cycle weapon/spell actions to the list of controller actions ( Fixes #3613 )
2017-02-05 20:23:49 +01:00
David Cernat
1f03c12d96
[Client] See when other players use the Take All button with a container
2017-02-05 20:04:50 +02:00
David Cernat
d2c5a3387a
[Client] See when other players add items to containers
2017-02-05 19:33:11 +02:00
David Cernat
75392297b5
[General] Use vector::at in most places
2017-02-05 19:01:06 +02:00
David Cernat
60d6a6d463
[Client] See when other players remove items from containers
2017-02-05 18:45:23 +02:00
David Cernat
25d79dbcfe
[Client] Revert c0d67f67fb
after discovering its negative consequences
2017-02-05 17:40:10 +02:00
David Cernat
cdd796aba1
[Client] Send ID_PLAYER_INVENTORY from two more locations
2017-02-05 16:14:26 +02:00
David Cernat
c0d67f67fb
[Client] Move code for sending a packet for picking up world items
...
Previously, an ID_OBJECT_DELETE was sent from inventorywindow.cpp, but this is now sent from hud.cpp because 2 other packets are also sent from there.
2017-02-05 15:50:21 +02:00
David Cernat
b2cdec8efa
[Client] Send ID_PLAYER_INVENTORY upon dropping an item, 2nd attempt
2017-02-05 15:35:40 +02:00
David Cernat
f314b13edf
[General] Rename item health into charge, for consistency with OpenMW
2017-02-05 14:56:27 +02:00
David Cernat
f03724be7b
[Client] Send ID_PLAYER_INVENTORY upon dropping an item
2017-02-05 14:38:04 +02:00
David Cernat
ecc456fea9
[General] Include charge int in WorldObject & send it w/ ID_OBJECT_PLACE
2017-02-05 13:45:12 +02:00
David Cernat
04d45b9dbb
[General] Rename packets to show they are for players only, not NPCs
2017-02-05 09:01:33 +02:00
David Cernat
3a29b2d41d
Merge pull request #141 from OpenMW/master
...
Add OpenMW commits up to 5 Feb 2017
2017-02-05 07:11:45 +02:00
scrawl
3065600a86
Skip expensive visitEffectSources call if no summoned creatures or summon effects are active
2017-02-05 02:26:28 +01:00
scrawl
ee4073541c
Animation: cache getVelocity()
2017-02-05 02:26:28 +01:00
scrawl
a2cede8f34
Add timer for updateEquippedLight
2017-02-05 02:26:28 +01:00
scrawl
1eb3384043
Avoid rotating by zero in CharacterController
2017-02-05 02:26:28 +01:00
scrawl
7201cf5fe2
ItemWidget: skip setImageTexture if the icon has not changed
2017-02-05 02:26:27 +01:00
David Cernat
9c76b805b2
[Client] Send ID_CONTAINER when starting to drag a container item
2017-02-04 21:33:50 +02:00
David Cernat
a07e616878
[General] Add ContainerItem and ContainerChanges structs to WorldEvent
2017-02-04 20:14:39 +02:00
scrawl
1447bfa215
Improve scene loading performance by creating collision objects with the correct rotation right away instead of adjusting it later
2017-02-04 15:12:01 +01:00
David Cernat
6328ffb9aa
[General] In ID_GAME_ATTRIBUTE & ID_GAME_SKILL, rename GAME into PLAYER
2017-02-04 14:25:43 +02:00
David Cernat
9130c1f302
[General] Rename ID_CONTAINER_ADD into ID_CONTAINER
2017-02-04 13:14:37 +02:00
David Cernat
d2cf96af99
[General] Repurpose the unused ID_CONTAINER_REMOVE into ID_OBJECT_HEALTH
2017-02-04 13:05:15 +02:00
David Cernat
57f54aa370
[Client] Don't store multiple cellStates for the same cell
2017-02-04 09:46:27 +02:00
David Cernat
a2e3fe18fe
[Client] Send ID_PLAYER_CELL_STATE to server at end of CharGen
...
Also, allow requests for ID_PLAYER_CELL_STATE from the server.
2017-02-04 09:13:15 +02:00
David Cernat
44e27148d5
Merge pull request #140 from OpenMW/master
...
Add OpenMW commits up to 4 Feb 2017
2017-02-04 07:37:17 +02:00
scrawl
884d306bf3
Throw exception when told to use 0 threads
2017-02-04 05:58:12 +01:00
scrawl
2db7292bcb
Add new setting for the number of preloading worker threads
...
If you have CPU cores to spare, consider setting 2 or 3. Up to about 3 threads, preloading performance seems to increase in a linear fashion, but with 4 or more threads I/O bottlenecks and synchronization overhead starts to show.
2017-02-04 02:59:28 +01:00
scrawl
eaeba4138b
Move the deletion of PreloadItem to the worker thread
2017-02-04 02:36:44 +01:00
scrawl
33e654f94d
Add explicit handling of most commonly used nodes to NodeVisitors to avoid excessive virtual function calls
2017-02-04 02:16:26 +01:00
scrawl
83a9435167
Fix unnecessary use of CopyFramebufferToTextureCallback when loading is too fast for a loading screen to be displayed
2017-02-03 23:39:39 +01:00
scrawl
767eba941f
Speed up finding of attachment node by using the cached nodeMap
2017-02-03 23:15:37 +01:00
scrawl
a76d693627
Speed up ControllerVisitor by skipping sub graphs that have no ChildrenRequiringUpdateTraversal()
2017-02-03 23:10:14 +01:00
scrawl
c58fc6d276
Improve performance of loading screen by not recomputing the bounding sphere of the entire scene after each loading step
2017-02-03 22:29:38 +01:00
David Cernat
f4a9f27977
[Server] Stop crashing browser when receiving a query from it
2017-02-03 21:46:39 +02:00
David Cernat
c1427b2558
[General] Simultaneously send loads & unloads in ID_PLAYER_CELL_STATE
2017-02-03 20:27:40 +02:00
David Cernat
63974af131
Merge pull request #139 from OpenMW/master
...
Add OpenMW commits up to 3 Feb 2017
2017-02-03 07:57:14 +02:00
scrawl
0be811c519
Update the resource cache every second instead of every frame
...
A dry run takes about ~1.5ms. Even though it's all done in the worker thread, the locks used can stall loading operations that are about to happen in other threads, and just in general this CPU load is unnecessary.
2017-02-03 03:44:30 +01:00
scrawl
6d8c414071
Set osgViewer ReleaseContextAtEndOfFrameHint to false for better performance when in SingleThreaded mode
...
The flag is normally set to off by default when using Viewer::run() - however since we're using our own frame loop, we have to unset the flag ourselves
2017-02-02 22:16:59 +01:00
scrawl
c5f8ff6e0e
Add names to several nodes for debugging purposes
2017-02-02 21:49:52 +01:00
Koncord
aed0651dc2
[Server] Some fixes for MasterClient
2017-02-03 00:55:59 +08:00
David Cernat
d9f5dfe65c
Merge pull request #138 from OpenMW/master
...
Add OpenMW commits up to 2 Feb 2017
2017-02-02 13:07:11 +02:00
scrawl
625c5040ce
Fix build
2017-02-01 15:49:20 +01:00
David Cernat
7ebad596d6
[Server] Use double instead of int for scale in WorldFunctions
2017-02-01 12:53:51 +02:00
David Cernat
018b0e6699
[Server] Add script functions & callbacks for locking, unlocking & doors
2017-02-01 12:43:19 +02:00
Koncord
1808cf815f
[Browser] Some minor fixes
2017-02-01 18:00:03 +08:00
David Cernat
958ff06ca8
[General] Rename ID_DOOR_ACTIVATE into ID_DOOR_STATE
2017-02-01 11:54:40 +02:00
David Cernat
8e438a1b82
[Server] Add OnObjectScale callback, part 2
2017-02-01 10:00:54 +02:00
Koncord
f78c749981
[Client] Use "NULL" instead "nullptr"
...
nullptr keyword introduced in C++11
2017-02-01 15:58:29 +08:00
David Cernat
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
2017-02-01 09:28:23 +02:00
David Cernat
5bd2fdcf66
[Server] Add OnObjectScale callback, and set scale for WorldObject
2017-02-01 09:25:47 +02:00
Koncord
0b8d0224d1
[Server] Change type in second argument in SetConsoleAllow to "bool"
2017-02-01 13:44:50 +08:00
Koncord
75afa58981
[Server] Add bool type for scripts
2017-02-01 13:43:17 +08:00
scrawl
1808b8567e
Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera]
2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee
Add 'small feature culling pixel size' setting
2017-02-01 06:00:14 +01:00
scrawl
960d4a96c3
Reduce the number of osg::Material state by setting the default state on the graph root
2017-02-01 06:00:14 +01:00
scrawl
34deb6e7b1
Add 'showSceneGraph' command to export the scene or a particular object to .osgt for debugging purposes
2017-02-01 06:00:14 +01:00
David Cernat
8c019f2c61
[Server] Update OnObjectPlace and OnObjectDelete callbacks
2017-01-31 23:26:49 +02:00
David Cernat
87dce73b90
[Server] Add script function for sending world object scale
2017-01-31 23:07:02 +02:00
David Cernat
705589e3e3
[Server] Add script functions for getting/setting world object scale
2017-01-31 22:54:36 +02:00
David Cernat
703f253712
[Client] Delete new LocalEvents after sending them
2017-01-31 09:48:37 +02:00
Koncord
239c1aaebf
[Browser] Kill RakNet thread before return
2017-01-31 00:25:34 +08:00
David Cernat
1fc9dd4f93
[Server] Remove WorldFunctions index parameters that are no longer used
2017-01-30 17:42:29 +02:00
David Cernat
9f998c9901
[Server] Improve getter methods in WorldFunctions
2017-01-30 17:09:14 +02:00
Koncord
42b6a456f0
[Client] Fix code style
2017-01-30 22:53:22 +08:00
Koncord
c5035cd174
[Client] Fix crash and memory leak when erasing spellbook
2017-01-30 22:37:09 +08:00
David Cernat
88e648aaa9
[Server] Fix crash caused by setting too many WorldObject refIds, try 2
2017-01-30 12:26:45 +02:00
David Cernat
fe9e30a4d8
[Server] Fix crash caused by setting too many WorldObject refIds
2017-01-30 09:10:33 +02:00
David Cernat
da2f66d6ba
Merge pull request #135 from OpenMW/master
...
Add OpenMW commits up to 29 Jan
2017-01-30 07:32:44 +02:00
David Cernat
8e1dff8e02
[Browser] Change "Not fully" into "Not full"
2017-01-30 07:30:58 +02:00
David Cernat
bcee35ca1d
Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp
2017-01-30 06:48:40 +02:00
David Cernat
d503a65849
[Client] Replace tab characters with spaces
2017-01-30 06:47:22 +02:00
Koncord
c147d13a73
[Browser] Move hardcoded title to UI
2017-01-30 07:22:32 +08:00
Koncord
cb0f5524be
[Browser] Implement filters
2017-01-30 07:17:21 +08:00
Koncord
f86d17d8a6
[Browser] Add custom proxy model
2017-01-30 07:14:11 +08:00
Koncord
dba98f9261
[Browser] Not trying to download extended data if server is unreachable
2017-01-30 04:17:18 +08:00
Koncord
6b42f870a7
[Browser] Use constant instead magic value
2017-01-30 04:15:42 +08:00
Koncord
3070ecdea7
[Browser] Allow connecting by double click
2017-01-30 04:14:09 +08:00
David Cernat
5eff2ece21
[Server] Fix memory leaks related to WorldEvents as suggested by Koncord
2017-01-29 20:18:19 +02:00
David Cernat
6b9fba7885
[Server] Add script functions for getting/setting world object rotation
2017-01-29 17:38:29 +02:00
David Cernat
920c1113a3
[Server] Add script functions for setting world object placement info
2017-01-29 16:16:01 +02:00
David Cernat
2c5cc82f49
[Server] Add script functions for getting world object placement info
2017-01-29 15:29:40 +02:00
MiroslavR
d97e9cfe7e
Fix InterpreterContext::updatePtr updating mLocals to the implicit ref's locals when interpreting a targeted global script ( Fixes #3738 )
...
The interpreter context of a targeted global script would point to the target's locals instead of the global script instance's locals when the target changed cell during script execution. Credit to scrawl for the solution.
2017-01-29 13:29:53 +01:00
David Cernat
27ac314cb1
[Server] Add script functions for getting world object refIds & refNums
2017-01-29 13:21:41 +02:00
David Cernat
b549da996e
[Server] On second thought, keep cell description as argument to them
2017-01-29 13:16:17 +02:00
David Cernat
5989bbd97e
[Server] Remove arguments from OnObjectPlace & OnObjectDelete callbacks
2017-01-29 12:56:11 +02:00
David Cernat
2cecce6c72
[Server] Use static WorldEvent variable in Networking
2017-01-29 10:24:12 +02:00
David Cernat
dddc253d70
[Client] Fix console message for LocalPlayer's cell change
2017-01-28 16:39:03 +02:00
David Cernat
f11df211fa
[Server] Add script functions for dealing w/ WorldEvents & WorldObjects
2017-01-28 16:22:30 +02:00
David Cernat
9f1e491a75
[General] Make WorldEvents store information about multiple objects
2017-01-28 12:34:45 +02:00
David Cernat
624b85347a
[Client] Create LocalEvent class and use it instead of WorldEvent
2017-01-27 20:57:47 +02:00
David Cernat
ee86c9161d
[Client] Set InterpreterContext's sendPackets to false in constructor
2017-01-27 16:01:53 +02:00
Koncord
b658adf7b0
[Server] Killed another tab character
2017-01-27 21:51:13 +08:00
David Cernat
9c3a37a790
[Server] Make GetCellStateDescription's cstrDescription null-terminated
2017-01-27 14:16:27 +02:00
Koncord
1c810ecad5
[Server] Fix memory leak in GetCellStateDescription()
2017-01-27 19:05:18 +08:00
David Cernat
7efb374f75
[Client] Avoid fetching guiMessageBox.type again for every condition
2017-01-27 10:41:10 +02:00
David Cernat
0ccfe66212
[Server] Send stable C string in GetCellStateDescription()
2017-01-27 08:14:27 +02:00
David Cernat
4f288ab558
[Server] Read contents of ID_PLAYER_CELL_STATE
2017-01-26 17:53:36 +02:00
David Cernat
6331c55bc7
[Server] Add colons missing from CELLAPI
2017-01-26 16:42:55 +02:00
David Cernat
2f644e9b14
[Server] Add script functions for getting info about cell state changes
2017-01-26 16:37:47 +02:00
David Cernat
70823d011d
[Server] Define CELLAPI
2017-01-26 16:16:28 +02:00
David Cernat
0cc20d26ce
[Server] Move script functions for cells to a new CellFunctions class
2017-01-26 16:10:45 +02:00
David Cernat
5a22032a41
Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp
2017-01-26 15:50:12 +02:00
David Cernat
62f359e250
[Server] Rename Translocations into Positions
2017-01-26 15:48:47 +02:00
Koncord
ab3c2544b5
[Client] Use constant instead magic value
2017-01-26 21:47:28 +08:00
Koncord
34a46e6811
[Client] Simplify hasFinishedCharGen method
2017-01-26 21:42:12 +08:00
David Cernat
96bd21a7ca
[Server] Rename OnPlayerCellLoad to OnPlayerCellState, add action param
2017-01-26 14:18:47 +02:00
David Cernat
244da19a51
[General] Turn ID_PLAYER_CELL_LOAD into ID_PLAYER_CELL_STATE for clarity
2017-01-26 13:49:20 +02:00
David Cernat
055376c8ee
[Client] Only send ID_PLAYER_CELL_LOAD when CharGen is over
2017-01-26 13:14:22 +02:00
David Cernat
b5b5551fcd
[Client] Add LocalPlayer::hasFinishedCharGen() method
2017-01-26 13:13:43 +02:00
David Cernat
97aabf4a7d
[General] Sketch out sending of cell loading/unloading info in packets
2017-01-26 09:02:01 +02:00
David Cernat
158d606477
[General] Leave one blank line at the end of every tes3mp code file
2017-01-26 06:17:29 +02:00
David Cernat
2158e94a96
[Client] Fix setting of attack parameters after recent changes
2017-01-25 18:04:20 +02:00
David Cernat
73d39c1a0a
[General] Stop using virtual functions in BasePlayer, part 2
2017-01-25 17:19:53 +02:00
David Cernat
63c8a98083
[General] Stop using virtual functions in BasePlayer
2017-01-25 17:06:15 +02:00
David Cernat
c62a575a9e
[Server] Change order of words in the names of script callbacks
2017-01-25 14:59:23 +02:00
David Cernat
1d9c6ddd81
[General] Add placeholders for the new packet ID_PLAYER_CELL_LOAD
2017-01-25 14:51:43 +02:00
David Cernat
25e535e8ad
[Server] Fix integer types for new script callbacks
2017-01-25 07:51:44 +02:00
David Cernat
f9feaf05f0
[Server] Add script callbacks for object placement and deletion
2017-01-25 05:30:25 +02:00
David Cernat
35e453dec3
[General] Sketch out most of functionality for journal saving/loading
2017-01-24 19:32:25 +02:00
Koncord
c3c3c57a98
[Browser] Fix errors for Windows build
2017-01-22 18:18:32 +08:00
Koncord
843a18f347
[Browser] Fix errors and warnings in MSVC
2017-01-22 18:02:38 +08:00
Koncord
db75c4874c
[Browser] Fix declaration of 'data' hides class member
2017-01-22 18:02:38 +08:00
David Cernat
0cd7c3ea3d
Merge pull request #131 from OpenMW/master
...
Add OpenMW commits up to 21 Jan
2017-01-22 11:20:20 +02:00
Koncord
dc3f87a81a
[Browser] Change iterator types in "for" loops to C++11 style
2017-01-22 17:18:19 +08:00
Koncord
33339fa786
[Browser] Rename addServer to addServerAndUpdate
2017-01-22 17:11:44 +08:00
Koncord
1bd4db5e8b
[Browser] Implement update info by index
2017-01-22 17:11:13 +08:00
Koncord
a86739f080
Add addServer by address method
2017-01-22 16:02:21 +08:00
Koncord
ecf82a5df7
Save/Load favorites in browser
2017-01-22 15:59:00 +08:00
Koncord
777a570d93
Init modName
2017-01-22 15:09:52 +08:00
Koncord
4c2294d105
Override closeEvent in MainWindow
2017-01-22 15:09:17 +08:00
Koncord
86d8b0630f
Do not allow override ServerModel
2017-01-22 15:07:42 +08:00
Koncord
5b88f3fc44
Use C++11 in browser
2017-01-22 15:01:05 +08:00
Koncord
0af5e1269a
Move browser xml files to files/tes3mp/ui
2017-01-22 15:00:28 +08:00
MiroslavR
c64351b3e8
ESS-import: player is no longer disabled (Bug #3246 )
2017-01-21 03:39:51 +01:00
David Cernat
68727751ed
Fix arguments for OnPlayerChangeSpellbook in server Networking
2017-01-20 12:54:03 +02:00
David Cernat
869b32383e
Fix arguments for OnPlayerChangeJournal in server Networking
2017-01-20 12:52:03 +02:00
David Cernat
d308897f95
Rename PacketItems, PacketSpells into InventoryChanges, SpellbookChanges
2017-01-20 12:43:05 +02:00
David Cernat
e2c595fc5d
Add preliminary structure for journal changes
2017-01-20 12:05:45 +02:00
David Cernat
e9b22814b9
Create placeholder for ID_GAME_JOURNAL
2017-01-20 11:15:10 +02:00
David Cernat
a69f294ef0
Rename ID_GAME_CELL into ID_PLAYER_CELL_CHANGE
2017-01-20 10:30:50 +02:00
David Cernat
83277a1512
Send spellbook in LocalPlayer CharGen & change UPDATE action name to SET
2017-01-20 09:07:07 +02:00