Bret Curtis
b26887ef9b
add support for png and dds splashscreens to begin with.
2017-09-13 13:52:05 +02:00
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2017-09-12 07:38:49 +03:00
scrawl
bd667c3847
Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir
...
If CMake supports it, sets the debugger working directory for Visual …
2017-09-11 10:30:50 +00:00
scrawl
00ae9a01a1
Merge pull request #1445 from akortunov/guifixes
...
Allow to add levelup a description for levels > 20
2017-09-11 10:28:09 +00:00
scrawl
407640322d
Merge pull request #1439 from akortunov/resistfix
...
Take in account elemental shields for GetResist and SetResist script commands
2017-09-11 10:27:47 +00:00
Marc Zinnschlag
9a8a4c744f
Merge remote-tracking branch 'capostrophic/controlplus'
2017-09-11 10:46:34 +02:00
Andrei Kortunov
7760e4514c
Allow to add levelup a description for levels > 20
2017-09-10 22:47:34 +04:00
scrawl
7688696765
Merge pull request #1437 from Capostrophic/nodemapfix
...
Use constant nodeMap during part updating in creature animation
2017-09-10 18:15:20 +00:00
Andrei Kortunov
c6fd75bf42
Take in account elemental shields for GetResist and SetResist script commands (bug #4093 )
2017-09-10 22:05:58 +04:00
Capostrophic
97ff24b8d6
Change ctl to ctrl in OpenMW-CS shortcut manager
2017-09-10 20:48:09 +03:00
scrawl
618ec6dcdd
Merge pull request #1440 from akortunov/guardfix
...
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 17:06:14 +00:00
Andrei Kortunov
661232222f
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 15:26:48 +04:00
Capostrophic
9503d61866
Use const nodeMap in creature animation
2017-09-09 23:22:16 +03:00
AnyOldName3
a9b95596bc
Add a missed trailing new line.
2017-09-08 22:21:00 +01:00
AnyOldName3
8c74f16247
Restore trailing new lines to shrink PR
2017-09-08 22:20:04 +01:00
AnyOldName3
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
2017-09-08 22:17:42 +01:00
MiroslavR
1e585ac71a
Log a warning in case of missing bookart instead of showing a pink rectangle ( Fixes #3826 )
2017-09-08 22:50:07 +02:00
AnyOldName3
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
2017-09-08 17:26:46 +01:00
Andrei Kortunov
ac2f20f983
Update a disposition bar when a dialogue widget is disabled, but visible
2017-09-08 19:42:06 +04:00
scrawl
8f1c8759e4
Merge pull request #1432 from akortunov/alchemyfix
...
Update alchemy effects after every created potion (#4079 )
2017-09-07 20:51:42 +00:00
Andrei Kortunov
dc0313a36f
Use base skill value when calculating rank requirements
2017-09-07 21:06:10 +04:00
Andrei Kortunov
7559d25317
Update alchemy effects after every created potion ( #4079 )
2017-09-06 15:11:47 +04:00
David Cernat
b94c0a9991
[Client] Don't send Attribute & Skill packets as werewolf, part 2
2017-09-04 20:21:06 +03:00
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
2017-09-04 18:05:24 +03:00
David Cernat
8c9d6a0160
[Client] Ensure that LocalPlayer's isWerewolf starts out false
2017-09-04 15:44:10 +03:00
David Cernat
ccb15cc09e
[Client] When players die, make guards willing to arrest them again
2017-09-04 15:13:05 +03:00
Thunderforge
e0ffc94f3e
Fix OpenMW-CS internal name
2017-09-02 18:07:12 -05:00
Koncord
74c9a26d16
[Server] Fix "wrong packet with id: 14"
2017-09-02 14:01:11 +08:00
scrawl
4c5992a0d5
Warn if removing a node fails
2017-09-01 21:42:35 +00:00
scrawl
132ac6001b
Fix bug of Animation::mSkeleton not being assigned
...
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713
Merge pull request #1428 from akortunov/stancechangefixes
...
[Feedback needed] Stance switching changes, part II
2017-09-01 21:42:08 +00:00
Andrei Kortunov
7f5f5458d4
Reset player attack animation when unequip weapon or tool
2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec
Allow to interrupt an attack, if attack button is held
2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a
Fixes a regression with bound weapons equipping (bug #4050 )
2017-09-01 08:59:05 +04:00
scrawl
a8005c33d9
Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51
2017-08-31 21:58:12 +00:00
David Cernat
2e8718a0e0
Merge pull request #282 from OpenMW/master
...
Add OpenMW commits up to 31 Aug 2017, part 2
2017-08-31 18:42:54 +03:00
David Cernat
3fc1bdecb3
[Client] Shorten player names to 31 characters after they are inputted
2017-08-31 18:41:37 +03:00
David Cernat
ac3254d85f
[General] Don't send PlayerAttribute and PlayerSkill packets as werewolf
...
This will prevent the server from overwriting a player's human form stats with their werewolf form stats.
Additionally, share PlayerShapeshift packets last when exchanging data with another player.
2017-08-31 18:21:38 +03:00
David Cernat
93d1aa2e4a
[Client] Comment out the broken sending of custom spells until 0.7.0
2017-08-31 17:07:45 +03:00
David Cernat
98a7769b91
Merge branch 'master' into 0.6.0
2017-08-31 15:44:27 +03:00
Andrei Kortunov
1aaa8a76c5
Allow to play only one copy of given sound at time (bug #3647 )
2017-08-31 16:14:48 +04:00
David Cernat
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-08-31 15:14:13 +03:00
Koncord
54f5104345
[General] Escape format for strings
2017-08-31 20:09:05 +08:00
David Cernat
499c7db121
[Server] Initialize interiors correctly if exterior 0, 0 has been loaded
2017-08-31 14:48:23 +03:00
Andrei Kortunov
91dcd5bc6e
Do not allow to unequip weapon from inventory during attack
2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5
Do not allow to switch weapon to probe or lockpick during attack
2017-08-31 12:36:54 +04:00
David Cernat
cca4991e74
[Utils] Use consistent names for utility functions added by tes3mp
2017-08-31 10:12:22 +03:00
David Cernat
cf4021a7b5
[Client] Only add valid quests to journal
2017-08-31 09:08:29 +03:00
David Cernat
134dd06d48
[Client] Only add valid inventory & equipment items to LocalPlayer
...
Also add related debug information.
2017-08-31 08:35:46 +03:00
David Cernat
c3d1eada89
[Client] Only add spells to players that are ensured to exist
2017-08-31 06:42:11 +03:00
David Cernat
f6d36d5d80
[Client] Ensure that objects searched for have a valid reference number
2017-08-31 03:40:36 +03:00
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
2017-08-30 21:26:30 +00:00
scrawl
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
2017-08-29 23:11:23 +00:00
scrawl
43fda6cf07
Merge pull request #1423 from akortunov/spellpriority
...
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 22:38:36 +00:00
David Cernat
833d2a5dbe
Merge pull request #277 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 29 Aug 2017, part 1
2017-08-29 19:32:21 +03:00
David Cernat
92553b8e29
[Server] Log startup errors by not deleting logger too early
2017-08-29 19:30:37 +03:00
Andrei Kortunov
73d5efabee
Display negative values on fatigue progress bar
2017-08-29 18:53:21 +04:00
Andrei Kortunov
8003dbee12
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 16:40:55 +04:00
Andrei Kortunov
fb45995a41
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445 )
2017-08-29 15:53:23 +04:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Harry
86ae2ae395
Improved shuffle ( #1412 )
2017-08-25 20:08:49 +00:00
AnyOldName3
1578fcbec7
Escape content file names before sending them to the GUI
2017-08-25 10:05:56 +00:00
Marc Zinnschlag
91f674bb6f
Merge remote-tracking branch 'aesylwinn/master'
2017-08-25 10:24:17 +02:00
Kyle Cooley
a8576d78ad
Change default topic info values
2017-08-24 13:51:53 -04:00
Kyle Cooley
42b948dffe
Fix pathgrid segfault
2017-08-23 11:35:26 -04:00
Marc Zinnschlag
f4110a72cc
Merge remote-tracking branch 'aesylwinn/fixvideotable'
2017-08-23 11:24:51 +02:00
David Cernat
2597f018d2
Merge pull request #272 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 23 Aug 2017
2017-08-23 07:22:29 +03:00
David Cernat
a883c8f8aa
[Client] Prevent scripts from creating PlayerTopic packet spam
2017-08-23 07:14:45 +03:00
Kyle Cooley
157ecb166c
Fix wrong folder name
2017-08-23 00:02:02 -04:00
David Cernat
8f543fb34e
[Client] Use less exploitable way of disabling console
...
Previously, large framerate drops allowed players to open and use the console for short periods of time.
2017-08-23 04:58:07 +03:00
David Cernat
056d54e9f7
[Client] Only send ObjectScale packets for objects located in cells
2017-08-23 02:45:38 +03:00
scrawl
30665b743d
Merge pull request #1416 from akortunov/guifixes
...
Display large journal entries correctly
2017-08-22 20:37:46 +00:00
scrawl
aa95cb3d91
Merge pull request #1406 from Aesylwinn/reloadassets
...
Editor: Asset Reloading
2017-08-22 20:17:30 +00:00
Andrei Kortunov
0177fe6602
Display large entries in journal correctly
2017-08-22 23:26:06 +04:00
Kyle Cooley
d3d04171f9
Fix seg fault, undo changes BsaArchive
2017-08-22 15:06:56 -04:00
Andrei Kortunov
e799cbdb51
Combat AI: allow only one summoned creature at time
2017-08-22 09:18:49 +04:00
Kyle Cooley
8c4b12a603
VFS changes, one VFS and resource system per document.
...
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
2017-08-21 22:31:19 -04:00
Kyle Cooley
979b0d7211
Code cleanup and more cache clearing
2017-08-21 18:58:38 -04:00
Kyle Cooley
3b9326d238
Clear terrain cache and reload terrain
2017-08-20 22:34:41 -04:00
Kyle Cooley
d4a722067d
Reload water
2017-08-20 20:55:56 -04:00
Kyle Cooley
d7744e8b16
A bit of cleanup
2017-08-20 19:07:23 -04:00
scrawl
f0dea8b8e6
Revert "Implement a Fisher-Yates shuffle on background music"
2017-08-20 20:20:27 +00:00
David Cernat
ac27ca663b
[Client] Don't send ObjectState packets for items in containers
2017-08-20 06:58:39 +03:00
Kyle Cooley
5950b26912
Update scene assets
2017-08-19 19:36:45 -04:00
scrawl
dbb8a5c959
Merge pull request #1401 from h313/master
...
Implement a Fisher-Yates shuffle on background music
2017-08-19 22:48:24 +00:00
Kyle Cooley
742bd00ec6
Clear cached resources
2017-08-19 15:26:46 -04:00
Harry
2a85c5f011
Implement a Fisher-Yates shuffle on background music
...
This fixes sometimes getting repetitive background music
2017-08-19 14:48:00 -04:00
Andrei Kortunov
65d05ee1cd
Get only text from clipboard (bug #4025 )
2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b
Revert commit 67d59bead5 (a better
...
implementation found)
2017-08-19 15:24:06 +04:00
Kyle Cooley
d31ed83b54
Preliminary asset reloading
2017-08-19 03:43:31 -04:00
scrawl
2611377081
Merge pull request #1350 from akortunov/deathanimationfix
...
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-18 22:04:12 +00:00
scrawl
f277007b49
Merge pull request #1404 from akortunov/ownedcrosshair
...
Owned crosshair feature improvements [discussion]
2017-08-18 20:21:23 +00:00
Andrei Kortunov
7c80ddc9de
Owned crosshair improvements (bug #2789 )
2017-08-18 17:08:15 +04:00
Andrei Kortunov
641a6cd842
Added a delay before summoned creature corpse despawning
2017-08-18 11:58:28 +04:00
David Cernat
cffd985038
Merge pull request #266 from TES3MP/0.6.0
...
Add hotfix commits for 0.6.0 up to 18 Aug 2017
2017-08-18 07:45:36 +03:00
David Cernat
0820b7e92b
[Server] Add GetCaseInsensitiveFilename() script function
...
Additionally, make header order consistent in script function files.
2017-08-18 07:13:08 +03:00
Capostrophic
6c8c883dc0
Making knownEffect aware that there can be more than 4 potion effects
2017-08-18 00:47:28 +03:00
scrawl
b73ed5ccac
Merge pull request #1391 from akortunov/aifollow
...
AiFollow: add a threshold when turning to target
2017-08-17 20:17:11 +00:00
Andrei Kortunov
d8d47f081b
AiFollow: add a threshold when turning to target
2017-08-17 22:52:34 +04:00
scrawl
c231d20413
Merge pull request #1362 from akortunov/spellpriority
...
Combat AI: use WhenUsed enchantments [Feedback needed]
2017-08-16 21:23:57 +00:00
