e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
f0789352c6
Silence error message
10 years ago
5a759f8b0d
GUI cleanup fix
10 years ago
9de575ad42
Use IncrementalCompileOperation to incrementally upload OpenGL objects during the loading screen
...
For now, not much difference, but should result in a sizable speed up once MyGUI no longer needs the DYNAMIC flag (i.e. the loading screen truly renders in the background).
10 years ago
37e3118d21
FontLoader cleanup fix
10 years ago
283b252142
Stub InputManager
10 years ago
31ead3a9f4
Increase loading screen FPS
...
Now that it's rendered in a background thread, we can have a smooth loading bar at virtually no performance cost.
10 years ago
351fd842fd
Port loading screen
10 years ago
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
10 years ago
d772da3720
Main menu background videos
10 years ago
dc9b27acfe
Create manual GUI textures
10 years ago
8817f44d63
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
10 years ago
82c4d01b37
Add back resource handling workarounds to the gui code
10 years ago
b0804734e5
Port VideoWidget
10 years ago
223e3a53f5
Move OEngine::Gui::Layout to MWGui
10 years ago
6afb0e43ef
Port FontLoader - requires MyGUI patch from https://github.com/MyGUI/mygui/pull/69
10 years ago
a59940a2c7
Move MyGUI platform to components
10 years ago
db7fe1952d
Move MyGUI texture to a separate file
10 years ago
62847f0489
Use node masks to separate Scene and GUI
10 years ago
997347b01e
Silence -Wreorder warnings.
10 years ago
a27446c8fb
Remove unused headers
10 years ago
7809caf9dc
Dead code removal
10 years ago
15164e20f7
Cleanup fix
10 years ago
42d6c6140c
Add mygui backend by chris
10 years ago
8c810e3620
Move rng to components
10 years ago
26766b8e0a
Dead code removal
10 years ago
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
c92592493e
OpenMW: create a window and render the starting cell(s)
10 years ago
fe69dc2863
Made LineInfo a struct, as requested by Scrawl.
10 years ago
52de622e97
provide incremental update of SpellWindow ( Fixes #2411 )
...
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
10 years ago
6b6bed520d
removed redundant calls.
10 years ago
4e69e7cc0f
OpenMW compiles and runs w/o render window
10 years ago
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
5cb61fa01c
Don't mark gold as stolen, adjust stolen tooltip ( Fixes #2465 )
10 years ago
d573458896
Fix case sensitivity bug in default head/hair selection ( Fixes #2453 )
10 years ago
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
10 years ago
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
10 years ago
1d7f3474fa
Fixed more MSVC 2013 warnings.
10 years ago
f603a68144
Allow binding Hand To Hand in quick keys menu ( Fixes #2024 )
10 years ago
7fd1c2c2e2
CharacterCreation refactoring
10 years ago
48ea6286fd
Book/scroll window refactoring
10 years ago
37a6d7da76
WindowManager refactoring
10 years ago
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
10 years ago
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
10 years ago
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
10 years ago
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
10 years ago
653ddd3f25
Warning fix
10 years ago
8b84fa5579
Merge remote-tracking branch 'scrawl/master'
10 years ago
730138035d
Cycle infinite loop fix ( Fixes #2421 )
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
2eedb3acec
Include fix
10 years ago
da9bd09a8c
Merge remote-tracking branch 'miroslavr/master'
10 years ago
47c053444f
Make the jail progress last one second
10 years ago
a5847afdac
Fix ignored clicks on HUD mini-map ( Fixes #2388 )
10 years ago
6d62aa7544
Don't prompt for spell deletion when using cycling keys ( Fixes #2382 )
10 years ago
a139e4efb0
Grey out completed quests in journal quests list
10 years ago
3ccf4642b4
Implement ToggleScripts
10 years ago
218f789d88
Fix player DrawState reset when selecting enchanted item ( Fixes #2356 )
10 years ago
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
10 years ago
d3128a12b6
Remove a large include form mwbase/windowmanager.hpp
10 years ago
df5a08b6de
Move manualref code out of header
10 years ago
1230cf49bf
Properly center jail progress widget, fix a bug with it not disappearing if the console is open
10 years ago
1d9e973573
Add training progress bar, implement jail screen, tweak wait dialog ( Fixes #1714 )
10 years ago
9ce3e4b4e1
UI consistency fix in levelup dialog
10 years ago
61ec9196c8
Cap the displayed attribute multiplier in levelup to attribute points left to 100
10 years ago
55cd9b526c
Skill progress bar changed to match MW
10 years ago
ae77eacd7e
Skill progress refactoring
10 years ago
356d1c7657
ESSImport: convert stolen item tracker
10 years ago
bea88c3643
Stolen item tracking overhaul part 2 ( Fixes #2338 )
10 years ago
aa6ebcd75c
Change stolen items handling to match MW ( Fixes #1443 , Fixes #2290 )
10 years ago
955505c167
Remove unused function
10 years ago
0c6e2170db
Include cleanup
10 years ago
7542fb5cd9
Show map notes on door marker leading to the cell with the note ( Fixes #2284 )
10 years ago
54e79c8c98
Use mouse pressed event for pin button instead of mouse click
10 years ago
c093e284d9
Delegate cleanup
10 years ago
2346c3528d
Remove NpcStats::mProfit and store it in the script instead
...
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
10 years ago
d1b5956a98
Fix crash on exit
10 years ago
c0a88161b2
Get rid of unneeded setSize/setCoord overrides
10 years ago
9bcc84ceec
Add option to stretch menu backgrounds/cutscenes to the whole screen
10 years ago
4cbb79191f
Don't put duplicate lines in the console history
10 years ago
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
10 years ago
1410819e20
Dialog fix for line breaks in the middle of words.
...
Issue 1049
Adjust the TypesetBookImpl::Typesetter to not assume a word break
at the end of write() calls.
A word break is assumed if any of the other content insertion methods
are used (section break, add/select content, etc).
10 years ago
c883a73d30
Several warning fixes
10 years ago
3a88f4ebd5
Fix windows build, MessageBox is a defined symbol
...
Windows and its stupid defines...
10 years ago
f9cf31fcd5
ESSImport: convert custom map markers, not working for interiors yet
10 years ago
bb718f216d
Initialize ENAMstruct in SpellCreationDialog (Coverity)
10 years ago
de23ad5c8d
Change dynamic_cast to static_cast to make coverity happy
10 years ago
c3f3f8b3d0
Use only Cell records for saving progress bar ( Fixes #2259 )
10 years ago
f9227beedd
Add warning when loading a savegame that depends on non-existing content files ( Fixes #2261 )
10 years ago
579f5d232f
Move interactive messageBox to separate function
10 years ago
5b9d10f851
Reduce includes in MWGui
10 years ago
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
10 years ago
eecea4131f
Reduce MyGUI includes
10 years ago
4b704f665f
Reduce includes, move DragAndDrop to separate file
10 years ago
eb99ed697b
Reduce includes
10 years ago
ddd6e682bc
Dialogue: add conflict resolution for overlapping keywords ( Fixes #2245 )
10 years ago
928b9ee41b
Fix missing GUI mode update when showing soulgem dialog
10 years ago
ef7e0070a6
Don't right-shift signed integers which is implementation-defined
10 years ago
38a413a483
Merge remote-tracking branch 'scrawl/master'
10 years ago
13c5bd5cc2
Enchanting: fix skill-based cast cost bonus being applied twice
10 years ago
4e92f6ab48
Add commandline option to load a save game on startup
10 years ago
f267497c03
Allow separate summoned creature instances for each spell ID ( Fixes #2194 )
10 years ago
31f6ccdf4d
Merge remote-tracking branch 'internecine/bug2031'
10 years ago
464f8abb3f
List exterior cell names in tab completion ( Fixes #2252 )
10 years ago
c1955ef7fa
Fix enchanting dialog effect labels showing a duration for constant effects
10 years ago
ec1df719fe
Merge remote-tracking branch 'mrcheko/master'
10 years ago
a8621e6230
defaults are set to 1.0; remove contrast setting
...
(can be changed in config though); disable gamma control for not Windows
OSs
10 years ago
363d1f9207
Merge remote-tracking branch 'upstream/master'
10 years ago
2f0793390f
Fix cut off text for some widgets in the stats window
10 years ago
2fa0764c89
Merge remote-tracking branch 'swick/master'
10 years ago
da722a5cf1
Merge remote-tracking branch 'miroslavr/master'
10 years ago
764cd9ca16
disable "window border" setting in the ingame settings UI if fullscreen is enabled
10 years ago
6f72989cb1
SpellModel, SortFilterItemModel: case insensitive sorting
10 years ago
2e5e7370ba
Adjust default angle, FOV and viewport of character preview ( Fixes #2220 )
10 years ago
9a1bde684f
Sort class list in select class dialog
10 years ago
b8fa73dfa9
Preserve record ordering in Store
...
This fixes the default head/hair used for some races in the chargen UI.
10 years ago
5d7dcafa53
Make local map widget size configurable
10 years ago
0081a68376
Use fMagicStartIconBlink for spell effect indicator fading
10 years ago
877e07823d
Fix incorrect sound for spell creation success
10 years ago
fb542a64ec
Merchant items should be restocked instantly
10 years ago
37e11b7272
Adjust loading box size for large captions
10 years ago
866fdfe8bd
Crime system improvements
...
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
10 years ago
307b84e9f6
Add enemy health bar fading and use relevant GMSTs
10 years ago
a29abb85f1
Fix ItemView sizing bug
10 years ago
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
e85df00158
change setting "borderless" to "window border"
...
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
10 years ago
639fbfad0b
make borderless setting available to the UI
10 years ago
c796589420
Allow adding multiple Attribute/Skill effects in spell making ( Fixes #2224 )
10 years ago
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
10 years ago
0af5c7b379
Starting to clean up some heavy includes
10 years ago
899ae763e6
fixing a travis build problem
10 years ago
0dc9401269
Fix GUI crash due to outdated spells list
10 years ago
ec00c830e5
Fix missing armor rating label update
10 years ago
e4127aa491
Use space in ItemView more efficiently
10 years ago
c7e1c0b595
Fix weapon cycle getting stuck for same item IDs
10 years ago
935cccf974
Implement weapon/spell cycling hotkeys ( Fixes #1024 )
10 years ago
4d5adfb5dd
Fix being able to use enchantments of items that failed to equip ( Fixes #2215 )
10 years ago
79237d16a7
Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu
...
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
10 years ago
c5a604453e
Fix several book formatting issues ( Fixes #2204 )
10 years ago
03da21f088
Remove redundant GUI element showing during loading screens
10 years ago
e69cf11029
Hide tooltips during loading screens
10 years ago
cf5fc60e86
Make ToggleMenus affect tooltips ( Fixes #1989 )
10 years ago
623783cd6a
Enchanting: fix cast cost for "on use" enchantments being set incorrectly
10 years ago
619ea846b4
Enchanting: fixed case where no range types at all are allowed (e.g. a Constant Effect item with an effect that does not allow the Self range-type)
10 years ago
74c345f790
Enchanting: fix being able to create On Touch / On Target constant effect enchantments (this combination makes no sense)
10 years ago
95219a7936
Show currently selected input type for settings window
10 years ago
c37881ead1
Joystick Support
10 years ago
9a1b7cbe52
Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row ( Fixes #1986 )
10 years ago
83dcf9ce4b
Overwrite existing records in IndexedStore ( Fixes #2182 )
10 years ago
fee08f97ed
Fix crash in character preview for non-existing meshes ( Fixes #2128 )
10 years ago
3519d23518
Race dialog: remove incorrect assumption about numeric index in head/hair record IDs
10 years ago
f9ae0d9d66
Fix dialogue goodbye link conflicting with choice links
10 years ago
6e1a11f322
Queue screen fade operations invoked by scripts
10 years ago
ada4e37556
Fix race preview texture not being destroyed properly ( Fixes #2098 )
10 years ago
d5768af952
Fix INT_MIN trade exploit ( Fixes #2096 )
10 years ago
9c5f156793
Fixes tooltip displaying 0 durations
10 years ago
a4be214fb1
Merge remote-tracking branch 'scrawl/master'
10 years ago
e01795556f
Suppress some warnings for MSVC.
10 years ago
b39d69e98c
Videoplayer fixes, play/pause & seeking
...
- Fix rindex overflow
- Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
- Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
- Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)
The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
10 years ago
e2bad395e5
Leak fix
10 years ago
19b380d0b4
Merge remote-tracking branch 'scrawl/master'
10 years ago
eb1c24ffe6
Refactor video player engine to get rid of MWSound dependencies
...
- Split video player to separate source files.
- Move video player engine sources to extern/ (repository will be set up on github soon).
- Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
- Handle conversion of unsupported channel layouts via ffmpeg's swresample.
10 years ago
94d5151273
Merge remote-tracking branch 'miroslavr/master'
10 years ago
f2877c69d7
Fix old alchemy apparatus still showing in alchemy window after removal
10 years ago
192069a181
Add automatic potion naming
10 years ago
ed6bdc0bde
Use all topics to search for keywords in dialogues ( Fixes #2013 )
...
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
10 years ago
5f11ccc298
Show tooltip for non-affordable list items ( Fixes #2025 )
10 years ago
c3ef39eb6f
Fix ItemWidget text cleanup ( Fixes #2022 )
10 years ago
c4e81adb83
Fix settings window being too small for all tabs on some localizations
10 years ago
eb45793eab
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
10 years ago
4d62541b62
fix usage of numeric_limits static functions min() and max()
...
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
10 years ago
8456741eaa
Fix blindness and create a separate fader for it
10 years ago
8dd95fd77e
Construct hit fader with correct texture right away to prevent mygui warning
10 years ago
2162a9e1b9
Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available
10 years ago
0ae604990e
Implement continuous damage indication ( Fixes #1970 )
10 years ago
4dc613a04b
Merge branch 'master' of github.com:OpenMW/openmw
10 years ago
3fd10d2a82
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
10 years ago
82b4148a62
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
10 years ago
f29a71b498
remove unused var. mSoftwareCursor in WindowManager
10 years ago
138e3032ce
Fix: initialize boolean field with boolean value, not NULL
10 years ago
db38108801
fix uninitialized pointer variables in some classes
10 years ago
a5245d5a13
remove unused dummy variable
10 years ago
70fd531722
None texturing filtering enable for android by default
10 years ago
f75721a217
Add none texture filtering .It is fixes a bug with black objects in shaders glsles
10 years ago
d1dc9951d4
Do not display werewolf overlay in third person
10 years ago
ff74d54e98
Merge branch 'master' of github.com:OpenMW/openmw
10 years ago
9cce3bc31b
Implement fDispositionMod according to research wiki
10 years ago
e1799cbcf4
Fix a typo in condition
10 years ago
de2cb8926a
Feature #1697 : Queue fade operations, implement hit fader & werewolf overlay
10 years ago
95be7ea738
Revert spelling change to preserve consistency, fix a typo
10 years ago
4829b1f9cc
Support "right" alignment in books
10 years ago
a13039ad1f
Allow alignment for images in books
10 years ago
3287d0b6ef
Fix line breaks around IMG tags.
10 years ago
c5e85ebddc
Merge branch 'master' of github.com:OpenMW/openmw
10 years ago
81a9dc0655
Hotfix for not being able to scroll the world map
10 years ago
083bcaf483
Fix journal quest logs not being marked finished when there are multiple quest IDs in the log
10 years ago
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
10 years ago
861cc26aa6
Don't sell racial spells ( Fixes #1961 )
10 years ago
7e10818bdf
Fix uninitialized flags for custom-made spells
10 years ago
0bd9f30c67
Remove comment for old MyGUI version
10 years ago
88da7f5157
Adjust border skin for loading bar and message boxes to match vanilla MW
10 years ago
795dfdb557
Fix size_t underflow for journals with 1 page ( Fixes #1958 )
10 years ago
ff0b4e0583
Add debug window (F10), displays Bullet's profiler output
10 years ago
7c52d05f85
Disable topics list visually when in a choice
10 years ago
e9ed0211c9
Attempt to fix Clang warnings
10 years ago
58571f7ac2
Revert "Transfer item ownership to the buyer if item wasn't stolen"
...
Fixes #1953 .
This reverts commit 5d77c5e8ca
10 years ago
508113f271
Resolve merge conflict
10 years ago
1c4e52a0e5
Book formatter: Fix an excessive line break case
10 years ago
cb5f661596
Book formatter: Support FONT closing tag, minor code cleanup
10 years ago
7252cb63a6
Fix cppcheck issues
10 years ago
790e0150b1
Fix global map markers being duplicated when cell is visited again
10 years ago
18be152ab1
Allow dragging map even when a marker is hovered
10 years ago
97df7c9b22
Get rid of markers.png and use original MW texture, cleanup
10 years ago
4f0fc79ea4
Change global map cell size from 24 to 18 and make it configurable
10 years ago
0bc840aadd
Add NumericEditBox widget
10 years ago
6b65502557
Add properties for new widget classes to MyGUI plugin
10 years ago
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
10 years ago
1afcc7adb5
Add imported font colors from openmw.cfg to MyGUI plugin
10 years ago
088d01d727
Minor cleanup
10 years ago
0f99a959eb
Update barter offer for all items when another item is added ( Fixes #1935 )
10 years ago
5d77c5e8ca
Transfer item ownership to the buyer if item wasn't stolen ( Fixes #1933 )
10 years ago
175d4f3d44
Merge remote-tracking branch 'ragora/playdeathlevelupmusic'
10 years ago
56858c98b1
Merge remote-tracking branch 'miroslavr/master'
10 years ago
06e683d378
Added code to play music on level up and on death
10 years ago
22c71cec18
Check for text size
10 years ago
608e1518a5
Hack to prevent newlines at the end of books possibly creating unnecessary pages for mygui versions lower than 3.2.2
10 years ago
f87d7c3fce
Book formatter: Do not insert last page if it's empty, code cleanup
10 years ago
4b1df64fba
Book parser: Fix comparison between signed and unsigned integer expressions
10 years ago
51cd2678ae
Book formatter: Fix last block of text not displaying
10 years ago
c362ec0f95
Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup
10 years ago
b1e74e2a85
Remove support for Ogre 1.8 versions
10 years ago
d3554084ad
Fix weird behaviour of options menu sliders when value was changed out of bounds via cfg file
10 years ago
f5868f7ae1
Fix layout problems in generate class result dialog
10 years ago
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
10 years ago
25e96b8c7b
InteractiveMessageBox: Define a maximum width for the message text
10 years ago
84d27d55e2
Remove redundant includes
10 years ago
4f89c3e77a
Rework book formatter ( Fixes #1148 )
10 years ago
65ddf7acfe
Merge remote-tracking branch 'scrawl/master'
10 years ago
9c0649c11d
Add basic framework to retrieve font colors from fallback settings (Feature #704 )
10 years ago
cbc242d857
Move item count text to ItemWidget
10 years ago
b145d183ae
Fix incorrect alchemy failure handling when an effect has a zero magnitude/duration ( Fixes #1922 )
10 years ago
08499ea51f
Fix Calvus Horatius AiFollow package not being removed after he quits as result of negative profit
10 years ago
ac97a0f99d
Fix dialogue choices being displayed in incorrect order
10 years ago
09042ba6d9
Use object name instead of ID when available for tooltips
10 years ago
19f469c7db
Merge remote-tracking branch 'scrawl/master'
10 years ago
scrawl
Marc Zinnschlag
Rohit Nirmal
dteviot
MiroslavR
Alexander "Ace" Olofsson
Jordan Ayers
mrcheko
Sebastian Wick
Digmaster
Internecine
cc9cii
Thoronador
Nikolay Kasyanov
sylar
Ragora