Wareya
c98a815581
Remove debug printing from previous commit
2013-02-16 13:37:25 -05:00
Wareya
f0220fb06b
Implement "Rest Until Healed"
...
Fixes: https://bugs.openmw.org/issues/563
2013-02-16 13:35:03 -05:00
scrawl
a5c8d5748f
fix FailedAction.
2013-02-16 18:05:25 +01:00
scrawl
0bc34c1c0d
Action::executeImp returns a bool value to indicate if the sound should be played.
2013-02-16 16:40:44 +01:00
scrawl
7d918caa93
Don't allow dialogue if player controls are disabled.
2013-02-16 16:26:40 +01:00
Marc Zinnschlag
910858c300
Merge remote-tracking branch 'sergeyshambir/guiconvience' into next
2013-02-16 14:50:42 +01:00
Douglas Mencken
eb09662f1d
Don't include boost/filesystem/v3/operations.hpp, use boost/filesystem/operations.hpp instead.
...
It is boost headers' job to deal with their internals.
2013-02-16 14:49:11 +01:00
Douglas Mencken
a3e421167b
esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel
...
Signed chars, unsigned chars... Just use int for index everywhere.
2013-02-16 14:48:44 +01:00
Chris Robinson
158e18b98d
Remove an unused method
2013-02-16 00:30:07 -08:00
Chris Robinson
c965bd8e18
Increase step size to 30
2013-02-15 17:22:55 -08:00
Douglas Mencken
df5919f2c5
Use `signed char' explicitly where needed. It is important because:
...
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
and unsigned char.
- Assuming that char is always unsigned or signed can lead to
compile-time and run-time errors.
You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).
Conflicts:
components/esm/loadcell.hpp
2013-02-15 20:28:14 +01:00
scrawl
4da11a96a5
Fixed gold ref count always becoming 1 when dropped on the ground
2013-02-15 17:34:55 +01:00
Pieter van der Kloet
fd430dc5a9
Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget
...
Conflicts:
apps/launcher/datafilespage.cpp
components/fileorderlist/datafileslist.cpp
2013-02-15 15:38:30 +01:00
Pieter van der Kloet
ee27e3bb58
Merge remote-tracking branch 'upstream/next' into settingsnext
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
apps/launcher/datafilespage.hpp
apps/launcher/graphicspage.cpp
components/fileorderlist/utils/filedialog.cpp
components/fileorderlist/utils/filedialog.hpp
2013-02-15 15:21:14 +01:00
Pieter van der Kloet
0e143b1926
Merge remote-tracking branch 'upstream/master' into settingsparser
2013-02-15 14:45:19 +01:00
Pieter van der Kloet
43e9ad8733
The text color of the profiles dialog now turns red on invalid names
2013-02-15 14:26:09 +01:00
Pieter van der Kloet
990895fd2b
Mainwindow size and position now gets saved/restored
2013-02-15 14:12:25 +01:00
Chris Robinson
c57001e3bd
Remove an unused field
2013-02-15 05:11:06 -08:00
Chris Robinson
e4341525c8
Add a jump state
...
Currently unused
2013-02-15 04:45:28 -08:00
Chris Robinson
ff0099fa6e
Scale the animation speed based on the animation velocity and movement speed
...
This may not be totoally correct since it takes the whole animation into
account, rather than just the looping portion. But it's good enough for now.
2013-02-15 02:15:39 -08:00
Chris Robinson
e1a1530774
Better implement Npc::getSpeed
2013-02-15 01:27:57 -08:00
Chris Robinson
3348e8a436
Clarify a comment
2013-02-14 22:41:14 -08:00
Chris Robinson
ac717373b1
Add a method to check if an object is on the ground
2013-02-14 22:35:15 -08:00
Chris Robinson
18b606fddf
Use the PhysicActor's set/getOnGround method
2013-02-14 20:10:04 -08:00
Chris Robinson
15dc82f454
Increase step size to 15
2013-02-14 18:59:05 -08:00
Chris Robinson
a729b1b12a
Snap to the ground after moving
...
Depends on two factors:
* End up close enough above to a walkable plane (it's within sMaxStep units
down and is angled sMaxSlope or less)
* Started out on the ground without any upward movement
This also reduces the distance needed to be to the ground to 4 (from 10), and
ensures the actor is 2 units above the ground when on it. Downward force is
also removed when starting on the ground.
2013-02-14 18:34:51 -08:00
Pieter van der Kloet
1b9cf8c23f
More work on integrating the settings parser, profiles are handled correctly
2013-02-15 01:20:48 +01:00
scrawl
7604fb51b6
CG no longer listed in the settings if the plugin isn't loaded.
2013-02-14 23:17:21 +01:00
scrawl
492e0f2ccf
Switched objects shaders to vertex lighting, to accomodate badly placed lights in morrowind.
...
Fixed a very obvious land <-> water seam.
2013-02-14 19:45:07 +01:00
Pieter van der Kloet
5d1bede9e5
Forgot to add two files
2013-02-14 11:20:47 +01:00
scrawl
6a49ea9b4f
Cleaning out some old bits
2013-02-13 18:39:36 +01:00
Chris Robinson
da5f11700f
Warn about unhandled node types before the controllers
2013-02-13 00:45:00 -08:00
Chris Robinson
5b2ca6fa7d
Don't complain about RootCollisionNode, it's handled in nifbullet
2013-02-13 00:43:29 -08:00
Chris Robinson
6a9755778e
Merge remote-tracking branch 'zini/next' into animation2
2013-02-12 18:14:46 -08:00
scrawl
de90b911c9
Near clip plane corrections
2013-02-12 20:56:00 +01:00
scrawl
d213ff680f
Disabled terrain LOD
2013-02-12 20:55:45 +01:00
scrawl
f76954e3dd
Merge branch 'master' into graphics
2013-02-12 19:35:25 +01:00
Marc Zinnschlag
5e3529783d
Merge remote-tracking branch 'ace/win-fixes' into next
2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson
bbb845824d
Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__
2013-02-12 13:59:24 +01:00
Alexander "Ace" Olofsson
0ae01794f1
Fixed build errors in OpenCS
2013-02-12 13:57:16 +01:00
Alexander "Ace" Olofsson
f9a0a19ee1
Fix a small issue in the windows installer, also added the OpenMW version to the installed package name
2013-02-12 13:23:25 +01:00
Sergey Shambir
7d7a1119da
Fixed book text misalignment, at least in some cases
...
https://bugs.openmw.org/issues/284
2013-02-12 11:49:20 +04:00
Sergey Shambir
03803f19b5
BookTextParser: moved to Ogre::UTFString
...
Font height and unicode characters glyph width now accounted correctly.
2013-02-12 11:22:19 +04:00
Sergey Shambir
3b64389668
BookTextParser: fixed infinitive loop
2013-02-12 11:14:30 +04:00
Marc Zinnschlag
ba97c8f7d6
updated credits file
2013-02-11 19:54:32 +01:00
Marc Zinnschlag
1a079ec8d3
Merge branch 'master' into next
2013-02-11 19:53:51 +01:00
Marc Zinnschlag
04001717e7
Merge remote-tracking branch 'scrawl/master'
2013-02-11 19:43:50 +01:00
Marc Zinnschlag
1fd7d8ed2a
Merge remote-tracking branch 'graffy76/master' into next
2013-02-11 15:35:59 +01:00
Pieter van der Kloet
aa25471517
WIP: working on improving the config file handling
2013-02-11 15:01:00 +01:00
graffy76
55dd17c27c
Added setBarColor() function to CSVDoc::Operation. Created four color
...
types for existing operations (save, verify, compile and search), with a
default for future / undefined ops.
2013-02-11 04:30:16 -06:00
