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
|
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
|
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 |
|
Marc Zinnschlag
|
19c3b5516d
|
Merge remote-tracking branch 'glorf/fallbacks-next' into next
|
2013-03-18 08:14:25 +01:00 |
|
Marc Zinnschlag
|
6ef754c451
|
Merge remote-tracking branch 'scrawl/armorrating' into next
|
2013-03-18 07:53:20 +01:00 |
|
scrawl
|
95e1cdc07d
|
Move getArmorRating to MWWorld::Class.
|
2013-03-17 22:29:12 +01:00 |
|
scrawl
|
c66675b599
|
Fix the 'Take all' button taking equipped items when stealing
|
2013-03-17 22:28:28 +01:00 |
|
Glorf
|
5922637c58
|
Unblocked Solstheim weather that should work now.
|
2013-03-17 20:12:26 +01:00 |
|
Glorf
|
f3fd3a7691
|
Much more moons fallbacks
|
2013-03-17 19:36:14 +01:00 |
|
Marc Zinnschlag
|
46bde604f9
|
Issue #601: unary minus was interpreted as binary minus when used in an argument list without comma
|
2013-03-17 17:13:25 +01:00 |
|
Glorf
|
1369090a80
|
More moons fallbacks, minor weather fixes
|
2013-03-17 14:50:02 +01:00 |
|
Glorf
|
6165cd2c6b
|
Moons fallbacks partially implemented
|
2013-03-17 14:22:30 +01:00 |
|
Glorf
|
ea7f386e7d
|
Access to Fallback via getFallback
|
2013-03-17 13:50:15 +01:00 |
|
greye
|
52ed451ae7
|
fix eraseStatic() assumptions
|
2013-03-17 08:36:15 +04:00 |
|
scrawl
|
c07b3ea61d
|
Text defines for npc race, class, and faction should use the translated name
|
2013-03-17 04:20:30 +01:00 |
|
scrawl
|
dd57eabc3e
|
Better use an enum for magic effect IDs
|
2013-03-16 23:28:26 +01:00 |
|
scrawl
|
1666bc7740
|
Armor rating
|
2013-03-16 22:53:33 +01:00 |
|
scrawl
|
e8b08326dc
|
Corrected Id, Race, Class, Faction and Cell select functions to do the exact opposite as before. That is how they are displayed in the CS, anyway.
|
2013-03-16 20:52:05 +01:00 |
|
scrawl
|
cebcbe11f8
|
Implemented service refusal
|
2013-03-16 20:32:21 +01:00 |
|
scrawl
|
83932ebfe8
|
HLSL shader fix
|
2013-03-16 14:36:37 +01:00 |
|