Andrei Kortunov
|
39682d616c
|
Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes
|
2017-04-20 17:20:20 +04:00 |
|
Allofich
|
2e5fd74db0
|
Fix invalid iterator warning
|
2017-04-20 19:30:35 +09:00 |
|
scrawl
|
df3b4fe6a5
|
Merge pull request #1259 from Allofich/warnings
Fix a few Cppcheck warnings
|
2017-04-19 20:32:40 +02:00 |
|
Andrei Kortunov
|
f0f1df3a96
|
Properly clear inventory
|
2017-04-19 20:54:09 +04:00 |
|
Allofich
|
e87d2aa1af
|
Remove unused function
|
2017-04-20 01:47:30 +09:00 |
|
Allofich
|
60a2625b89
|
Add parentheses to clarify calculations
|
2017-04-20 01:38:21 +09:00 |
|
scrawl
|
30081393a6
|
Add InventoryWindow::clear() as part of world cleanup
|
2017-04-19 18:28:49 +02:00 |
|
Allofich
|
f299f26720
|
Remove unused variable
|
2017-04-20 01:22:33 +09:00 |
|
Allofich
|
5a00b239ac
|
Reduce scope of variables
|
2017-04-20 01:22:30 +09:00 |
|
Allofich
|
c655875584
|
Change mWaterEnabled from float to bool
|
2017-04-20 01:09:52 +09:00 |
|
Andrei Kortunov
|
04eb4ea6b6
|
Check for disabled levitation (fixes #3766)
|
2017-04-19 18:38:25 +04:00 |
|
scrawl
|
50f3794d12
|
Merge pull request #1258 from akortunov/drownfix
Fixed drowning widget initialization with non-default "fHoldBreathTime" GMST value
|
2017-04-19 16:08:55 +02:00 |
|
Andrei Kortunov
|
3c4c47d1e6
|
Reduced scope of fHoldBreathTime variable
|
2017-04-19 15:52:15 +04:00 |
|
Andrei Kortunov
|
c3fd327bb2
|
Fixed drowning widget initialization
|
2017-04-19 08:48:16 +04:00 |
|
scrawl
|
f90e5081f9
|
Merge pull request #1257 from akortunov/chargen
Chargen menus fixes
|
2017-04-18 22:23:30 +02:00 |
|
Andrei Kortunov
|
aac78d29a4
|
Service menus layout fixes
|
2017-04-16 20:30:20 +04:00 |
|
Andrei Kortunov
|
c93cf822c7
|
Reviewmenu: read name, race, class and birthsign from player stats (fixes bug #2628)
|
2017-04-14 23:21:20 +04:00 |
|
Andrei Kortunov
|
fb0c4700a4
|
Save a proto gender in racemenu
|
2017-04-14 23:19:48 +04:00 |
|
scrawl
|
f63b1e81cd
|
Merge pull request #1228 from akortunov/master
Options to show hidden weapon parameters
|
2017-04-14 20:01:08 +02:00 |
|
scrawl
|
17125e6c4d
|
Merge pull request #1256 from Allofich/equip
Adjustments to RemoveItem behavior
|
2017-04-14 01:08:29 +02: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 |
|
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 |
|
Andrei Kortunov
|
95ce7637f3
|
Adds persisted pin (feature #2834, bug #2489)
|
2017-04-10 10:18:00 +04:00 |
|
def
|
785b3c3d01
|
Hide WorldButton when in game mode
|
2017-04-03 09:40:12 +03:00 |
|
Andrei Kortunov
|
31bd70f334
|
Added missed recharge and repair sounds
|
2017-04-02 23:19:43 +04:00 |
|
Andrei Kortunov
|
df5a43363a
|
Confirmation dialogs size fix
|
2017-03-30 17:05:56 +04:00 |
|
scrawl
|
3c9f3a0f7f
|
Merge pull request #1242 from Allofich/warnings
Fix AppVeyor warnings
|
2017-03-29 07:28:00 +02:00 |
|
Andrei Kortunov
|
edadcb338c
|
Savegame dialog improvements
|
2017-03-27 23:10:57 +04:00 |
|
scrawl
|
9e7ade4ba4
|
Merge pull request #1244 from akortunov/develop
MyGUI vertical alignment
|
2017-03-27 20:14:09 +02:00 |
|
Allofich
|
db2f97f308
|
Fix shadowing warning
|
2017-03-27 20:22:20 +09:00 |
|
Andrei Kortunov
|
7d09a5d644
|
Progress bars vertical alignment
|
2017-03-27 13:33:28 +04:00 |
|
scrawl
|
a036a98fd0
|
Merge pull request #1243 from akortunov/develop
Journal improvements
|
2017-03-27 02:56:35 +02:00 |
|
scrawl
|
b064dd29cc
|
Fix reset of blend function (Bug #3811)
|
2017-03-27 02:51:23 +02:00 |
|
Andrei Kortunov
|
658ab5e941
|
Minor journal improvements
|
2017-03-26 22:56:36 +04:00 |
|
scrawl
|
2a74f79bf1
|
Merge pull request #1240 from Allofich/follow
Adjust AI follow distances
|
2017-03-26 20:35:11 +02:00 |
|
Allofich
|
6253a5218e
|
Adjust AI follow distances
(Fixes #3225)
|
2017-03-27 03:31:25 +09:00 |
|
scrawl
|
0a061d45b7
|
Merge pull request #1239 from akortunov/projectilefix
Disable explosion effect for 0-range projectiles (bug #3730)
|
2017-03-26 20:30:43 +02:00 |
|
Andrei Kortunov
|
14b59e0e4b
|
Vanilla-like tgm (fixes #3798)
|
2017-03-25 22:40:11 +04:00 |
|
Andrei Kortunov
|
860b556713
|
Disables explosion effect for 0-range projectiles (fixes #3730)
|
2017-03-25 19:53:24 +04:00 |
|
MiroslavR
|
da6b28eb40
|
Fix selling success chance (Fixes #3802)
|
2017-03-25 15:21:16 +01:00 |
|
scrawl
|
97dbd07ed2
|
Merge pull request #1236 from akortunov/guifixes
Minor GUI fixes
|
2017-03-25 13:36:58 +01:00 |
|
Andrei Kortunov
|
7bd0c74aa8
|
Fixes mWatchedTimeToStartDrowning initialization (fixes bug #3801)
|
2017-03-25 14:15:16 +04:00 |
|
Andrei Kortunov
|
e383e4d023
|
Disabled hit overlay for damage/absorb mana/fatigue spells
|
2017-03-25 14:10:19 +04:00 |
|
scrawl
|
373bd78cf3
|
Merge pull request #1233 from akortunov/guifixes
Vanilla style drowning widget
|
2017-03-24 18:10:11 +01:00 |
|
Andrei Kortunov
|
b89fdcfd27
|
Vanilla style drowning widget (partially fixes bug #3801).
|
2017-03-24 09:41:18 +04:00 |
|
scrawl
|
338592b99b
|
Don't clear the animation queue when turning (Bug #3581)
Otherwise, the turnAnimationThreshold would make it difficult to estimate when we can start playing the animation.
|
2017-03-23 20:05:06 +01:00 |
|
scrawl
|
a5d7b36c28
|
Don't clear idle animation when movement ends (Bug #3581)
This caused problems when AiWander tried to start an idle animation in the frame after movement stops.
|
2017-03-23 20:05:05 +01:00 |
|
scrawl
|
c611ddba8d
|
Remove stray term
|
2017-03-23 20:05:05 +01:00 |
|
scrawl
|
f230df3d1c
|
Merge pull request #1232 from akortunov/tooltipfix
Tooltip maximum width cap
|
2017-03-23 17:12:36 +01:00 |
|
Andrei Kortunov
|
1a47b9727b
|
Changed tooltip maximum width (bug #3800)
|
2017-03-23 14:31:01 +04:00 |
|
scrawl
|
02c6c1897e
|
Merge pull request #1230 from Allofich/stats
Change bounds behavior of stat script commands
|
2017-03-22 20:22:45 +01:00 |
|
Allofich
|
5282556ae0
|
Show names on combat actors when RMB GUI is active
Fixes (#3797)
|
2017-03-22 20:04:29 +09:00 |
|
Allofich
|
57aeec59d5
|
Change bounds behavior of stat script commands
Fixes (#3776)
|
2017-03-22 15:17:44 +09:00 |
|
Andrei Kortunov
|
1286754fb3
|
Add a new option to show arrow damage (feature #2923)
|
2017-03-18 08:07:36 +04:00 |
|
Andrei Kortunov
|
eb81ab5b24
|
Disables weapon and spells cycling in GUI mode (bugs #2409, #2483, #2645)
|
2017-03-15 17:07:25 +04:00 |
|
scrawl
|
e987fe85d0
|
Add abort flag to TerrainPreloadItem
|
2017-03-14 21:28:57 +01:00 |
|
scrawl
|
42e9891504
|
Fix issues caused by loading multiple views into the same terrain View
|
2017-03-14 20:27:55 +01:00 |
|
scrawl
|
97ed999097
|
Fix cleanup issue
|
2017-03-14 20:02:22 +01:00 |
|
scrawl
|
c22fde2bcd
|
Preload terrain while reading savegame
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
9371100fde
|
Reuse the intersection visitor and set a traversal number to allow the terrain component to manage its view more efficiently
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
59bf100907
|
Fill exteriorPositions in preloadFastTravel
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
03c07d3bd5
|
Remove old code
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
86e75f0987
|
Preload terrain even when cell preloading is disabled
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
d055dc25bf
|
Add custom traversal for local map camera to avoid loading terrain nodes that are exactly outside the border to another cell
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
6ccb6009ee
|
Use the View-based preloading for TerrainGrid as well
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
3c29e2dbeb
|
Refactor ownership of terrain views
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
28fd492711
|
Don't use terrain LOD for the map camera
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
e7a0878c10
|
Add CompositeMapRenderer info to the stats panel
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
ec0b743123
|
Revert "Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer."
This reverts commit 7d72c70c93ee3c0cc3d00d37b22c339d0103cd19.
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
4549196b31
|
Use the new way of terrain preloading in CellPreloader/Scene
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
1c15686353
|
Remove non required use of WorkQueue
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
19d516cbda
|
Use the QuadTreeWorld based on distant terrain setting now that it sort of works.
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
4dbd224249
|
Hide the terrain in non-exterior cells
|
2017-03-14 19:27:56 +01:00 |
|
scrawl
|
c684860e3b
|
Change ordering of LocalMap nodes to make sure they are traversed before the CompositeMapRenderer.
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
2d549d088e
|
Get the world size from the ESM::Land store
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
14225a42c6
|
Remove unused pointer to IncrementalCompileOperation
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
5eff286c71
|
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
e323b2fa7b
|
Use the SceneManager's ShaderManager
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
0fc465da59
|
Store the min/max height in LandData
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
051c17a184
|
Make reportStats const
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
2c68ed4fb4
|
Remove no longer required use of UnrefQueue as the new resource manager will naturally clear the cache from the worker thread
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
35d53acc65
|
Factor out terrain chunk loading/caching into a new resource manager
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
9a3a64f0c4
|
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
b898315962
|
cellpreloader: abort all tasks first before waiting
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
5f76317807
|
Wait for completion of CreateMapItem on exit to avoid potential threading issue
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
804f873649
|
terrain: factor out texture caching into a separate class
|
2017-03-14 19:27:55 +01:00 |
|
scrawl
|
ccfebdd2c3
|
Set the underwater fog relative to default view distance
|
2017-03-14 19:27:44 +01:00 |
|
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 |
|