Marek Kochanowicz
7eb82f74ae
Fixed complitaion.
2014-06-16 10:22:14 +02:00
Marek Kochanowicz
48691136fb
Merge remote-tracking branch 'refs/remotes/master/master' into dialog-fix
2014-06-16 09:44:49 +02:00
Marek Kochanowicz
8763309a1b
reformatting to make code easier to read
2014-06-09 13:31:15 +02:00
Marek Kochanowicz
9ee00534b9
check if index is valid before attempting to use it
2014-06-09 13:18:17 +02:00
Marek Kochanowicz
c8458654ac
correcting problems
2014-06-09 13:16:10 +02:00
Marek Kochanowicz
269a357644
Merge remote-tracking branch 'master/refs' into dialog-fix
...
Conflicts:
CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/world/dialoguesubview.cpp
2014-06-09 11:51:41 +02:00
Marek Kochanowicz
6f5935edb3
subview does not store row number anymore
2014-06-09 11:37:48 +02:00
Marek Kochanowicz
29231b8fc9
starting new branch
2014-06-09 10:26:53 +02:00
Marc Zinnschlag
48468b7d0c
some dialogue subview cleanup and start of command dispatching refactoring
2014-06-08 14:10:08 +02:00
Marc Zinnschlag
b717e3fcb8
Merge remote-tracking branch 'filkry/bug1196jumpdialog'
2014-06-08 11:25:34 +02:00
slothlife
51c45796b1
Fix physics to not trigger Bullet assert in Debug
...
When physics attempts to move by a very small amount, precision losses
caused Bullet to trigger an assert in debug from normalizing a zero
length vector.
2014-06-07 19:26:12 -05:00
Fil Krynicki
cd693b6d37
Fixed mouse closing containers, and injection/gui test order
...
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.
Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.
And fixed a comment.
2014-06-07 20:08:29 -04:00
Marc Zinnschlag
7ede6573eb
removed more hardcoded column numbers
2014-06-07 14:39:34 +02:00
Marc Zinnschlag
302e2f8e9a
fixed some proxy model problems related to column numbers
2014-06-07 14:32:12 +02:00
Marc Zinnschlag
e4a37ef709
removed some hardcoded column numbers
2014-06-07 13:06:19 +02:00
Marc Zinnschlag
85fca19fd9
replaced selection model in CommandDispatcher with a slightly slower but more robust implementation
2014-06-07 13:02:45 +02:00
Fil Krynicki
1d3a220d94
Added A_Use command to player controls.
2014-06-06 22:35:16 -04:00
Fil Krynicki
97caa1f8a4
Alternative fix strategy by checking for binding state
2014-06-06 22:25:23 -04:00
Marc Zinnschlag
f6ae967ba0
simplified Data constructor
2014-06-06 20:47:31 +02:00
Marc Zinnschlag
0668019c86
Merge remote-tracking branch 'scrawl/master'
2014-06-06 19:09:24 +02:00
scrawl
58d963d6e6
Fix warning
2014-06-06 18:43:30 +02:00
scrawl
b68a8e38cd
Remove unused map
2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5
Don't reserve Pauldron parts for robes ( Fixes #1396 )
2014-06-06 15:20:56 +02:00
Hallfaer Tuilinn
01283f531e
Fix for Bug #1409
2014-06-06 15:13:25 +02:00
scrawl
9627146bf4
Another fix for trade exploit (hopefully the last: Fixes #1408 )
2014-06-06 15:08:44 +02:00
Marc Zinnschlag
c6557e1ade
some UniversalId cleanup and enhancements
2014-06-06 14:25:06 +02:00
scrawl
f3cece8dec
Fix alchemy allowing same item ID in different slots ( Fixes #1407 )
2014-06-06 14:12:50 +02:00
Marc Zinnschlag
3e0c6ec732
some general cleanup; fixed two cases of dialogue subviews that allowed creating records where they shouldn't have
2014-06-06 13:09:17 +02:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
scrawl
40d6c8abf7
Remove horizontal messagebox layout, not used in vanilla ( Fixes #1402 )
2014-06-06 02:24:51 +02:00
scrawl
d442853b3e
Allow opposite gender's parts as fallback ( Fixes #1404 )
2014-06-06 01:30:23 +02:00
scrawl
c36decb855
Fix being able to place items on top of actors ( Fixes #1403 )
2014-06-06 00:43:24 +02:00
scrawl
3d103f3785
Don't block hits when in hand-to-hand combat (shield not visible)
2014-06-05 22:27:46 +02:00
scrawl
0063b63ae4
Don't use armor mitigation for fall damage
2014-06-05 22:23:57 +02:00
scrawl
6db936bb3a
Refactor item icon code into ItemWidget ( Fixes #1391 )
...
- Removed duplicate code
- Fixed missing magic backgrounds during item drag&drop
- Change background texture used for HUD icons
2014-06-05 22:13:18 +02:00
scrawl
f53e86cad9
Fix AiCombat being incorrectly added to player ( Fixes #1356 )
2014-06-05 21:51:57 +02:00
scrawl
1173957e56
Fix item weight displaying as 1e+3 for Stendarr's Hammer
2014-06-05 18:15:48 +02:00
scrawl
17f8b49db6
Add missing padding for item tooltip magic effects
2014-06-05 17:51:15 +02:00
scrawl
d2e98c4de1
Fix forced switch to third person on death not always working
...
For instance, when dying from fall damage
2014-06-05 17:21:02 +02:00
scrawl
b6e52ae8ab
Fix crash when loading a savegame after dying ( Fixes #1389 )
2014-06-05 17:01:22 +02:00
scrawl
4e235516c3
Work around missing character in french morrowind font (Bug #1390 )
2014-06-05 16:16:16 +02:00
scrawl
85c9871178
Use question mark for not found glyphs in the font
2014-06-05 16:15:47 +02:00
scrawl
cefa20bfb9
Fix not reacting to quit request while video is playing
2014-06-05 15:52:02 +02:00
scrawl
c0f1449004
Cycle with equipped items if all slots are occupied ( Fixes #1395 )
2014-06-05 14:54:07 +02:00
Marc Zinnschlag
1b9b275f30
fix for bug #1369
2014-06-05 13:40:37 +02:00
Marc Zinnschlag
a28a2bc2fe
simplified feature management for record tables
2014-06-05 10:28:10 +02:00
Marc Zinnschlag
c4e7386770
Revert "added changed reference tracking for cells"
...
This reverts commit f4334da42e
2014-06-04 21:12:23 +02:00
Marc Zinnschlag
5313862a46
Merge remote-tracking branch 'scrawl/master'
2014-06-04 15:14:29 +02:00
scrawl
00775035af
Add missing hasItemHealth for lockpicks/probes ( Fixes #1385 )
2014-06-04 01:03:12 +02:00
scrawl
d7f3cd75ac
Rewrite journal GUI topic list to use MWList
2014-06-03 16:04:18 +02:00
