1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:49:54 +00:00
Commit graph

14304 commits

Author SHA1 Message Date
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
9e25a95861 [Server] Initialize processors for recently added ActorPackets 2017-04-13 18:57:48 +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
742d6f653a [General] Add ActorPosition packet 2017-04-10 12:38:30 +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
69bf2749a5 [Server] Add ActorFunctions for getting and setting basic actor data 2017-04-10 06:15:03 +03:00
David Cernat
e9c3abc2c3 [Server] Reset variables more elegantly in WorldFunctions 2017-04-10 02:37:43 +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
scrawl
1cd901d113 Merge pull request #1248 from akortunov/missedsound
Adds missing recharge and repair sounds
2017-04-09 21:33:12 +02:00
David Cernat
c52084a028 [General] Use BaseActorLists in ActorPackets 2017-04-09 16:32:44 +03:00
David Cernat
1b714fbfa7 [Server] Make script functions more consistent 2017-04-09 12:28:38 +03:00
David Cernat
a24ef3a25e [Server] Create ActorFunctions placeholder 2017-04-09 12:24:33 +03:00
David Cernat
4f3d05eed2 [General] Add ActorList class 2017-04-09 10:50:35 +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
89a8ace41c [Server] Print debug info only for certain world packets 2017-04-08 12:00:07 +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
6557577c03 Merge pull request #193 from OpenMW/master
Add OpenMW commits up to 7 March 2017
2017-04-07 16:13:09 +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
Rob Cutmore
0ff56677f6 Remove unused code 2017-04-06 19:56:18 -04:00
Rob Cutmore
84bad9316d Editor: flag orbit camera for re-initialization
After swapping cells the orbit cam controller needs to be
re-initialized to properly center on the new cell.
2017-04-06 19:40:26 -04: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
c6c0e4acc9 [Server] Fix Cell::sendToLoaded() part 2, and fix Player::sendToLoaded() 2017-04-06 08:39:11 +03:00
David Cernat
8616323bae [Server] Fix logic in Cell::sendToLoaded() 2017-04-06 08:27:04 +03:00
David Cernat
fae3bcaeeb [Server] Send actor packets only to players in the same cell 2017-04-06 06:42:25 +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
ba8341bfb5 [Server] Add SendActorAuthority() script function 2017-04-05 11:02:11 +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
c65e94587c [Server] Add SendActorList() script function 2017-04-05 04:44:47 +03:00
David Cernat
8c2469bf6d [General] Add placeholder ActorList, ActorAuthority & ActorFrame packets 2017-04-05 04:06:45 +03:00
Rob Cutmore
f7664d4bb9 Editor: reset camera after cell drag and drop
When replacing a viewed cell via drag and drop the camera position is
not updated to better view the new cell. This flags the camera position
as not being set so a better default is set.
2017-04-04 18:54:58 -04:00
David Cernat
316720e710 [Server] Rename getNextMpNum() into incrementMpNum() 2017-04-05 01:30:15 +03:00
David Cernat
068835ba71 [Server] Add OnMpNumIncrement() script callback 2017-04-05 01:18:42 +03:00
David Cernat
3b34b9cd3e [Server] Fix typo in MiscellaneousFunctions 2017-04-04 12:49:29 +03:00
David Cernat
2716078a30 [Server] Add GetCurrentMpNum() and SetCurrentMpNum() script functions 2017-04-04 12:43:17 +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
82f38dcfad [Server] Set mpNum in AddWorldObject() 2017-04-04 10:34:35 +03:00
David Cernat
4644235cf6 [Client] Use mpNum in exact searches for objects 2017-04-04 10:07:15 +03:00
David Cernat
665fe09fd0 [Server] Add GetObjectMpNum() and SetObjectMpNum() script functions 2017-04-04 09:30:17 +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
d242f3790f [Server] Don't try to send late-arriving container packets about now unloaded cells 2017-04-04 07:21:02 +03:00
David Cernat
e5cf632e1d [Client] Stop creating new reference numbers for placed/spawned objects 2017-04-04 06:01:48 +03:00
David Cernat
d8712ee1ea [Server] Fix script crashes by reusing BaseEvent in WorldProcessor 2017-04-04 05:03:14 +03:00
David Cernat
5ff40c5563 [Server] Make coding style consistent 2017-04-04 03:05:37 +03:00
David Cernat
174937f412 [Server] Add LogMessage() and LogAppend() script functions 2017-04-04 01:47:37 +03:00
def
785b3c3d01 Hide WorldButton when in game mode 2017-04-03 09:40:12 +03:00
Koncord
1d2a6d9056 [Server] Rename dontRead to avoidReading 2017-04-03 06:44:14 +08:00
Koncord
47924f5bb0 [Server] Move packet.Read() to parent 2017-04-03 06:13:56 +08:00
Koncord
ead92fff61 [Server] Move setPlayer() to PlayerProcessor 2017-04-03 06:05:18 +08:00
Koncord
0317e2523b [Server] Remove unused code 2017-04-03 05:57:03 +08:00
Koncord
c8fb7d9c1a [Server] Move packet.Send(true) to parent class 2017-04-03 05:56:29 +08:00
Koncord
9ecc70d17c [Server] Fix ID in ProcessorContainer 2017-04-03 05:49:23 +08:00
Koncord
f5600c508f [Server] Move all world handlers to WorldProcessors 2017-04-03 05:46:46 +08:00
Koncord
3ab25fb3f1 [Server] Move player processors to processors/player 2017-04-03 05:45:41 +08:00
Koncord
0a1041bf56 [Server] Add WorldProcessor 2017-04-03 05:40:17 +08: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
Koncord
3b52549a3d [Server] Rename init_processors to ProcessorInitializer 2017-04-01 08:14:26 +08:00
Koncord
e8a5fd1cd0 [Server] Move all message handlers to PlayerProcessors 2017-04-01 02:36:24 +08:00
Koncord
020167df08 [Server] Add PlayerProcessor 2017-04-01 02:35:34 +08:00
Koncord
b01734888f [Server] Add missing header 2017-04-01 02:33:39 +08:00
Marc Zinnschlag
ab8294b281 Merge remote-tracking branch 'rcutmore/bug-2838' 2017-03-31 16:47:26 +02:00
Andrei Kortunov
df5a43363a Confirmation dialogs size fix 2017-03-30 17:05:56 +04:00
Rob Cutmore
343f2cb81d Editor: add creator for body parts
Added creator subclass for body parts to allow adding first person
parts. IDs for first person body parts are expected to end with ".1st".
2017-03-30 08:20:43 -04:00
Koncord
691dc75401 [Browser] Fix sign compare warnings 2017-03-30 00:39:01 +08:00
scrawl
3c9f3a0f7f Merge pull request #1242 from Allofich/warnings
Fix AppVeyor warnings
2017-03-29 07:28:00 +02:00
scrawl
6a745cb2cc Fix text colorMode (Bug #3815) and render bin 2017-03-29 07:10:55 +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
Rob Cutmore
77bf1efc1a Editor: Fix labels for creator user inputs 2017-03-26 09:14:32 -04:00
Rob Cutmore
8d4441bb5e Editor: document subclasses without ID checks
- Removes ID validation for PathgridCreator.
- Adds comments explaining why ID validation isn't used in some cases.
2017-03-26 09:05:05 -04: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
scrawl
7075a3a99b Merge pull request #1231 from Allofich/tooltips
Show names on combat actors when RMB GUI is active
2017-03-22 20:21:58 +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
Rob Cutmore
3714c2a0f2 Editor: add ID validator to pathgrid input 2017-03-21 08:14:04 -04:00
Rob Cutmore
207695e094 Editor: switch input for pathgrid creator
Switched from QComboBox to DropLineEdit for pathgrid creator input.
This allows the input the use auto-complete and be a drop target from
the cells table.
2017-03-21 07:58:01 -04:00
Rob Cutmore
0dcb6a9bd4 Editor: update pathgrid creator input on changes
When data changes the cell input for pathgrid creator is repopulated
with valid choices. This handles the case where a cell is added or
removed, and also when a cell's pathgrid is added or completely
removed.
2017-03-18 10:20:16 -04:00
Rob Cutmore
491fd3d0be Editor: set combo box events for pathgrid creator
- Handles when combo box should automatically gain or lose focus.
- Checks user input when combo box selection changes.
2017-03-18 09:20:14 -04:00
Rob Cutmore
95d164a6e6 Editor: use combo box when creating pathgrids
Instead of using QLineEdit for user input, use a QComboBox populated
with valid choices. This prevents user from being able to create a
pathgrid for a non-existent cell.
2017-03-18 07:49:46 -04: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
5fb854036d Use a forward declaration to avoid having to workaround Qt MOC
Don't think that guard was still needed, but a forward declaration is better anyways.
2017-03-14 19:27:55 +01:00
scrawl
80a0398f9d Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads 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
2c26ed8aee [Server] Process ID_GAME_PREINIT packet 2017-03-06 22:51:17 +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
David Cernat
82dcec5ec5 [Server] Use consistent pattern for script function category names 2017-03-04 14:11:17 +02: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
Koncord
c353e18645 [General] Move Utils from server to components
Rewrite CRC32 functions to the Boost equivalent
2017-03-04 13:08:22 +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