David Cernat
|
a82646a130
|
[Client] Delineate tes3mp-only code more clearly, part 2
|
2017-04-24 19:46:12 +03: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 |
|
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 |
|
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 |
|