Andrei Kortunov
|
2b22d10ebc
|
Spellview fixes
|
2017-07-16 13:14:19 +04:00 |
|
Andrei Kortunov
|
9179a019df
|
Quick keys menu fixes
|
2017-07-16 13:11:34 +04:00 |
|
Andrei Kortunov
|
5be1c81913
|
Fixed Close button handler in EditEffectDialog (fixes #3956)
|
2017-07-15 14:03:36 +04:00 |
|
David Cernat
|
e3929df38a
|
Merge pull request #239 from OpenMW/master
Add OpenMW commits up to 14 Jul 2017
|
2017-07-15 09:13:04 +03:00 |
|
David Cernat
|
ad9fa0631a
|
[General] Rename jailText to jailEndText and add jailProgressText in PlayerJail
|
2017-07-13 20:13:28 +03:00 |
|
David Cernat
|
708d3723eb
|
[Client] Fix client script messagebox buttons that had always broken in tes3mp
|
2017-07-13 18:58:48 +03:00 |
|
David Cernat
|
083b46394d
|
[General] Add ignoreJailSkillIncreases to PlayerJail packets
|
2017-07-12 18:24:37 +03:00 |
|
David Cernat
|
5962570c48
|
[General] Add jailText to PlayerJail packets
|
2017-07-12 16:39:31 +03:00 |
|
David Cernat
|
3280f0c5ee
|
[General] Implement PlayerJail packet
Rework server's DeathFunctions into MechanicsFunctions
Remove connection between PlayerResurrect and jailing
|
2017-07-11 13:34:09 +03:00 |
|
Andrei Kortunov
|
54b4d93f79
|
Added a special function for GUI sounds playing
|
2017-07-10 15:48:00 +04:00 |
|
David Cernat
|
1d504a665f
|
[General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets
|
2017-07-05 07:06:33 +03:00 |
|
David Cernat
|
60574ae667
|
[General] Implement jail time as a death penalty
|
2017-07-03 15:45:21 +03:00 |
|
David Cernat
|
71313c5aa6
|
[General] Implement PlayerMap packet, part 1
|
2017-07-03 09:28:27 +03:00 |
|
David Cernat
|
ad4b1d05bb
|
[Client] Add comments for GUI additions made by tes3mp
|
2017-07-03 05:06:07 +03:00 |
|
David Cernat
|
fa3baac0f3
|
Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
|
2017-06-18 18:16:10 +03:00 |
|
Allofich
|
42402976e3
|
Fixes for building in MSVC
|
2017-06-13 19:38:12 +09:00 |
|
scrawl
|
6d90f5a9a5
|
Merge pull request #1312 from akortunov/guifixes
Split greeting from topic response
|
2017-06-12 23:19:45 +02:00 |
|
David Cernat
|
79351c737e
|
[Client] Disable back button in chargen race window
|
2017-06-10 08:10:56 +03:00 |
|
Bret Curtis
|
dbf149f9b2
|
gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now
|
2017-06-10 00:51:19 +02:00 |
|
Bret Curtis
|
c781d1f8ed
|
purge unnecessary imports
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
d799954ca0
|
replace and purge boost::math::gcd and other non-used headers
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
154d7cffa2
|
replace and purge boost::function
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
d48b829b45
|
replace and purge boost::lexical_cast
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
98752a9702
|
replace boost::bind
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
b7c27e5e96
|
remove boost/tuple
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
d97aa9152b
|
remove more unused imports, including boost headers
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
d785344fad
|
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
|
2017-06-09 19:08:53 +02:00 |
|
Bret Curtis
|
c8b67221d7
|
use nullptr instead of NULL
|
2017-06-09 16:49:25 +02:00 |
|
Ewan Higgs
|
38a2de3c51
|
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
|
2017-06-09 16:49:25 +02:00 |
|
Andrei Kortunov
|
4bb9622c21
|
Handle greetings differently from responses
|
2017-06-08 22:40:31 +04:00 |
|
David Cernat
|
abaa26e32a
|
Merge pull request #226 from OpenMW/master
Add OpenMW commits up to 8 Jun 2017
|
2017-06-08 05:25:47 +03:00 |
|
scrawl
|
59eb0aba7d
|
Merge pull request #1310 from akortunov/guifixes
Removed empty space before dialogue entry (bug #3892)
|
2017-06-07 21:55:45 +02:00 |
|
David Cernat
|
89f6c6df96
|
Merge pull request #225 from OpenMW/master
Add OpenMW commits up to 4 Jun 2017
|
2017-06-05 03:38:58 +03:00 |
|
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 |
|