Marc Zinnschlag
|
3f846a50d9
|
Merge remote-tracking branch 'galdor557/master'
Conflicts:
apps/openmw/mwgui/travelwindow.cpp
|
2013-04-11 10:15:42 +02:00 |
|
Britt Mathis
|
6128b9276f
|
Removed non-essential includes from all MWGui header files.
|
2013-04-11 00:21:56 -04:00 |
|
Britt Mathis
|
f7383905b7
|
Finally eliminated calls to MWBase::WindowManager in constructors
|
2013-04-10 14:46:21 -04:00 |
|
Britt Mathis
|
d768f6b57e
|
Deleted *_* files in MwGui, builds.
|
2013-04-10 13:05:15 -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
|
0e7d555cdf
|
Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.
|
2013-04-09 20:31:00 +02:00 |
|
Marc Zinnschlag
|
ef09b1cac8
|
Merge remote-tracking branch 'glorf/bugfix-1'
|
2013-04-08 20:23:18 +02:00 |
|
Glorf
|
2f52df22ce
|
Bugfix #553
|
2013-04-08 19:00:38 +02:00 |
|
scrawl
|
d0bcf83091
|
Adjust player position to ground after using travel services
|
2013-04-08 16:30:18 +02:00 |
|
scrawl
|
a7de870a44
|
Fix mercenary not updating its profit when item was dragged onto the player avatar
|
2013-04-08 16:21:18 +02:00 |
|
scrawl
|
480467b6eb
|
Reset the 'owner' field for items that were legitimately bought from an NPC.
|
2013-04-07 21:53:11 +02:00 |
|
scrawl
|
f3c8cd2065
|
Don't buy/sell keys which are set to open a lock
|
2013-04-07 21:38:53 +02:00 |
|
Marc Zinnschlag
|
034ebf8ffd
|
Merge remote-tracking branch 'scrawl/master'
|
2013-04-04 19:57:55 +02:00 |
|
Marc Zinnschlag
|
7136ac0079
|
added missing attribute columns to faction table
|
2013-04-04 10:58:53 +02:00 |
|
scrawl
|
43cdbd033d
|
Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips
|
2013-04-03 21:17:31 +02:00 |
|
scrawl
|
8ca88d1a70
|
Fix merchant repair menu allowing repair of repair items
|
2013-04-03 21:17:31 +02:00 |
|
Marc Zinnschlag
|
32d3fe0e35
|
Merge remote-tracking branch 'glorf/enchanting'
|
2013-04-03 19:39:18 +02:00 |
|
Glorf
|
2179619721
|
Small enchanting fix
|
2013-04-03 18:06:11 +02:00 |
|
Glorf
|
ae3e4ecf8b
|
Finished enchanting
|
2013-04-03 18:02:30 +02:00 |
|
scrawl
|
aac2ba1d5f
|
Fix loading screen looking for wallpapers in a fixed group.
|
2013-04-03 12:24:13 +02:00 |
|
scrawl
|
05a5cb3ae4
|
Improved responsiveness of the inventory window when resizing.
|
2013-04-03 00:27:29 +02:00 |
|
Glorf
|
369cf0b4ca
|
Enchanting price mechanics
|
2013-04-02 20:46:48 +02:00 |
|
Marc Zinnschlag
|
df658d29f0
|
Merge branch 'faction'
|
2013-04-02 14:21:51 +02:00 |
|
Marc Zinnschlag
|
f9f520df34
|
adjusted faction record to increase consistency with other records
|
2013-04-02 13:59:45 +02:00 |
|
Marc Zinnschlag
|
751c679255
|
Merge remote-tracking branch 'glorf/enchanting'
|
2013-04-01 17:35:04 +02:00 |
|
Glorf
|
d29a42dcbe
|
Fixed enchanting mechanics
|
2013-03-31 23:18:23 +02:00 |
|
scrawl
|
8fd961bbac
|
Fix ReferenceInterface not resetting the Ptr after it was deleted, causing onReferenceUnavailable to be called every frame. Fix inputmanager hiding the cursor when it shouldn't.
|
2013-03-31 15:50:48 +02:00 |
|
scrawl
|
1a2daa3bc1
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
|
2013-03-31 14:50:03 +02:00 |
|
scrawl
|
bc6e1fd981
|
Add missing files
|
2013-03-31 14:36:03 +02:00 |
|
scrawl
|
b0199c703c
|
Companion UI
|
2013-03-31 13:13:46 +02:00 |
|
scrawl
|
e27e53f607
|
Fix not playable body parts appearing in the race selection menu.
|
2013-03-30 20:04:05 +01:00 |
|
Glorf
|
7dbc779c3a
|
Self-enchanting mechanics
|
2013-03-30 19:08:42 +01:00 |
|
scrawl
|
0f0cc0e3e3
|
Fix a few gold conditions that I missed, trade window was affected
|
2013-03-30 18:29:21 +01:00 |
|
scrawl
|
51204f098e
|
Added soulgem dialog; made interactive message boxes not close the previous UI
|
2013-03-30 15:51:07 +01:00 |
|
scrawl
|
e7af718b55
|
Remove unnecessary WindowManager::messageBox arguments
|
2013-03-30 12:56:37 +01:00 |
|
scrawl
|
04673b2f14
|
Don't enchant if the enchantment value is too high for the item
|
2013-03-30 12:54:20 +01:00 |
|
Marc Zinnschlag
|
573368849b
|
Merge remote-tracking branch 'glorf/enchanting'
Conflicts:
apps/openmw/CMakeLists.txt
|
2013-03-29 16:48:21 +01:00 |
|
Glorf
|
86275e5bd4
|
Some enchanting fixes
|
2013-03-29 12:00:09 +01:00 |
|
Glorf
|
6643fe789c
|
Enchanting system
|
2013-03-28 17:41:00 +01:00 |
|
scrawl
|
564256c4e1
|
Fix the spell icon panel being visible when it shouldn't.
|
2013-03-27 18:04:15 +01:00 |
|
scrawl
|
6a2b87e14a
|
Fix dialogue response coloring for creatures
|
2013-03-25 17:37:59 +01:00 |
|
scrawl
|
4be0c6b708
|
Fix topics not being selectable for creatures
|
2013-03-25 17:32:01 +01:00 |
|
Marc Zinnschlag
|
6c76e97bbc
|
fixed day count in rest dialogue
|
2013-03-25 11:53:02 +01:00 |
|
scrawl
|
a2ca679beb
|
Added PC repair feature
|
2013-03-23 08:16:46 +01:00 |
|
scrawl
|
20774f8f81
|
Added merchant repair feature
|
2013-03-22 14:13:10 +01:00 |
|
scrawl
|
918cdcffc2
|
Split up components/esm/loadlocks
|
2013-03-22 05:50:54 +01:00 |
|
scrawl
|
4cbb202306
|
Several tooltip fixes
|
2013-03-20 03:31:01 +01:00 |
|
scrawl
|
b9c3a4816d
|
Fix dialogue topics still being accessible in the history pane when they shouldn't be
|
2013-03-20 03:30:15 +01:00 |
|
scrawl
|
6c1ff8caca
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwworld/weather.cpp
components/fileorderlist/model/datafilesmodel.cpp
|
2013-03-20 02:29:03 +01:00 |
|
Glorf
|
3bd545ed8e
|
In-console nonexistent class fix
|
2013-03-19 21:55:37 +01:00 |
|