Marc Zinnschlag
|
7cae61a202
|
Merge remote-tracking branch 'psi29a/master' into next
|
2013-03-23 18:51:05 +01:00 |
|
Bret Curtis
|
962b504129
|
add dpkg information for mwiniimporter, this blocked debian/ubuntu buildd from building
|
2013-03-23 16:20:10 +01:00 |
|
Marc Zinnschlag
|
0ce962e815
|
added specialisation column to skill table
|
2013-03-23 13:13:53 +01:00 |
|
Marc Zinnschlag
|
92f0098911
|
added new constructors for EnumDelegateFactory
|
2013-03-23 13:13:34 +01:00 |
|
scrawl
|
7beda509fe
|
Lighting should be done in view space instead of object space, so that attenuation also works correctly for scaled objects
|
2013-03-23 09:53:38 +01:00 |
|
scrawl
|
a2ca679beb
|
Added PC repair feature
|
2013-03-23 08:16:46 +01:00 |
|
scrawl
|
78f3f19f62
|
Thrown weapons, arrows and bolts shouldn't have item health
|
2013-03-22 14:28:50 +01:00 |
|
scrawl
|
20774f8f81
|
Added merchant repair feature
|
2013-03-22 14:13:10 +01:00 |
|
scrawl
|
8e2f9f5186
|
Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips
|
2013-03-22 12:24:09 +01:00 |
|
Marc Zinnschlag
|
feaf2b43fb
|
disabled and deleted objects where not correctly ignored during adding objects to a cell when it became active
|
2013-03-22 09:44:59 +01:00 |
|
scrawl
|
918cdcffc2
|
Split up components/esm/loadlocks
|
2013-03-22 05:50:54 +01:00 |
|
Marc Zinnschlag
|
b2f6f67d53
|
Merge remote-tracking branch 'scrawl/master' into next
|
2013-03-21 22:07:37 +01:00 |
|
scrawl
|
3277ef26da
|
Fix a crash when dropping objects without a collision shape
|
2013-03-21 21:08:23 +01:00 |
|
Marc Zinnschlag
|
8e472cc624
|
added description column to skill table
|
2013-03-21 14:38:06 +01:00 |
|
Marc Zinnschlag
|
fefe061294
|
added basic support for skills to editor
|
2013-03-21 14:31:32 +01:00 |
|
Marc Zinnschlag
|
7df0f6aaee
|
prepared skill record for use in editor
|
2013-03-21 14:30:27 +01:00 |
|
Marc Zinnschlag
|
947ab6635b
|
removed automatic detection of setting modified to the same value of base with subsequent setting modifiction state to base only (can cause problems with implicitly added records)
|
2013-03-21 14:29:31 +01:00 |
|
Marc Zinnschlag
|
a955068853
|
added universal IDs for skills
|
2013-03-21 13:40:55 +01:00 |
|
Marc Zinnschlag
|
1d1471b81c
|
fixed a bug in ESM::Variant::write (was affecting string values)
|
2013-03-21 12:57:10 +01:00 |
|
Marc Zinnschlag
|
9464f45d57
|
fixed an encoding problem. I hate you QString. I hate you so much
|
2013-03-21 12:47:22 +01:00 |
|
Marc Zinnschlag
|
cafbabde45
|
fixed broken loading of single files into the editor
|
2013-03-21 12:13:32 +01:00 |
|
Marc Zinnschlag
|
ebb1dab8e1
|
removed debugging leftovers
|
2013-03-21 10:19:07 +01:00 |
|
Marc Zinnschlag
|
5346508471
|
added kate junk to .gitignore
|
2013-03-21 10:16:32 +01:00 |
|
Marc Zinnschlag
|
d05508db52
|
switching editor id tables from QAbstractTableModel to QAbstractItemModel (in preparation for record types like containers)
|
2013-03-21 10:07:25 +01:00 |
|
Marc Zinnschlag
|
cd84b68e4b
|
silencing some warnings
|
2013-03-20 20:55:48 +01:00 |
|
Marc Zinnschlag
|
775f9e8402
|
Merge remote-tracking branch 'potatoesmaster/dialogue' into next
|
2013-03-20 20:53:14 +01:00 |
|
Emanuel Guevel
|
6783ff6748
|
Workaround to have dialogues until actor detection is implemented for NPCs
|
2013-03-20 20:10:55 +01:00 |
|
Emanuel Guevel
|
8de93db488
|
Coding style consistence
|
2013-03-20 20:10:55 +01:00 |
|
Emanuel Guevel
|
f25b56ac88
|
Add dialogue function: NotLocal
|
2013-03-20 20:10:54 +01:00 |
|
Emanuel Guevel
|
ad3478c8f2
|
Fix inverted dialogue functions (NotClass etc.)
The comparison present is useless for these functions.
|
2013-03-20 20:10:54 +01:00 |
|
scrawl
|
11aed7474e
|
Shadow cast on water
|
2013-03-20 18:34: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
|
2509b34ace
|
Enabled bloodmoon weather
|
2013-03-20 02:48:10 +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 |
|
scrawl
|
21cc7483e4
|
Fix broken weather transitions
|
2013-03-20 01:20:56 +01:00 |
|
Glorf
|
3bd545ed8e
|
In-console nonexistent class fix
|
2013-03-19 21:55:37 +01:00 |
|
Glorf
|
dd11ae04ee
|
Console code cleaned
|
2013-03-19 17:25:41 +01:00 |
|
pvdk
|
e76d03dcc4
|
Added a warning message to the importer dialog
|
2013-03-19 12:01:54 +01:00 |
|
Glorf
|
f5bf7254a8
|
Minor console selection improvements
|
2013-03-18 23:46:17 +01:00 |
|
Marc Zinnschlag
|
bf23e48d80
|
Merge remote-tracking branch 'scrawl/backgroundwindow'
|
2013-03-18 22:12:25 +01:00 |
|
Glorf
|
a07c910d0b
|
Feature #535: Console object selection improvements
|
2013-03-18 21:33:12 +01:00 |
|
Marc Zinnschlag
|
0092a2f437
|
Merge remote-tracking branch 'pvdk/firstrunfix'
|
2013-03-18 20:09:10 +01:00 |
|
Marc Zinnschlag
|
c53d7ba6d6
|
Merge remote-tracking branch 'pvdk/resolutionfix'
|
2013-03-18 19:59:20 +01:00 |
|
scrawl
|
f84db69ade
|
Remove the background window trick, which currently doesn't serve any purpose
|
2013-03-18 19:46:20 +01:00 |
|
Marc Zinnschlag
|
4711135e7f
|
workaround for faulty endif in Morrowind scripts
|
2013-03-18 12:05:54 +01:00 |
|
Marc Zinnschlag
|
e4ed5b836e
|
added ondeath script function
|
2013-03-18 11:04:47 +01:00 |
|
Marc Zinnschlag
|
fd2c07a6f4
|
delete death events on adding an actor to the scene
|
2013-03-18 10:54:47 +01:00 |
|
Marc Zinnschlag
|
61cb0f98a6
|
keep track of death events
|
2013-03-18 10:47:09 +01:00 |
|
Marc Zinnschlag
|
08f6d04960
|
constness fixes
|
2013-03-18 08:29:40 +01:00 |
|