1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:49:55 +00:00
Commit graph

1777 commits

Author SHA1 Message Date
scrawl
7e10818bdf Fix uninitialized flags for custom-made spells 2014-10-02 13:55:42 +02:00
scrawl
0bd9f30c67 Remove comment for old MyGUI version 2014-10-02 13:55:42 +02:00
scrawl
88da7f5157 Adjust border skin for loading bar and message boxes to match vanilla MW 2014-10-02 00:27:03 +02:00
scrawl
795dfdb557 Fix size_t underflow for journals with 1 page (Fixes #1958) 2014-09-30 18:14:25 +02:00
scrawl
ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 2014-09-28 18:02:49 +02:00
scrawl
7c52d05f85 Disable topics list visually when in a choice 2014-09-28 14:00:15 +02:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
58571f7ac2 Revert "Transfer item ownership to the buyer if item wasn't stolen"
Fixes #1953.

This reverts commit 5d77c5e8ca.
2014-09-28 12:18:46 +02:00
MiroslavR
508113f271 Resolve merge conflict 2014-09-27 17:50:17 +02:00
MiroslavR
1c4e52a0e5 Book formatter: Fix an excessive line break case 2014-09-27 17:35:57 +02:00
MiroslavR
cb5f661596 Book formatter: Support FONT closing tag, minor code cleanup 2014-09-27 13:31:59 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
790e0150b1 Fix global map markers being duplicated when cell is visited again 2014-09-26 16:51:48 +02:00
scrawl
18be152ab1 Allow dragging map even when a marker is hovered 2014-09-26 14:27:52 +02:00
scrawl
97df7c9b22 Get rid of markers.png and use original MW texture, cleanup 2014-09-26 13:40:10 +02:00
scrawl
4f0fc79ea4 Change global map cell size from 24 to 18 and make it configurable 2014-09-26 12:47:33 +02:00
scrawl
0bc840aadd Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
scrawl
6b65502557 Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +02:00
scrawl
40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd
Correct barter formula (removed erroneous clamping)
2014-09-25 13:02:42 +02:00
scrawl
1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 2014-09-25 00:04:38 +02:00
scrawl
088d01d727 Minor cleanup 2014-09-24 23:50:28 +02:00
scrawl
0f99a959eb Update barter offer for all items when another item is added (Fixes #1935) 2014-09-24 12:21:19 +02:00
scrawl
5d77c5e8ca Transfer item ownership to the buyer if item wasn't stolen (Fixes #1933) 2014-09-24 12:21:19 +02:00
Marc Zinnschlag
175d4f3d44 Merge remote-tracking branch 'ragora/playdeathlevelupmusic' 2014-09-23 13:30:50 +02:00
Marc Zinnschlag
56858c98b1 Merge remote-tracking branch 'miroslavr/master' 2014-09-23 13:23:00 +02:00
Ragora
06e683d378 Added code to play music on level up and on death 2014-09-23 04:58:19 -04:00
MiroslavR
22c71cec18 Check for text size 2014-09-22 23:17:44 +02:00
MiroslavR
608e1518a5 Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2 2014-09-22 21:47:21 +02:00
MiroslavR
f87d7c3fce Book formatter: Do not insert last page if it's empty, code cleanup 2014-09-22 21:25:41 +02:00
MiroslavR
4b1df64fba Book parser: Fix comparison between signed and unsigned integer expressions 2014-09-22 16:28:17 +02:00
MiroslavR
51cd2678ae Book formatter: Fix last block of text not displaying 2014-09-21 22:25:54 +02:00
MiroslavR
c362ec0f95 Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup 2014-09-21 19:47:52 +02:00
scrawl
b1e74e2a85 Remove support for Ogre 1.8 versions 2014-09-21 10:41:13 +02:00
scrawl
d3554084ad Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file 2014-09-20 13:50:23 +02:00
scrawl
f5868f7ae1 Fix layout problems in generate class result dialog 2014-09-20 13:07:38 +02:00
scrawl
e42cb8020e Change all skins to get font colors from fallback settings (Fixes #704) 2014-09-20 10:40:09 +02:00
scrawl
25e96b8c7b InteractiveMessageBox: Define a maximum width for the message text 2014-09-20 08:57:16 +02:00
MiroslavR
84d27d55e2 Remove redundant includes 2014-09-20 00:51:46 +02:00
MiroslavR
4f89c3e77a Rework book formatter (Fixes #1148) 2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe Merge remote-tracking branch 'scrawl/master' 2014-09-19 15:59:59 +02:00
scrawl
9c0649c11d Add basic framework to retrieve font colors from fallback settings (Feature #704) 2014-09-19 11:53:35 +02:00
scrawl
cbc242d857 Move item count text to ItemWidget 2014-09-19 09:29:00 +02:00
scrawl
b145d183ae Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration (Fixes #1922) 2014-09-19 09:11:21 +02:00
scrawl
08499ea51f Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit 2014-09-18 04:26:12 +02:00
scrawl
ac97a0f99d Fix dialogue choices being displayed in incorrect order 2014-09-18 04:10:17 +02:00
scrawl
09042ba6d9 Use object name instead of ID when available for tooltips 2014-09-17 13:03:12 +02:00
Marc Zinnschlag
19f469c7db Merge remote-tracking branch 'scrawl/master' 2014-09-14 12:00:14 +02:00
Marc Zinnschlag
ea60c665dd Merge remote-tracking branch 'ragora/bounditemflag' 2014-09-14 10:54:07 +02:00
Marc Zinnschlag
9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 2014-09-14 10:45:26 +02:00
scrawl
bd96764229 Mark code that will be obsolete when upgrading to MyGUI 3.2.2 2014-09-14 03:54:50 +02:00
Ragora
b8851790a6 Covered forgotten old bound item checks 2014-09-13 18:59:13 -04:00
Ragora
f250e3df4b Replaced old bound item checks that I knew of to use the new ItemStack::Flag_Bound bit 2014-09-13 18:48:41 -04:00
scrawl
04c79d5f1e Fix case issue when setting companion's profit on the script 2014-09-13 20:39:59 +02:00
Marc Zinnschlag
882ef37ae3 Merge remote-tracking branch 'ragora/conjureditemsgmstcheck' 2014-09-13 15:58:02 +02:00
Marc Zinnschlag
94a7e38194 Merge remote-tracking branch 'ragora/fixglobalcompassorient' 2014-09-13 15:55:06 +02:00
Marc Zinnschlag
690273d5b3 Merge remote-tracking branch 'ragora/fixmapresize' 2014-09-13 15:52:36 +02:00
scrawl
f82224497a Compatibility fix for MyGUI git 2014-09-13 08:00:24 +02:00
scrawl
2c58a879ec Fix minor exploit when map window is shown with transparency 2014-09-13 07:59:29 +02:00
scrawl
2b5adb325b Remove a useless method 2014-09-13 07:57:15 +02:00
scrawl
cfc57d0fe0 Use MyGUI's castType for widget casts 2014-09-13 04:07:40 +02:00
Ragora
282e7abd16 Map Arrow Correction; now rotate global map arrow to whatever the local map arrow orientation is 2014-09-12 18:26:38 -04:00
Ragora
35571bb108 Global compass arrow rotates regardless of indoor or outdoor presence 2014-09-12 17:31:37 -04:00
Ragora
25f99c5d5a Discarded use of a static variable and renamed event function to be less ambiguous 2014-09-12 15:06:37 -04:00
Marc Zinnschlag
560eae3f4d Merge remote-tracking branch 'ragora/conjuredequipmentrmvalfix' 2014-09-12 14:22:24 +02:00
Ragora
58d70c2895 Removed Unused includes from experimentation 2014-09-12 05:20:03 -04:00
Ragora
4ecac31752 Map keeps focus on wherever it was last moved when resizing map window 2014-09-12 05:16:33 -04:00
scrawl
c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 2014-09-12 05:14:21 +02:00
Ragora
e105202ee2 Use std::set instead of std::map 2014-09-11 22:45:30 -04:00
scrawl
ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 2014-09-12 04:27:23 +02:00
Ragora
efaa820ee2 Managed to forget the itemmodel.cpp code 2014-09-11 20:46:21 -04:00
Ragora
83868bca23 Removed unused include left over from experimentation 2014-09-11 19:37:00 -04:00
Ragora
ee6298f520 Added Flag_Bound flag for ItemStack to check against but the system behind it is probably not the best 2014-09-11 19:33:45 -04:00
Marc Zinnschlag
b5d5eadf79 Merge remote-tracking branch 'scrawl/master' 2014-09-11 09:01:21 +02:00
Ragora
74e1db3ac8 Minor Correction to existing conjured item logic 2014-09-11 01:00:39 -04:00
Ragora
69dbd6b30f Added checks for different bound item situations 2014-09-10 23:38:38 -04:00
Ragora
141755b473 Appears to have resolved the issue with unequipping conjured items and all possible error conditions deriving from being able to unequip them 2014-09-10 21:34:17 -04:00
scrawl
7fa3100993 Refactor TradeWindow balance buttons to use ControllerRepeatClick 2014-09-11 00:25:09 +02:00
MiroslavR
7e6e248511 Don't cache faced handle, as its context may have been changed during the frame by input events 2014-09-09 17:50:56 +02:00
scrawl
07d827c907 Ignore invalid input in numeric EditBox (Fixes #1885) 2014-09-08 15:22:33 +02:00
scrawl
b6635c7964 Move eventDone out of WindowBase 2014-09-07 18:55:59 +02:00
scrawl
271c921cf8 Add missing confirmation dialog for deleting map notes 2014-09-07 18:55:59 +02:00
scrawl
d6bc50c492 Remove an unused member variable 2014-09-07 18:55:59 +02:00
MiroslavR
b574131b06 Unset selected spell after selecting enchanted item in the spell window (Fixes #1878) 2014-09-07 12:42:11 +02:00
Marc Zinnschlag
16aa55dcde Merge remote-tracking branch 'miroslavr/master' 2014-09-07 10:22:07 +02:00
Rohit Nirmal
e315a72582 Remove extra semicolons at the end of some lines. 2014-09-06 13:04:52 -05:00
MiroslavR
57f7ef1db4 GUI: update/clear force-hidden window status 2014-09-06 03:13:35 +02:00
MiroslavR
386bb98fd2 Do not attach coin widgets to a box 2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09 Fix broken coin placement in levelup dialog + possible memleak 2014-09-02 22:06:02 +02:00
MiroslavR
41c6045986 Realign all parent boxes when autosizedwidgets change size 2014-09-01 03:38:05 +02:00
Rohit Nirmal
b5eb16b663 Silence some scan-build warnings. 2014-08-28 20:55:32 -05:00
scrawl
1a96dd0bd5 Remove more MyGUI 3.2.0 specific code 2014-08-27 16:39:13 +02:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
scrawl
17dc01ec44 Require MyGUI version 3.2.1 and remove legacy code (Fixes #1528) 2014-08-26 17:01:35 +02:00
scrawl
dcddd9a07c Use MyGUI clipboard events for MyGUI 3.2.1+ (Fixes #1846)
Note that only <= 3.2.0 and >= 3.2.1 are supported, any SVN version between them might still exhibit duplicate text pasting.
2014-08-26 03:06:30 +02:00
scrawl
10a0e2434e Open inventory when activating an unconscious actor (Fixes #1848) 2014-08-26 03:06:23 +02:00
scrawl
c775e05d7a Show encumbrance preview when trading (Fixes #1793) 2014-08-26 02:09:22 +02:00
MiroslavR
fc21d898f2 Add hand-to-hand tooltip 2014-08-25 03:15:28 +02:00
MiroslavR
d16e0c063c Enchanting, spellmaking dialog: check for flags when listing known effects 2014-08-24 21:59:52 +02:00
MiroslavR
df262e53ae Display school in the spell tooltip 2014-08-24 20:51:41 +02:00
MiroslavR
e8a245bea3 Enchanting dialog: follow vanilla behavior more closely 2014-08-24 16:41:17 +02:00