Marc Zinnschlag
07f692bdd2
Merge remote-tracking branch 'scrawl/master'
2013-12-05 16:04:50 +01:00
scrawl
062ea627b3
Add parallax mapping for objects
2013-12-05 15:51:07 +01:00
scrawl
845bc5f7eb
Show fatal exceptions in a message box instead of cerr when running without a terminal
2013-12-05 15:51:07 +01:00
scrawl
afa71bb622
Throw an exception if a BSA is not found
2013-12-05 15:51:07 +01:00
scrawl
69c0bb1723
Add normal, specular & parallax mapping for terrain
2013-12-05 15:51:01 +01:00
scrawl
9ab8fe1038
Fix bsatool warning
2013-12-05 15:46:33 +01:00
scrawl
f695deb29d
Remember window positions
2013-12-05 15:46:23 +01:00
Alexander "Ace" Olofsson
47c60a7037
Fix C4716 (Must return a value) error on Windows MSVC
2013-12-04 21:48:25 +01:00
scrawl
5f1878eb54
Add specular mapping (uses alpha channel of diffuse texture)
2013-12-03 18:41:45 +01:00
scrawl
147bc447a5
Add specular lighting for directional light to objects shader
2013-12-03 16:07:07 +01:00
scrawl
3a82f8c193
Fix incorrect log file name for launcherOgre.log
2013-12-03 15:56:00 +01:00
scrawl
8f4ffe4ddc
Fix new window size not being written to settings when manually resizing window
2013-12-03 15:55:31 +01:00
Marek Kochanowicz
890aca720e
correcting qoutes style and removing informations about settings from creating_file.tex. Thanks zini.
2013-12-03 15:35:03 +01:00
Marc Zinnschlag
2fe135d85f
journals subview was bound to the wrong universal ID type
2013-12-02 16:25:26 +01:00
Marek Kochanowicz
4ef2724f35
Starting dialog window finished.
2013-12-01 13:24:28 +01:00
Marek Kochanowicz
465d39e8d9
Merge branch 'csmanual' of https://github.com/sirherrbatka/openmw into csmanual
2013-12-01 13:01:34 +01:00
Marek Kochanowicz
8b74e8cba7
Commiting. Not sure what since i had short blackout :/
2013-12-01 13:00:44 +01:00
sirherrbatka
a3348ccceb
Merge pull request #5 from lgromanowski/csmanual
...
Another small cleanup - missed that in previous commits.
Thank you.
2013-12-01 03:56:09 -08:00
Lukasz Gromanowski
5869908480
Another small cleanup - missed that in previous commits.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-01 12:03:04 +01:00
sirherrbatka
6bf643ea79
Merge pull request #4 from lgromanowski/csmanual
...
OpenCS user manual updates
2013-12-01 02:16:05 -08:00
Lukasz Gromanowski
3b64de7441
Another part of reformatting and clean up.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-01 03:18:08 +01:00
Lukasz Gromanowski
2e5e9e0c44
Small official/unofficial style cleanup - missed that one.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-01 01:15:46 +01:00
Lukasz Gromanowski
7c2afc43f4
Small reformatting.
...
Broked long lines, removed unneeded hard line breaks, added defs for
common words.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-01 01:07:08 +01:00
Lukasz Gromanowski
e03b8ac393
Added *.out files to gitignore.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-01 01:06:32 +01:00
Marc Zinnschlag
c94f006307
Merge remote-tracking branch 'scrawl/master'
2013-11-30 15:06:09 +01:00
Marc Zinnschlag
aa5369d02c
Merge remote-tracking branch 'pvdk/checkboxfix'
2013-11-30 15:04:25 +01:00
scrawl
8391891a5b
Ignore case for content file extensions
2013-11-30 14:25:29 +01:00
pvdk
1512ac11ad
Fixed the content selector checkboxes appearing as partially checked
2013-11-30 12:16:57 +01:00
pvdk
46973e8e82
Fix for Bug #982 : unchecking addons is now saved to profile
2013-11-30 12:08:37 +01:00
Marc Zinnschlag
8b3e852ffc
Merge remote-tracking branch 'scrawl/master'
2013-11-30 11:09:38 +01:00
scrawl
4b4025ed0f
Keep the player's CharacterController when changing cells. Fixes several glitches.
2013-11-30 11:01:45 +01:00
Marc Zinnschlag
016500af98
Merge remote-tracking branch 'scrawl/master'
2013-11-30 09:45:46 +01:00
Marc Zinnschlag
04b1657d98
Merge branch 'openmw-27'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
2013-11-30 09:45:41 +01:00
scrawl
e1e9de0f02
Don't hide tooltips on mouse click. Probably wasn't such a bright idea.
2013-11-30 09:04:52 +01:00
scrawl
6aa9e18915
Reset filter when starting a trade
2013-11-30 08:33:18 +01:00
scrawl
bb4bd999ba
PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod.
2013-11-30 08:29:22 +01:00
scrawl
0e267b79ec
Don't heal dead actors when resting
2013-11-29 20:21:57 +01:00
scrawl
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
2013-11-29 20:06:54 +01:00
scrawl
ce2d521b8f
Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra".
...
When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.
2013-11-29 20:03:50 +01:00
scrawl
ffc885853a
Fix bolt for magic effects that don't have one specified
2013-11-29 10:39:37 +01:00
scrawl
b82ee4b44f
Fix some problems with the previous commit
2013-11-28 21:49:15 +01:00
scrawl
076cc9230b
First try at handling target magic
2013-11-28 17:31:17 +01:00
scrawl
e7ad503e30
Merge branch 'particles' into projectiles
2013-11-28 17:16:59 +01:00
scrawl
20ccfe2324
Play sound when enchanting
2013-11-28 11:37:30 +01:00
scrawl
4a0a16be36
Fix a build error
2013-11-27 20:03:11 +01:00
scrawl
97fadb24ca
Update the Ptr in mObjects in Objects::updateObjectCell
2013-11-27 18:49:04 +01:00
scrawl
03c4b680ca
Fix changePointer
2013-11-27 18:49:04 +01:00
scrawl
a8c838b53a
Don't list deleted refs in CellStore::foreach
2013-11-27 18:49:04 +01:00
Marek Kochanowicz
400831faf8
Added short overiview of resources avaible. Thanks for assistance and insight on this, serpentine, lgro and scrawl.
2013-11-26 15:51:59 +01:00
scrawl
49ea1aae67
Use GMST for sun damage reduction
2013-11-26 15:01:22 +01:00
