Marc Zinnschlag
634311c86c
Merge remote-tracking branch 'mrcheko/master'
2014-04-30 22:45:26 +02:00
mrcheko
e8f7d12c01
uninit bool and invalid iterator bugs fixes
2014-04-30 23:57:19 +04:00
Marek Kochanowicz
9e01a54d72
minor correction
2014-04-30 15:17:20 +02:00
Marek Kochanowicz
6aaa15b2e8
paged worldspace drop
2014-04-30 15:03:46 +02:00
Marek Kochanowicz
19dac9dc86
that would be it
2014-04-30 14:27:11 +02:00
Jeffrey Haines
5c9c467b26
Improved sneak.
2014-04-30 08:06:36 -04:00
Jeffrey Haines
14ebd8b110
Fixed logic in commit crime
2014-04-30 07:44:29 -04:00
Marek Kochanowicz
4d79f00e28
enable dragging on the region map cells
2014-04-30 13:32:54 +02:00
Thomas
10a5bb9464
Made code a bit more standardized and added a good bit of documentation.
2014-04-29 23:40:59 -04:00
Marek Kochanowicz
eeb18b533e
moved editlock to the dragrecordtable
2014-04-29 21:41:57 +02:00
Marc Zinnschlag
0c2843b0f7
some missing cleanup
2014-04-29 19:56:33 +02:00
Marek Kochanowicz
d376efe30b
handle dragging not-existing records
2014-04-29 19:34:06 +02:00
Thomas
8f90dd43ec
Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier
2014-04-29 12:52:08 -04:00
Marc Zinnschlag
9a1b5dc1c6
a bit of cleanup
2014-04-29 15:32:00 +02:00
Marc Zinnschlag
f6a876bc3d
added actor ID
2014-04-29 15:27:49 +02:00
cc9cii
7d990abd37
OpenCS changes to allow compilation with MSVC 11.0.
2014-04-29 22:46:55 +10:00
Marc Zinnschlag
8dc6ad5059
moved new flag from setupData function to Document constructor
2014-04-29 14:27:44 +02:00
Marc Zinnschlag
5f1d2f72f6
added basic loading GUI
2014-04-29 14:17:25 +02:00
Marc Zinnschlag
2906ade531
string fix
2014-04-29 13:16:58 +02:00
Marc Zinnschlag
4eeed4e2c7
Merge remote-tracking branch 'scrawl/return'
2014-04-29 12:27:27 +02:00
Marek Kochanowicz
18fc8acc71
able to drag existing cells from the regionmap
2014-04-29 12:27:26 +02:00
Marek Kochanowicz
853abb65c3
added new, later common, base for the regionmap and the table
2014-04-29 11:44:21 +02:00
scrawl
28ef236f0e
Don't allow setting a new return position if there already is one and we haven't reached it yet
2014-04-29 11:17:07 +02:00
Marc Zinnschlag
8fea2cfa2a
Merge remote-tracking branch 'mrcheko/master'
2014-04-29 10:03:29 +02:00
scrawl
1fd7a07b5e
Merge branch 'master' of https://github.com/OpenMW/openmw into return
...
Conflicts:
apps/openmw/mwmechanics/aisequence.cpp
apps/openmw/mwmechanics/aiwander.cpp
2014-04-29 09:14:13 +02:00
scrawl
9b36a13821
Feature #1289 : NPCs return to default position
...
Make stationary NPCs return to their previous position once combat/crime AI finishes.
2014-04-29 09:09:51 +02:00
scrawl
3780503275
Removed quicksave/quickload message boxes, now that the same text is shown in the progress bar
2014-04-29 07:07:03 +02:00
Marc Zinnschlag
3013c34d9b
Merge remote-tracking branch 'scrawl/master'
2014-04-28 21:46:05 +02:00
scrawl
7a0aeeaa38
Allow to delete savegames (shift + click)
2014-04-28 20:57:45 +02:00
scrawl
7f37f2c2be
Fixes #1187 : Make GetDistance handle actors in remote cells gracefully
2014-04-28 19:23:25 +02:00
Marc Zinnschlag
2e7b4e798e
Merge remote-tracking branch 'digmaster/master'
2014-04-28 19:22:54 +02:00
Lars Söderberg
d530bbe5cd
Implemented Scrawls alternative workaround.
2014-04-28 18:52:53 +02:00
scrawl
a35f7c73ae
Fixes #1286 (Dialogue topic list clips with window frame)
...
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
2014-04-28 18:40:29 +02:00
scrawl
518a32c19d
Fixes #1195 : Make NPCs equip torches in interiors under certain conditions
2014-04-28 18:33:42 +02:00
Thomas
885228ec02
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
2014-04-28 12:27:57 -04:00
Lars Söderberg
0513d0837c
Alignment tweaks and autosized buttons workaround
2014-04-28 17:54:55 +02:00
Lars Söderberg
04e5b9c72c
Right aligned version/revision
...
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.
Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.
Comments?
2014-04-28 16:23:07 +02:00
Lars Söderberg
b0bdd233ee
Center, switch and change text for confirmation buttons
...
The confirmation buttons for quitting or starting a new game were
driving me crazy by not being ok left and cancel right, as e.g. vanilla
is.
Then I noticed the text isn't the same as in vanilla either. It should
be yes/no, not ok/cancel.
To make it even more authentic I also centered the buttons. Had to
remove autosized buttons for this. I think it looks fine still.
Comments?
2014-04-28 16:05:27 +02:00
scrawl
84961d7843
Fixes #1254 : PcRank should return first rank if not in the faction
2014-04-28 15:31:18 +02:00
scrawl
b2119441b9
Fix bug in PcRank / PcNextRank
...
It was using the first faction instead of the actor's faction.
2014-04-28 15:26:40 +02:00
Marc Zinnschlag
421679b319
Merge remote-tracking branch 'scrawl/master'
2014-04-28 15:13:09 +02:00
scrawl
7e4a0c2478
Removed asserts
2014-04-28 15:00:52 +02:00
mrcheko
35c1724d39
unblock vertical aiming for combatants
2014-04-28 16:34:49 +04:00
scrawl
138fb4e29a
Bug #1265 : Fixed confirmation buttons align
2014-04-28 12:51:46 +02:00
scrawl
0796815da0
Ignore dead actors in getActorsFollowing/Fighting
...
Prevents dead enemies from disallowing resting near them
2014-04-28 11:44:56 +02:00
scrawl
27a05027f4
Fixes #1172 : Added basic loading/saving progress bar
...
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
2014-04-28 11:29:57 +02:00
scrawl
4555f6ddf6
Add text shadow to progress bar labels
2014-04-28 11:19:12 +02:00
Marc Zinnschlag
0b2371a05d
Merge remote-tracking branch 'thoronador/fix-minor-stuff'
2014-04-28 10:59:34 +02:00
Marc Zinnschlag
af322a9f77
Merge remote-tracking branch 'scrawl/master'
2014-04-28 10:48:57 +02:00
scrawl
1da99d9fc7
Remove unused variable
2014-04-28 10:26:24 +02:00
