Marek Kochanowicz
1fb18873cb
adding proxy model that is ment to be used by the dialoguesubview
2014-06-18 15:35:31 +02:00
Marek Kochanowicz
75b5513c6c
Column is responsible for telling that it can nest columns now.
2014-06-18 11:58:18 +02:00
Marek Kochanowicz
ce5e889015
Nested table sits inside it's own layout now.
2014-06-17 20:12:14 +02:00
Marek Kochanowicz
5bee682bb3
modified: ../../view/world/dialoguesubview.cpp
2014-06-17 14:58:25 +02:00
Marek Kochanowicz
03980034a5
Merge branch 'NonTableFields' of https://github.com/sirherrbatka/openmw
...
into NonTableFields
I have no idea what I'm doing
Conflicts:
apps/opencs/model/world/idtable.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/model/world/refidadapterimp.hpp
2014-06-17 14:21:50 +02:00
Marek Kochanowicz
defd0b1754
Merge branch 'dialog-fix' into NonTableFields
...
TODO stop failing epicly with git
2014-06-17 14:08:59 +02:00
Marek Kochanowicz
187fccc8cc
Merge branch 'dialog-fix' into NonTableFields
2014-06-17 12:58:14 +02:00
Marek Kochanowicz
32fcc9ad61
Trying to merge.
2014-06-17 11:14:12 +02:00
Marek Kochanowicz
bbe7854968
Corrected formatting to follow our standard better.
2014-06-17 10:46:54 +02:00
Marek Kochanowicz
d6288a8055
Remove unneded revert and delete slots
2014-06-16 11:58:55 +02:00
Marek Kochanowicz
786c68f09a
refactoring dialogue subview
2014-06-16 11:31:57 +02:00
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
649ce54369
merging
2014-06-09 11:53:06 +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
21a1f6f4ae
working on the issue
2014-06-09 10:35:39 +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
803a7514df
updated credits file
2014-06-08 11:33:39 +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
4800f2ccbe
Merge branch 'bug1196_alternate' into bug1196jumpdialog
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-06-06 22:30:07 -04:00
Fil Krynicki
97caa1f8a4
Alternative fix strategy by checking for binding state
2014-06-06 22:25:23 -04:00
Fil Krynicki
13c953cbb2
Made recommended changes
...
Maybe introduced a bug not allowing punching. Testing.
2014-06-06 16:21:28 -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
Arthur Moore
f9f278f645
Fixed a capitalization error.
...
Changed Interpolations to unsigned.
Also explained what's happening in the comments.
2014-06-06 07:00:04 -04:00
Marc Zinnschlag
83d5f2aaeb
factored out command creation from table view into a separate class
2014-06-06 12:43:21 +02:00
Arthur Moore
b90e4db871
Actually read in XYZ_ROTATION_KEY data instead of discarding it.
2014-06-06 01:26:28 -04: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
