Andrei Kortunov
c2962ced90
Removed empty space before dialogue entry (bug #3892 )
2017-06-04 23:20:43 +04:00
Andrei Kortunov
f4a187a9c2
Move a setting to show enchanting success chance from GUI to Game section
2017-06-03 23:03:24 +04:00
David Cernat
315ec46ff6
Merge pull request #224 from OpenMW/master
...
Add OpenMW commits up to 3 Jun 2017
2017-06-03 17:19:34 +03:00
Andrei Kortunov
9a1ba1e559
Show success chance when self-enchanting (Feature #3492 )
2017-06-03 14:39:15 +04:00
David Cernat
41de1876a3
Merge pull request #223 from OpenMW/master
...
Add OpenMW commits up to 31 May 2017
2017-06-01 08:11:46 +03:00
scrawl
9fd0d54a35
Merge pull request #1289 from akortunov/newrepair
...
Improved repair and recharge widgets
2017-05-31 22:47:38 +02:00
Andrei Kortunov
10d4cb15ad
Improved repair widget
2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e
Improved recharge widget
2017-05-31 19:11:49 +04:00
scrawl
2638327593
Merge pull request #1303 from akortunov/guifixes
...
Character generation layout fixes
2017-05-31 15:25:41 +02:00
David Cernat
0cce9908be
Merge pull request #222 from OpenMW/master
...
Add OpenMW commits up to 29 May 2017
2017-05-29 04:53:23 +03:00
scrawl
a1661af864
Merge pull request #1301 from akortunov/tooltips
...
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
David Cernat
97768be14b
[Client] Send ObjectPlace packet for random creatures interrupting rest
2017-05-25 01:00:47 +03:00
David Cernat
d307876199
Merge pull request #218 from OpenMW/master
...
Add OpenMW commits up to 21 May 2017
2017-05-21 12:04:49 +03:00
Andrei Kortunov
4f41c44cd6
Swap enchant type when clean selected soulgem widget ( fixes #3878 )
2017-05-20 18:30:11 +04:00
David Cernat
5bd95628ce
[Client] Send an ObjectDelete packet when disposing of corpses
2017-05-08 08:44:43 +03:00
David Cernat
9d2c5c3502
[General] Simplify structure of BaseEvent
2017-05-06 21:57:29 +03:00
David Cernat
dcc61a095a
[Client] Allow multiple WorldObjects to be added to a WorldEvent
2017-05-06 20:44:39 +03:00
Andrei Kortunov
1520a4d7db
Levelup menu layout fixes
2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0
Tooltips: faction, magic effects layout fixes
2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75
Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes
2017-04-30 22:39:05 +04:00
Andrei Kortunov
6331cc6ab9
Tooltips: level, race, class, specialization layout fixes
2017-04-30 19:45:36 +04:00
David Cernat
f2ec6ce02c
Merge pull request #209 from OpenMW/master
...
Add OpenMW commits up to 30 Apr 2017
2017-04-30 13:31:16 +03:00
scrawl
9f1527b7da
Merge pull request #1272 from akortunov/guifixes
...
Service menus layout fixes
2017-04-30 12:27:21 +02:00
David Cernat
a82646a130
[Client] Delineate tes3mp-only code more clearly, part 2
2017-04-24 19:46:12 +03:00
Andrei Kortunov
c2706ac3e7
Merchant repair and travel window scroll fix
2017-04-23 09:15:25 +04:00
David Cernat
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
2017-04-21 21:07:37 +03:00
scrawl
8fbf9dc597
Merge pull request #1253 from akortunov/pinned
...
Remember "pinned" windows across game restarts
2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f
Move updatePinnedWindows() function to private section
2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa
Remove unused code
2017-04-21 18:39:01 +04:00
scrawl
fc56fc0b81
Merge pull request #1265 from akortunov/develop
...
Use "sLevel" GMST instead of hardcoded text in load game menu
2017-04-21 15:30:15 +02:00
Andrei Kortunov
e717d046f2
Escaped class name string
2017-04-21 17:21:57 +04:00
scrawl
1956602aa2
Merge pull request #1262 from Allofich/warnings
...
Fix more warnings
2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce
Use sLevel GMST instead of hardcoded text in load game menu
2017-04-21 09:40:25 +04:00
David Cernat
fec82dc033
Merge pull request #202 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017
2017-04-21 07:58:13 +03:00
Andrei Kortunov
6c1e3a0618
Merged from upstream master
2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f
Fix shadowing warnings
2017-04-21 11:06:18 +09:00
scrawl
1ffb9e1bf3
Remove renderWorldMap()
2017-04-21 00:50:22 +02:00
Andrei Kortunov
90d90b6d81
Fixed dynamic stats tooltips in review menu
2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c
Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes
2017-04-20 17:20:20 +04:00
David Cernat
edb155869b
Merge pull request #201 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2017
2017-04-19 22:12:33 +03:00
Andrei Kortunov
f0f1df3a96
Properly clear inventory
2017-04-19 20:54:09 +04:00
scrawl
30081393a6
Add InventoryWindow::clear() as part of world cleanup
2017-04-19 18:28:49 +02: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
David Cernat
bf17464074
Merge pull request #198 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
2017-04-15 05:36:50 +03: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
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
Andrei Kortunov
c3d49d5ca5
Fixed inventory crash and skipmenu launch
2017-04-12 22:57:32 +04: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
Andrei Kortunov
95ce7637f3
Adds persisted pin (feature #2834 , bug #2489 )
2017-04-10 10:18:00 +04: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
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
9759764699
[Client] Clean up getting and resetting of WorldEvent
2017-04-05 09:04:41 +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
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
e5cf632e1d
[Client] Stop creating new reference numbers for placed/spawned objects
2017-04-04 06:01:48 +03: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
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
Andrei Kortunov
7d09a5d644
Progress bars vertical alignment
2017-03-27 13:33:28 +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
Andrei Kortunov
1a47b9727b
Changed tooltip maximum width (bug #3800 )
2017-03-23 14:31:01 +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
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
David Cernat
d94850fbdf
Merge pull request #184 from OpenMW/master
...
Code style
2017-03-14 13:24:24 +02: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
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
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
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
Koncord
cea1425db1
[Client] Remove redundant newlines & keep ~120 columns
2017-03-04 14:55:35 +08: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
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
Rafael Moura
18a4b64f1a
Porting more ContainerStoreIterator usage to const version #2
2017-02-27 21:50:10 +00:00
David Cernat
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
2017-02-26 16:59:53 +02:00
David Cernat
ed2176c984
[Client] Reuse 1 BaseEvent over and over instead of creating new ones
2017-02-23 09:19:09 +02:00
David Cernat
a4526605a6
[General] Remove goldValue from ContainerItem because it is never useful
2017-02-20 12:31:11 +02:00
Rafael Moura
9963601484
Porting code to ConstContainerStoreIterator #1
2017-02-19 15:18:35 +00:00
David Cernat
4f2b88df8a
[General] Remove owner var from ContainerItem because it is always empty
2017-02-18 23:59:02 +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
scrawl
57b585570a
Preload magic effect visuals of the player's selected weapon/spell
2017-02-15 21:01:25 +01:00
David Cernat
3b604a432e
[General] Restructure ID_CONTAINER to allow multiple containers at once
2017-02-15 20:14:25 +02: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
72c6b11cf8
Move global map render to the worker thread
2017-02-14 07:58:16 +01:00
David Cernat
f02840d638
[Client] Fix log messages when sending ID_CONTAINER
2017-02-09 21:48:22 +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
3614b21e10
[General] Send charge and goldValue in ID_CONTAINER
2017-02-06 21:28:03 +02:00
David Cernat
e703dd42aa
[Client] Rename LocalEvent into WorldEvent
2017-02-06 17:40:32 +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
fe0cf5be05
StatsWindow: don't rebuild all skill widgets when one skill changes
2017-02-06 02:40:35 +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
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
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
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
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
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
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
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
703f253712
[Client] Delete new LocalEvents after sending them
2017-01-31 09:48:37 +02:00
David Cernat
d503a65849
[Client] Replace tab characters with spaces
2017-01-30 06:47:22 +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
Koncord
7595b33461
Implement spellbook
2016-12-29 21:19:57 +08:00
David Cernat
fba4878fee
Merge pull request #118 from OpenMW/master
...
Add OpenMW changes up to 27 Dec
2016-12-27 03:49:52 +02:00
MiroslavR
c9dd63af8d
Merge pull request #1171 from NeveHanter/travel-followers-cost
...
Implemented "paying" for travelling followers
2016-12-26 22:34:39 +01:00
David Cernat
5bdfb72752
Merge pull request #116 from OpenMW/master
...
Add OpenMW changes up to 26 Dec
2016-12-26 01:09:20 +02:00
NeveHanter
ff4aba2a6e
Moved duplicated code to common ActionTeleport static method and reordered travel price calculations
2016-12-23 21:27:29 +01:00
scrawl
cf496287f7
Silence static analysis warnings
2016-12-22 14:43:54 +01:00
NeveHanter
15cd3c178b
Clamp price multiplication to 1, as it resulted in player alone traveling at no fee.
2016-12-20 21:23:55 +01:00
NeveHanter
8902bb5b13
Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith
2016-12-20 12:38:51 +01:00
David Cernat
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
2016-12-17 23:27:09 +02:00
scrawl
f8690dcd20
Set the drag-and-drop state after initiating the drag, not before ( Fixes #3134 )
2016-12-16 20:16:59 +01:00
Koncord
804259b2c9
Change some printf to LOG_MESSAGE_SIMPLE
...
printf is not streamed to files
2016-12-16 18:50:34 +08:00
Koncord
9ca206dda9
Add hooks for containers
2016-12-16 17:27:19 +08:00
Koncord
536715cf46
Cleanup tes3mp headers
2016-12-16 16:59:15 +08:00
MiroslavR
8c97ac269d
Remove item shadows properly ( Fixes #3652 )
2016-12-10 22:22:41 +01:00
David Cernat
1feec58ed2
Merge pull request #108 from OpenMW/master
...
Add OpenMW changes up to 20 Nov, part 3
2016-11-20 22:57:47 +02:00
scrawl
c326564e20
Merge pull request #1136 from Allofich/deletespell
...
Allow deleting spells that have the "always succeeds" flag
2016-11-20 19:23:25 +01:00
David Cernat
f9ca98498d
Merge pull request #107 from OpenMW/master
...
Add OpenMW commits up to 20 Nov, part 2
2016-11-20 19:30:24 +02:00
Allofich
c82df2553c
Allow deleting spells that have the "always succeeds" flag ( Fixes #3627 )
2016-11-21 02:26:02 +09:00
MiroslavR
c1e52bbcf7
Fix -Wmismatched-tags clang warning
2016-11-20 15:10:37 +01:00
David Cernat
c6eac31d94
Merge pull request #106 from OpenMW/master
...
Add OpenMW changes up to 20 Nov
2016-11-20 01:20:25 +02:00
MiroslavR
8f91732b09
Show starting abilities, powers and spells in stat-review window ( Fixes #2410 )
2016-11-19 21:51:19 +01:00
David Cernat
3a733eb122
Make tes3mp includes consistent
2016-11-17 17:16:25 +02:00
David Cernat
fa9d6e810e
Use lowerCamelCase in tes3mp client function names like OpenMW does
2016-11-15 21:54:06 +02:00
David Cernat
8d2793401e
Merge pull request #103 from OpenMW/master
...
Add OpenMW commits up to 13 Nov
2016-11-14 14:08:16 +02:00
MiroslavR
175cfd4dff
Fix overloaded virtual function warning
2016-11-13 17:22:50 +01:00
David Cernat
48ca4d29bc
Merge pull request #99 from OpenMW/master
...
Add OpenMW commits up to 7 Nov
2016-11-08 00:24:39 +02:00
David Cernat
ec211e58d0
Merge pull request #98 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
2016-11-06 19:03:35 +02:00
MiroslavR
e80636f0ca
Improve performance of repairing/recharging ( Fixes #2493 )
2016-11-06 11:01:46 +01:00
Koncord
adb49b7c7d
Add New GUI dialog: ListBox
...
Example:
local GUI_LISTBOX = 42
function OnPlayerSendMessage(pid, message)
if message == "/lb" then
local items = "consectetur adipiscing elit\nsed do eiusmod tempor incididunt ut labore\net dolore magna aliqua." -- items can be separated through newline
local label = "Lorem ipsum dolor sit amet"
tes3mp.ListBox(pid, GUI_LISTBOX, label, items)
end
end
function OnGUIAction(pid, idGui, data)
if idGui == GUI_LISTBOX then
print("ID: " .. idGui .. " data: " .. tostring(data)) -- if value higher than last item id
end
end
2016-11-04 00:24:16 +08:00
MiroslavR
5cd04af3fa
Fix horrible performance when resizing/moving the settings window
...
Resize widgets instead of reconstructing them.
2016-11-01 16:37:00 +01:00
David Cernat
cd798d5f23
Merge pull request #89 from OpenMW/master
...
Add OpenMW commits up to 30 Oct
2016-10-30 21:49:07 +02:00
Allofich
125e94ef0e
Fix shadowing warnings
2016-10-31 00:39:31 +09:00
David Cernat
cee7843576
Send ID_OBJECT_DELETE when taking world items through inventory screen
2016-10-30 02:26:32 +03:00
David Cernat
41504bd02a
Use more accurate position for ID_OBJECT_PLACE
2016-10-30 00:51:23 +03:00
David Cernat
a4647de048
Break away from OpenMW by giving RefNum indexes to new created objects
2016-10-30 00:21:55 +03:00
David Cernat
937bf97883
Send gold values correctly with ID_OBJECT_PLACE
2016-10-29 00:34:46 +03:00
David Cernat
180aa3f2f3
Send item count ID_WORLD_OBJECT_PLACE
2016-10-28 22:35:01 +03:00
David Cernat
c25ebc34b3
Shorten WorldPacket IDs by removing WORLD from them
2016-10-25 12:15:27 +03:00
David Cernat
47ebd24b4a
Merge pull request #79 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# apps/openmw/mwinput/inputmanagerimp.cpp
2016-10-24 09:18:21 +03:00
David Cernat
c639337842
Merge with tes3mp-packetexpansion by fixing conflicts
...
# Conflicts:
# apps/openmw-mp/Networking.cpp
# apps/openmw/mwmp/Networking.cpp
# components/CMakeLists.txt
# components/openmw-mp/NetworkMessages.hpp
# components/openmw-mp/PacketsController.cpp
2016-10-23 17:57:38 +03:00
David Cernat
cbc132612a
Use mRefNum.mIndex instead of just mRefNum and add extra debug
2016-10-23 16:33:53 +03:00
David Cernat
17f66e4e90
Implement ID_WORLD_OBJECT_PLACE
2016-10-23 13:30:32 +03:00
Stanislav Zhukov
81dfd21d9a
Merge pull request #76 from TES3MP/tes3mp-minimap
...
Show dedicated players on minimap
2016-10-22 17:21:02 +08:00
Koncord
b704519078
Show dedicated players on minimap
2016-10-22 17:06:26 +08:00
scrawl
5ccbabc27d
Fix build against bullet with profiler disabled ( Fixes #3592 )
2016-10-14 21:00:35 +02:00
David Cernat
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2016-10-14 18:34:17 +03:00
scrawl
612c3e995f
Add drop shadow to ItemWidget ( Fixes #3545 )
2016-10-13 01:42:50 +02:00
David Cernat
14bac1e533
Make player markers appear on inventory map
2016-10-09 13:41:00 +03:00
scrawl
3019d70986
Use 'default icon' for items with no icon specified
2016-10-08 16:05:20 +02:00
Koncord
2e81034e53
Started work on the map markers
2016-10-07 13:17:44 +08:00
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09:00
David Cernat
6eae017561
Merge pull request #74 from OpenMW/master
...
Add OpenMW commits up to 5 Oct
2016-10-06 06:16:09 +03:00
scrawl
3d76ba5a7c
Merge pull request #1086 from Allofich/warnings
...
Fix shadowing warnings
2016-10-02 14:03:02 +02:00
Allofich
6ec37b5cfb
Fix shadowing warnings
2016-10-02 17:48:54 +09:00
MiroslavR
210c02d98e
Fix interactive ID validity checks in TypesetBookImpl
2016-10-01 21:07:17 +02:00
David Cernat
7e4543ffcb
Merge pull request #64 from OpenMW/master
...
Add OpenMW commits up to 24 Sep
2016-09-25 11:06:07 +03:00
MiroslavR
52e00f5fef
Do not show uncarriable lights in item views
2016-09-24 18:01:31 +02:00
David Cernat
79c561057c
Merge pull request #59 from OpenMW/master
...
Add OpenMW commits up to 18 Sep
2016-09-19 02:47:09 +03:00
scrawl
30d5c7488d
savegamedialog: don't reset the character selection scrollbar when a character is deleted
2016-09-18 19:26:41 +02:00
David Cernat
68f974d999
Merge pull request #57 from OpenMW/master
...
Add OpenMW commits up to 17 Sep
2016-09-17 21:31:51 +03:00
scrawl
7bd445fb83
Don't crash if FontManager::getByName returns NULL ( Fixes #3552 )
2016-09-17 17:21:35 +02:00
David Cernat
d612cbcc7b
Revert "Disable CharGen custom class choice until we can handle custom classes"
...
This reverts commit e81bf7318c
2016-08-29 21:04:32 +08:00
Koncord
4c2415e9db
Fix focus for InputDialog
...
Created a special pipe for future GUI modes.
2016-08-27 13:40:11 +08:00
David Cernat
e81bf7318c
Disable CharGen custom class choice until we can handle custom classes
2016-08-27 04:47:35 +03:00
David Cernat
d24b4d0a2d
Disable New, Save and Load buttons in main menu
2016-08-24 00:46:32 +03:00
scrawl
dda5bfbc9f
CharacterPreview no longer depends on osgViewer
2016-08-16 22:47:45 +02:00
scrawl
8bfcf259a3
LocalMap no longer depends on osgViewer
2016-08-16 22:37:44 +02:00
scrawl
0fbc0d0da7
Attempt to silence warning
2016-08-14 16:41:17 +02:00
scrawl
8c44334409
Merge pull request #1021 from Allofich/weight
...
Corrections to tooltip displays of zero-weight items
2016-08-14 15:14:58 +02:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
Allofich
502a26a7ff
Use getWeightString() to avoid casting to int
2016-08-14 19:38:53 +09:00
MiroslavR
ddbfe0c944
Fix disabled door markers appearing on the map ( Fixes #3348 )
2016-08-12 03:14:36 +02:00
Internecine
90735d226d
Replaced Store::find usage with Store::search to remove exception handlers.
2016-08-02 11:43:41 +12:00
Internecine
14165352f6
Added exception handlers when trying to retreive enchantment and magic effect data.
2016-08-01 13:16:42 +12:00
MiroslavR
80f2ae0ca7
Apply magic effects while waiting/sleeping
2016-07-06 00:20:23 +02:00
MiroslavR
41484432b4
Player's death now interrupts waiting/sleeping
2016-07-06 00:15:25 +02:00
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
2016-07-02 19:48:11 +02:00
MiroslavR
7244809c4a
Remove redundant part of condition
2016-06-26 15:17:52 +02:00
MiroslavR
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
2016-06-26 03:22:58 +02:00
scrawl
844cbc5a14
Add isNullAction() method to fix compiler warning
2016-06-11 18:26:20 +02:00
scrawl
f64bc3c7ef
Pass the victim to commitCrime on pickpocket detection ( Fixes #3424 )
2016-06-06 23:50:22 +02:00
scrawl
9eab3b1728
Fix crash in race dialog when no head or hair are available
2016-06-06 01:04:14 +02:00
Ben Shealy
5085afa3d7
Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading
2016-06-04 12:28:47 -04:00
Ben Shealy
8703609649
Allow +/- buttons in trade window to decrease offer to 0
2016-04-09 17:49:21 -04:00
scrawl
2162d9ed02
Restore key focus to the save list when the deletion confirmation messagebox is accepted
...
Gives me an idea for a new MyGUI feature - per-window widget focus as it is usually the case in other GUI toolkits.
2016-03-29 01:29:55 +02:00
scrawl
02016f4c56
Don't reset the save list when deleting a save ( Fixes #3279 )
2016-03-29 01:26:55 +02:00
scrawl
92c2a10de4
Fall back to 'warrior' for not found class images ( Fixes #3228 )
2016-03-24 16:52:16 +01:00
scrawl
e381957105
Don't assume that class ID and name are equal
2016-03-21 11:51:34 +01:00
scrawl
90cc1de46c
Do not list custom made classes in the pick class dialog
2016-03-21 11:46:25 +01:00
scrawl
a6e23d03d3
Don't clamp disposition twice, clamping is already done inside getDerivedDisposition
2016-03-18 00:42:22 +01:00
scrawl
12ec90f9e7
Change default argument, fix GetDisposition
2016-03-18 00:38:02 +01:00
scrawl
bc5adfa4fe
Merge pull request #913
2016-03-18 00:31:55 +01:00
scrawl
a0cc9de088
Make the creation of save file directories even more explicit
2016-03-14 00:00:11 +01:00
ae-g-i-s
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
2016-03-08 21:30:28 +01:00
scrawl
60a12b3dee
Use MyGUI's castType function
2016-03-05 20:00:51 +01:00
scrawl
763f647412
Add ItemModel::allowedToInsertItems
2016-03-05 19:53:24 +01:00
scrawl
373c1e7602
Assign the PageDisplay on initialization
2016-03-05 19:48:01 +01:00
scrawl
04d51d5871
Always update the ingredient icons ( Fixes #3220 )
2016-02-29 13:25:09 +01:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
1232607385
Remove pointless widget names in settings layout file
2016-02-18 19:41:06 +01:00
scrawl
3969675afa
Remove unused settings
2016-02-18 19:38:34 +01:00
scrawl
c4d38bb42d
Fix clang analyzer warnings
2016-02-16 19:17:04 +01:00
scrawl
eaf3f5a829
Remove unused arguments
2016-02-13 04:14:05 +01:00
scrawl
9e53e12c70
More renaming of TextureManager -> ImageManager
2016-02-05 23:10:27 +01:00
scrawl
f99f403dda
Rename TextureManager to ImageManager
2016-02-05 23:03:53 +01:00
scrawl
6ef848b7c5
Remove TextureManager::getTexture2D
...
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.
This is closer to what the OSG serializer does.
Streamlines the TextureManager and will make it easier to multithread.
2016-02-05 23:01:11 +01:00
scrawl
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
2016-02-05 21:03:11 +01:00
scrawl
8e5398d85b
Add missing initializations
2016-02-05 14:35:29 +01:00
scrawl
7d647088ab
Make the local map cell distance configurable
2016-02-05 01:19:45 +01:00
scrawl
bd655c20fd
Refactor local map updates
...
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.
Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
2016-02-05 01:19:45 +01:00
scrawl
b9d1d6144a
Don't reveal unknown potion effects in alchemy window ( Fixes #3146 )
2016-02-02 22:50:11 +01:00
scrawl
ce9a18fb87
Merge pull request #879 from jordan-ayers/bugfix/1544
...
Improve Drop Command - Bugfix/1544
2016-01-19 15:02:51 +01:00
Jordan Ayers
5699cf7f09
Barter: Leave unsold projectiles equipped.
2016-01-18 20:00:18 -06:00
scrawl
41c571d4f4
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
...
Conflicts:
apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
scrawl
6546c05428
Move Fallback map to components/
2016-01-11 23:10:16 +01:00
scrawl
ef20962fc5
Disable fog of war rendering on the HUD map by default
2016-01-11 22:58:08 +01:00
scrawl
ca4e859f61
Remove unused argument
2016-01-11 22:58:01 +01:00
scrawl
190bf15887
SettingsWindow: support auto-updating of slider labels through the layout file
2016-01-11 22:57:16 +01:00
scrawl
745b29a995
Remove a debugging leftover
2016-01-05 17:01:21 +01:00
scrawl
d9d6228c94
Implement PageDisplay::_updateView ( Fixes #3125 )
2016-01-05 16:54:09 +01:00
scrawl
5952498e9e
Explicitely cast a size_t to int
2016-01-05 16:53:51 +01:00
scrawl
db7b80b503
Revert "Accept a ConstPtr in ItemPtr tooltips"
...
This reverts commit 41c8ec56e0
2015-12-19 22:52:35 +01:00
scrawl
41c8ec56e0
Accept a ConstPtr in ItemPtr tooltips
2015-12-19 16:37:26 +01:00
scrawl
5a7bbbd508
Accept a ConstPtr in ToolTips::setFocusObject
2015-12-19 16:34:26 +01:00
