scrawl
8e0a988289
Icon fix
2015-06-01 01:32:02 +02:00
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
82c4d01b37
Add back resource handling workarounds to the gui code
2015-05-01 18:37:24 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
dteviot
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
2015-03-08 13:07:29 +13:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
scrawl
bb718f216d
Initialize ENAMstruct in SpellCreationDialog (Coverity)
2015-01-12 23:29:58 +01:00
scrawl
5b9d10f851
Reduce includes in MWGui
2015-01-10 03:56:06 +01:00
scrawl
728b842e72
Use MyGUI::utility in favor of boost lexical_cast
2015-01-10 03:01:01 +01:00
scrawl
eecea4131f
Reduce MyGUI includes
2015-01-10 02:50:43 +01:00
scrawl
c1955ef7fa
Fix enchanting dialog effect labels showing a duration for constant effects
2015-01-05 18:57:08 +01:00
scrawl
363d1f9207
Merge remote-tracking branch 'upstream/master'
2014-12-30 23:01:45 +01:00
Marc Zinnschlag
da722a5cf1
Merge remote-tracking branch 'miroslavr/master'
2014-12-26 16:05:20 +01:00
scrawl
877e07823d
Fix incorrect sound for spell creation success
2014-12-24 15:45:13 +01:00
MiroslavR
c796589420
Allow adding multiple Attribute/Skill effects in spell making ( Fixes #2224 )
2014-12-22 01:54:24 +01:00
Alexander "Ace" Olofsson
462b41a3a8
Missing files, aka; Why you shouldn't stresscommit
2014-12-19 11:26:54 +01:00
scrawl
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)
2014-12-10 17:55:48 +01:00
scrawl
74c345f790
Enchanting: fix being able to create On Touch / On Target constant effect enchantments (this combination makes no sense)
2014-12-10 17:40:59 +01:00
Thoronador
db38108801
fix uninitialized pointer variables in some classes
2014-10-11 01:20:33 +02:00
scrawl
7e10818bdf
Fix uninitialized flags for custom-made spells
2014-10-02 13:55:42 +02:00
scrawl
7252cb63a6
Fix cppcheck issues
2014-09-26 17:48:14 +02:00
scrawl
6b65502557
Add properties for new widget classes to MyGUI plugin
2014-09-25 16:25:08 +02:00
MiroslavR
d16e0c063c
Enchanting, spellmaking dialog: check for flags when listing known effects
2014-08-24 21:59:52 +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
MiroslavR
4f67f5d26f
Spellcreation window: set captions to "0" if no effects are added ( Fixes #1778 )
2014-08-12 18:53:03 +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
MiroslavR
8707f7b116
Fix spell creation magicka cost ( Fixes #1763 )
2014-08-06 13:19:40 +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
Digmaster
e0356cf89d
Added support to close modal windows with Esc
2014-05-27 03:00:31 -04:00
Emanuel Guevel
1e4a854433
Remove static method MWWorld::Class::get(&Ptr)
...
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
scrawl
525ce2f042
Some cleanup - move definitions to implementation file
2014-01-18 10:52:16 +01:00
scrawl
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
2014-01-08 23:37:46 +01:00
scrawl
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
2014-01-08 18:39:44 +01:00
scrawl
b6c22ad5d9
Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.
2013-11-21 17:19:30 +01:00
scrawl
aa4b2d9504
Fix uninitialized mSkill/mAttribute for spellmaker spells
2013-11-16 01:19:39 +01:00
PLkolek
8bc8c38f2d
Spell cost is updatedon every change in enchanting and spellmaking.
2013-07-31 13:33:30 +02:00
PLkolek
7fd7621458
Fixed area slider in self enchantments.
2013-07-31 12:26:34 +02:00
fstp
a3b2a76e60
Added virtual destructors to classes LocalMapBase and EffectEditorBase.
2013-06-09 23:08:57 +02:00
Britt Mathis
60fadaeaf0
Cleaned up includes in implementation files
2013-04-16 20:16:22 -04:00
Britt Mathis
f7383905b7
Finally eliminated calls to MWBase::WindowManager in constructors
2013-04-10 14:46:21 -04:00
Britt Mathis
ce9bc6d9ba
MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions
2013-04-10 00:32:05 -04:00
scrawl
e7af718b55
Remove unnecessary WindowManager::messageBox arguments
2013-03-30 12:56:37 +01:00
Glorf
6643fe789c
Enchanting system
2013-03-28 17:41:00 +01:00
Marc Zinnschlag
f4ee8e2642
Issue #479 : Added additional magnitude parameter to known spells
2013-01-12 13:10:20 +01:00
scrawl
d53a7ade1e
method names, disposition uint->int
2012-11-09 14:42:09 +01:00
scrawl
ae78eaeb28
fixed training, fixed todo comments
2012-11-08 23:21:03 +01:00
scrawl
b2afb1fd5c
Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/spellbuyingwindow.cpp
apps/openmw/mwgui/trainingwindow.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2012-11-08 23:16:40 +01:00
greye
9dc9098fa7
update MWBase::World interface since records contains own id
2012-11-08 01:52:34 +04:00
Marc Zinnschlag
918316168f
Merge remote-tracking branch 'greye/store' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
2012-11-07 19:34:28 +01:00
scrawl
646e689239
clear name edits when opening alchemy / spell creation
2012-11-05 20:47:28 +01:00
greye
42aae566a7
applying new interface vol.5, inconsistent
2012-11-05 23:41:26 +04:00
gugus
aaf1b66c7e
BarterOffer is used in other trading services too
2012-11-05 19:53:55 +01:00
greye
8691eac557
resolve Script::mData.mName -> mId, resolve moving ESMStore
2012-11-05 17:41:36 +04:00
scrawl
234716daa6
finished spell creation
2012-10-23 11:42:38 +02:00
scrawl
c991f68a2d
buying created spell
2012-10-15 21:54:19 +02:00
scrawl
f154031e54
last bits of the gui
2012-10-11 18:26:29 +02:00
scrawl
025e820703
abstracted code and use it in enchanting window as well
2012-10-03 15:36:10 +02:00
scrawl
1c0dd3ccc5
some editing code
2012-10-03 15:06:54 +02:00
scrawl
21493c2dbd
added magic effect flags from Research wiki page
2012-10-01 23:33:07 +02:00
scrawl
ff2c2d2b96
Merge branch 'master' into spellcreation
...
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
2012-10-01 17:54:45 +02:00
scrawl
b63d205c6e
change the select attribute/skill dialogs to be reusable
2012-09-24 22:09:38 +02:00
scrawl
d393f551ed
edit effect dialog
2012-09-24 08:09:16 +02:00
scrawl
9d7c35ae48
and go
2012-09-23 00:36:20 +02:00
