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

1777 commits

Author SHA1 Message Date
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
Marc Zinnschlag
d024c1a93f Merge remote-tracking branch 'scrawl/master' 2014-08-24 09:14:17 +02:00
Rohit Nirmal
6ed4f530df Forgot to update comment. 2014-08-23 10:35:55 -05:00
Rohit Nirmal
bf97fe7b35 Need to change draw state if use'd item is in player's right hand. 2014-08-23 10:31:10 -05:00
scrawl
e9e7e96c5f SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation) 2014-08-23 16:18:46 +02:00
Rohit Nirmal
234903d93c Change player draw state when quick-selecting weapon or spell.
(Fixes #1828)
2014-08-22 21:36:39 -05:00
scrawl
888a53af04 SaveGameDialog: Allow deleting saves with keyboard (Delete key) 2014-08-17 20:41:23 +02:00
Marc Zinnschlag
02b7712d7c Merge remote-tracking branch 'scrawl/master' 2014-08-17 12:07:44 +02:00
scrawl
322480862b InteractiveMessageBox: lay out buttons horizontally if button width does not exceed message width (Fixes #1812)
Also fix some layout bugs.
2014-08-16 18:53:13 +02:00
MiroslavR
195f044f3b Replace more .tga->.dds hacks with ResourceHelpers 2014-08-16 18:12:18 +02:00
scrawl
bb33b4e005 Revert "Remove horizontal messagebox layout, not used in vanilla (Fixes #1402)"
This reverts commit 40d6c8abf7.
2014-08-16 17:24:18 +02:00
scrawl
ddf8c5023e InventoryWindow: don't unnecessarily update preview on opening count dialog 2014-08-16 17:18:13 +02:00
Marc Zinnschlag
47619d957a Merge remote-tracking branch 'miroslavr/master' 2014-08-16 15:25:13 +02:00
Marc Zinnschlag
e893d0d7d3 Merge remote-tracking branch 'scrawl/master' 2014-08-16 15:10:03 +02:00
MiroslavR
063b40a0ee Correct tooltip for maxed out skills 2014-08-16 13:30:49 +02:00
MiroslavR
236eec3d89 Allow widgets with layout-type tooltip to change user data of widgets from tooltip layout 2014-08-16 13:24:44 +02:00
MiroslavR
a9f7a30d90 HBox, VBox: call parent setPropertyOverride 2014-08-16 13:12:02 +02:00
scrawl
c4ae07f48a Remove partially broken sound pausing in main menu (Fixes #1707) 2014-08-16 02:01:39 +02:00
scrawl
ddba9e5854 Improve performance of ItemView resize (reposition widgets instead of recreate) 2014-08-15 18:42:33 +02:00
scrawl
084cc857d4 Update magic effects when changing equipment (Fixes #1646) 2014-08-15 01:13:38 +02:00
MiroslavR
1385a86bd4 Spell creation: do not add skill/attribute effects before selecting the skill or attribute 2014-08-15 00:30:24 +02:00
scrawl
7f807f31d0 Remove comment
Doing some testing with extended journals, doesn't appear to be a performance issue.
2014-08-14 19:49:03 +02:00
scrawl
c065a4b203 Add ManualResourceLoader for global map overlay (Fixes #1736) 2014-08-14 19:01:03 +02:00
scrawl
94c2517d67 Fix race preview crash (Fixes #1808) 2014-08-13 19:30:46 +02:00
Marc Zinnschlag
93ed019ca3 Merge remote-tracking branch 'scrawl/master' 2014-08-13 09:04:35 +02:00
scrawl
e2ee3b2497 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/terrainstorage.cpp
2014-08-12 19:53:37 +02:00
MiroslavR
4f67f5d26f Spellcreation window: set captions to "0" if no effects are added (Fixes #1778) 2014-08-12 18:53:03 +02:00
scrawl
b374255447 Improve performance of moving spell window (don't recreate widgets unnecessarily) 2014-08-12 17:07:15 +02:00
scrawl
025f50a2df Improve performance of inventory window resize (don't update selection buffer unnecessarily) 2014-08-12 17:07:06 +02:00
MiroslavR
baa14511cf Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision 2014-08-12 12:18:38 +02:00
scrawl
63cb91db2e Add --export-fonts command line option 2014-08-11 20:40:02 +02:00
scrawl
5335f00958 Don't show Until Healed button when only fatigue is not full (Fixes #1798) 2014-08-11 20:40:02 +02:00
MiroslavR
4d403ed747 Rename and move functions for texture path correction 2014-08-11 20:04:44 +02:00
scrawl
f724732290 Implement mouse wheel journal navigation (Fixes #1790) 2014-08-11 00:51:54 +02:00
scrawl
399fa90ef1 Add missing include guard 2014-08-10 16:56:54 +02:00
MiroslavR
4873c4bd31 Generalize function for texture path correction (Fixes #1779) 2014-08-09 18:59:57 +02:00
scrawl
4a26dcb2ad Avoid calling RenderTarget::update from within loadResource 2014-08-08 15:46:33 +02:00
scrawl
143609be59 Set glyph width/height separately from texture coordinates (Bug #1096)
Requires MyGUI SVN
2014-08-08 15:46:13 +02:00
scrawl
44b517f66d Implement hiding inventory windows by double click on caption (Fixes #1690) 2014-08-06 20:13:58 +02:00
scrawl
c6bf9dfbfb Add ManualResourceLoader for character previews (Fixes #1752) 2014-08-06 20:13:57 +02:00
scrawl
0b1e997bdd Make sure dialogue is ended properly when closing it by using a service (Fixes #1755) 2014-08-06 20:13:57 +02:00
MiroslavR
42dceb641e Readd Azura's Star after recharging (Fixes #1765) 2014-08-06 19:50:10 +02:00
MiroslavR
8707f7b116 Fix spell creation magicka cost (Fixes #1763) 2014-08-06 13:19:40 +02:00
scrawl
6cb9382bf0 Adjust screen-sized widgets automatically using Stretch align 2014-08-01 17:15:28 +02:00
scrawl
715d357f24 Use a controller to move Drag&Drop widget with the mouse cursor 2014-08-01 17:14:35 +02:00
scrawl
a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 2014-08-01 16:25:41 +02:00
scrawl
261e755e73 Font hacking again (Fixes #1506) 2014-07-30 15:26:10 +02:00
scrawl
d1feb9ef02 Fix # in book text being interpreted as MyGUI color code 2014-07-30 15:26:10 +02:00
scrawl
1a6db097ed Fix dangling MWWorld::Ptrs in enchanting dialog after loading save game (Fixes #1722) 2014-07-29 15:32:22 +02:00
scrawl
c6d3b0b70b Moved merchant restock from trade start to dialogue start, since other services also interact with it. 2014-07-28 02:27:48 +02:00
scrawl
315b022d2d Add transfer gold from all services to NPC trade gold pool 2014-07-28 00:55:57 +02:00
scrawl
31d058b98c Add workaround for ScrollView messing up canvas size (Fixes #1700)
TODO: Create fixed ScrollView widget?
2014-07-27 20:33:44 +02:00
scrawl
16b089cdc8 Fix invisible enchanting price when self-enchanting was previously used. 2014-07-27 20:33:44 +02:00
scrawl
9c60e4d826 Change button caption from "Buy" to "Create" when self-enchanting 2014-07-27 20:33:44 +02:00
scrawl
b370c0f7b5 Enchanting: Don't check price on self-enchanting (Bug #1701) 2014-07-27 20:33:43 +02:00
scrawl
60499eff83 Hotfix for message boxes locking up the game 2014-07-25 19:48:37 +02:00
scrawl
4b3e12bfb4 Fix pinned widgets receiving mouse clicks in gamemode (Fixes #1686) 2014-07-24 18:04:44 +02:00
scrawl
469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwgui/levelupdialog.cpp
2014-07-24 02:33:46 +02:00
scrawl
103325bfb8 Change HUD enemy health bar to use actorId 2014-07-24 02:17:44 +02:00
scrawl
75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 2014-07-24 02:17:38 +02:00
MiroslavR
3b67e9b329 Rework level up dialog to behave more like vanilla 2014-07-21 20:56:02 +02:00
scrawl
10d4da7994 Fix date time in journal entries being off by one day (Fixes #1668) 2014-07-21 01:17:01 +02:00
scrawl
28a0899d2b Implement difficulty scaling (Fixes #1505) 2014-07-20 16:38:20 +02:00
MiroslavR
0f2305ae43 Clear selected spell when window manager is cleared 2014-07-20 13:07:47 +02:00
MiroslavR
d5381e1bc4 Dynamically resize skill widgets to fit their contents (Fixes #1610) 2014-07-19 14:04:38 +02:00
scrawl
08ce6ed7fb Attempt to restack item after repair or recharge (Fixes #1656) 2014-07-17 16:16:06 +02:00
scrawl
5839691530 Check for container organic flag before checking weight (Fixes #1654) 2014-07-14 17:27:36 +02:00
scrawl
6cd739678a Fix dangling model pointer after reference cleanup (Fixes #1653) 2014-07-14 16:53:58 +02:00
scrawl
7c7c71428a Don't crash if certain class doesn't exist 2014-07-13 14:26:59 +02:00
scrawl
8b404ee255 Fix not being able to exit dialogue using Escape when a Goodbye link appears 2014-07-13 06:42:24 +02:00
scrawl
f2799ea1d9 Reset item model when reference is reset (Fixes #1628)
This caused crashes when the window was resized after the reference no longer exists (e.g. when a savegame is loaded)
2014-07-12 18:53:22 +02:00
scrawl
5fbce67b9d Don't redraw ItemView if the size did not change 2014-07-11 04:30:44 +02:00
scrawl
a3a8f4da70 More font hackery. Will it ever end?
Fixes #1606
2014-07-08 10:30:45 +02:00
scrawl
85a1f9d37b Fall back to resolution selected from list when switching to fullscreen (Fixes #1599) 2014-06-30 00:08:39 +02:00
scrawl
082b6125a9 Fix crash during spell creation when an effect targeting a skill/attribute doesn't have one assigned yet (Fixes #1598) 2014-06-29 17:02:29 +02:00
scrawl
7f26843dc3 Reset key focus when the key focus widget is hidden (Fixes #1568) 2014-06-27 19:35:41 +02:00
scrawl
44fd526c98 Don't show disposition bar for creatures 2014-06-26 15:36:19 +02:00
scrawl
4aab4e1c26 Ignore item condition when determining value, except in trade (Fixes #1557) 2014-06-26 14:59:33 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
slothlife
9ea22324f7 Fix some MSVC warnings.
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
scrawl
9a26cf22e6 Implement toggleMenus 2014-06-20 18:51:00 +02:00
scrawl
8eab3abb15 Fix initial view offset for large world maps (Fixes #1523) 2014-06-19 19:03:12 +02:00
scrawl
185ff279a3 Add missing sound effect for mages guild transport 2014-06-19 03:29:36 +02:00
scrawl
c3e4160a0a Don't crash in StatsWindow for invalid faction rank values
PcRaiseRank: don't allow to raise rank beyond max rank
2014-06-18 23:50:55 +02:00
scrawl
d4678a8d55 Fix level up dialogue layout (Fixes #1393) 2014-06-18 16:57:53 +02:00
scrawl
1244da85df Make Detect Life spell detect NPCs when in werewolf form (Fixes #1527) 2014-06-17 16:27:33 +02:00
scrawl
1b610cdbd0 Allow following NPCs to fast-travel (Fixes #1501) 2014-06-16 03:17:31 +02:00
scrawl
78f30e2970 Fix a journal layout bug 2014-06-16 02:52:25 +02:00
scrawl
4f73e8bb71 Add items to player inventory upon drag start (Fixes #1507) 2014-06-16 02:52:25 +02:00
scrawl
d5b97005ab Make ESM::Faction skills optional (Fixes #1508)
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
9e6d21d95b Clear message boxes in windowmanager cleanup (Fixes #1496) 2014-06-15 14:18:16 +02:00
scrawl
8114f48469 Workaround per-frame resources leak in MyGUI. New vertex buffers were being created every frame. 2014-06-13 19:06:09 +02:00
scrawl
604d5ac000 Fix console reference label not resetting when loading save 2014-06-13 02:26:52 +02:00
scrawl
07d20c212b Fix crash activating quick key 1 2014-06-10 21:34:47 +02:00
scrawl
7b5482f25b Fix character selection caption when there is no character in settings.cfg 2014-06-10 19:01:18 +02:00
scrawl
5a955279bb Fix main menu background showing when resizing window during load 2014-06-10 18:49:42 +02:00
scrawl
3788fb042e Implement MenuTest script instruction (Fixes #1454) 2014-06-10 18:49:42 +02:00
scrawl
a90245147b Don't reset history when ForceGreeting is used and a dialogue window was already open for the same actor (Fixes #1423) 2014-06-10 18:46:16 +02:00
scrawl
c0c1db4490 Don't list non-usable items in QuickKeysMenu selection (Fixes #1427) 2014-06-10 03:28:21 +02:00
scrawl
271aac3fcc Savegame dialog: Grey out buttons if no save is selected 2014-06-10 02:47:02 +02:00
scrawl
311acfa8ff Add delete button to save load menu (Fixes #1453) 2014-06-10 02:27:38 +02:00