Marc Zinnschlag
2606feec3a
Merge remote-tracking branch 'lgro/cfg_without_data_path'
2013-10-12 13:52:38 +02:00
Marc Zinnschlag
3c580fbc59
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
2013-10-12 13:40:29 +02:00
Marc Zinnschlag
458c752425
Merge remote-tracking branch 'mckibbenta/tgm'
2013-10-12 13:38:10 +02:00
Marc Zinnschlag
87cd5d4267
Merge remote-tracking branch 'potatoesmaster/DisableLevitation'
2013-10-12 13:31:06 +02:00
Marc Zinnschlag
9c4d88cd76
Merge remote-tracking branch 'potatoesmaster/acrobatics'
2013-10-12 13:20:12 +02:00
Marc Zinnschlag
c8dc6a70b7
Merge remote-tracking branch 'greye/master'
2013-10-12 13:14:47 +02:00
Marc Zinnschlag
c8695db66f
Merge remote-tracking branch 'wheybags/unshield_fixes'
2013-10-12 13:03:38 +02:00
Lukasz Gromanowski
5ce1f50fab
Cleanup in MWGui::WindowManager constructor initialzation list.
...
Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:
https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-10 23:06:37 +02:00
Jordan Ayers
6e4978643c
Magic Effect descriptions: support feet / level modes.
...
Show proper suffixes for all magnitudes.
Drop extra 'times' symbol in 'timesInt format (not consistent
with other magnitude displays).
2013-10-09 00:08:11 -05:00
Jordan Ayers
6ab7002908
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
2013-10-07 22:28:55 -05:00
Jordan Ayers
065f435225
Format fix: remove extra spaces from ranged TimesINT formatting.
2013-10-07 20:02:20 -05:00
Marc Zinnschlag
4d6c3cdf09
removed more garbage
2013-10-07 08:55:04 +02:00
Jordan Ayers
6303e56ce4
Magic Effect Display cleanup: Don't put spaces in percentages.
2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e
Magic Effect Display improvement.
...
Related to Bug #794 .
Always show one decimal point precision for Fortify Max. Magicka effect.
2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16
Magic effect display improvement.
...
Related to Bug #794 .
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
2013-10-06 19:32:40 -05:00
Emanuel Guevel
2abe5c1c9a
Acrobatics: do not apply fall damages when slowfalling spell effect is active
...
If spell effect ends up in mid-air, calculate fall height from then.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
4265dddc40
Add MWWorld::isSlowFalling(Ptr)
2013-10-02 23:34:25 +02:00
Emanuel Guevel
6e09a5fb4a
Acrobatics: reinit fall height at current height rather than zero
...
To prevent problems.
2013-10-02 23:34:25 +02:00
Emanuel Guevel
2b992ef3b5
Acrobatics: use calculated fatigueTerm
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4c151e59a2
Acrobatics: do not touch modified stats
2013-10-02 23:34:24 +02:00
Emanuel Guevel
4860514865
Acrobatics: cosmetic changes
2013-10-02 23:34:24 +02:00
mckibbenta
857deb3723
Merge branch 'master' into tgm
2013-10-02 13:54:03 -04:00
mckibbenta
073f64c8bb
stop weapon condition degredation (for the player) with tgm on
2013-10-02 13:46:33 -04:00
Emanuel Guevel
496f786c2a
Implement Disable/EnableLevitation script functions
...
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
2013-10-02 15:33:20 +02:00
Emanuel Guevel
b8c60dabb3
Reintroduce Acrobatics changes made by Glorf
...
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
2013-10-01 23:35:34 +02:00
greye
4cdb57e388
workaround segfault on --new-game switch
2013-09-30 10:30:40 +04:00
Tom Mason
dd0a416249
cleaned up bloodmoon_fix_ini
2013-09-29 16:59:52 +01:00
Tom Mason
fd169c2399
fixed issue with cds where subfolders of Data Files were contained outside the Data Files folder
2013-09-29 15:49:47 +01:00
Marc Zinnschlag
1363e86828
made verifier ignore deleted records
2013-09-27 10:08:09 +02:00
Marek Kochanowicz
ae5e8b95ff
Solving Issue912
2013-09-23 20:12:04 +02:00
Marc Zinnschlag
0f1c4cb00e
cleanup
2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c
Switched to using proper enums as opposed to ints.
2013-09-23 08:31:36 -04:00
Berulacks
0c518fb047
Replaced tabs with spaces.
2013-09-23 07:36:50 -04:00
Berulacks
c423479f20
Fixed bug #887
2013-09-23 07:31:14 -04:00
Marc Zinnschlag
a6ea670255
use IdTypeDelegate in report table
2013-09-22 13:54:01 +02:00
Marc Zinnschlag
1c4a4b4f26
generalised RefIdTypeDelegate into IdTypeDelegate
2013-09-22 13:39:44 +02:00
Marc Zinnschlag
f2875e234c
added missing position columns to reference table
2013-09-22 10:43:09 +02:00
Marc Zinnschlag
94bb97e766
replacing tabs with spaces
2013-09-21 08:40:00 +02:00
Marc Zinnschlag
96b181bb54
Merge remote-tracking branch 'xethik/master'
2013-09-21 08:07:00 +02:00
Xethik
094e4d93b7
Generally speaking, you should never compare iterators from two different compilers
...
http://stackoverflow.com/questions/4657513/comparing-iterators-from-different-containers
It seems like this was just an overlook that happened to work on most systems. I was not able to thoroughly test this change, but it fixed an issue I was having in VC10.
It's possible the prev.end() was a copy paste error that was meant to be new.end() anyways.
2013-09-20 21:38:10 -04:00
Xethik
58bb0b8773
Bug #907
...
Added a check to make sure playerview is allowed when attempting to scroll, locking out zooming before character creation.
2013-09-20 21:26:12 -04:00
Marc Zinnschlag
99fe6e68c7
Merge remote-tracking branch 'mckibbenta/tgm'
2013-09-19 15:14:35 +02:00
Marc Zinnschlag
8d4f4e395f
update syntax highlighting when ID list changes
2013-09-19 14:26:09 +02:00
Marc Zinnschlag
ba5e2a0330
changed ID listing to include deleted records by default
2013-09-19 13:42:19 +02:00
Marc Zinnschlag
9c751ae370
separate highlight colour for IDs
2013-09-19 12:30:42 +02:00
Marc Zinnschlag
3d2281fe80
added signals and functions to Data for handling ID list changes
2013-09-19 12:11:27 +02:00
Marc Zinnschlag
78f7f80fc3
configured script highlighting with extensions
2013-09-19 08:58:27 +02:00
scrawl
d5ef843f56
Fix a missing model update
2013-09-16 19:22:08 +02:00
mckibbenta
6bb6ba6372
added god mode comment
2013-09-15 16:12:59 -04:00
mckibbenta
3035675a26
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-09-15 15:49:18 -04:00