Alexander "Ace" Olofsson
|
338f0cf53d
|
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
|
2016-01-19 22:11:46 +01:00 |
|
Alexander "Ace" Olofsson
|
93e100f210
|
Merge branch 'master' into appveyor
|
2016-01-19 22:11:18 +01:00 |
|
scrawl
|
ce9a18fb87
|
Merge pull request #879 from jordan-ayers/bugfix/1544
Improve Drop Command - Bugfix/1544
|
2016-01-19 15:02:51 +01:00 |
|
Jordan Ayers
|
5699cf7f09
|
Barter: Leave unsold projectiles equipped.
|
2016-01-18 20:00:18 -06:00 |
|
Jordan Ayers
|
1ff49cc637
|
Improve Drop command behavior. (Fixes #1544)
|
2016-01-18 19:58:19 -06:00 |
|
Jordan Ayers
|
c82d9a1e87
|
Adjust ContainerStore / InventoryStore to allow partial unequip of items.
|
2016-01-18 19:56:35 -06:00 |
|
Aesylwinn
|
bbda5fe634
|
Removed hints from error messages and fixed naming to match conventions
|
2016-01-18 12:34:33 -05:00 |
|
Aesylwinn
|
1d86f705ba
|
gmst verifier
|
2016-01-17 21:55:03 -05:00 |
|
scrawl
|
ed242d8151
|
Merge pull request #877 from rcutmore/cleanup-unused-code
Remove unused forward declarations in filedialog.hpp
|
2016-01-18 02:27:39 +01:00 |
|
Rob Cutmore
|
08b469c0d0
|
Remove unused forward declarations in filedialog.hpp
|
2016-01-17 14:18:49 -05:00 |
|
scrawl
|
259d51058a
|
Update AUTHORS.md
|
2016-01-17 00:09:58 +01:00 |
|
scrawl
|
605e348659
|
Merge pull request #875 from hristoast/fix-findmygui
Properly find MyGUI in /usr/local/lib
|
2016-01-17 00:09:04 +01:00 |
|
Hristos N. Triantafillou
|
97bcdf7904
|
Properly find MyGUI in /usr/local/lib
|
2016-01-16 16:42:54 -06:00 |
|
scrawl
|
ed5fff1789
|
Merge pull request #874 from rcutmore/make-setup-method-private
Make setup method of MainDialog class private
|
2016-01-16 15:25:13 +01:00 |
|
Rob Cutmore
|
21d13a48fa
|
Make setup method of MainDialog class private
|
2016-01-16 06:43:45 -05:00 |
|
Marc Zinnschlag
|
e30a38a4c1
|
updated credits file
|
2016-01-16 10:55:05 +01:00 |
|
Marc Zinnschlag
|
ddb606a9fa
|
Merge remote-tracking branch 'rcutmore/cleanup-unused-code'
|
2016-01-16 10:54:16 +01:00 |
|
Rob Cutmore
|
a5411c1ec2
|
Remove unused code
|
2016-01-15 20:51:39 -05:00 |
|
scrawl
|
87beb73970
|
Correction
|
2016-01-15 16:34:57 +01:00 |
|
scrawl
|
fbf07133ea
|
Document usage of node masks
|
2016-01-15 16:31:24 +01:00 |
|
scrawl
|
18320b2cd0
|
Move the Button enum to WorldSpaceWidget
|
2016-01-15 15:49:10 +01:00 |
|
scrawl
|
41c571d4f4
|
Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
Conflicts:
apps/opencs/view/render/instancemode.cpp
|
2016-01-15 15:46:10 +01:00 |
|
scrawl
|
4f2a031f4e
|
Improve error message
|
2016-01-14 18:34:47 +01:00 |
|
scrawl
|
0b84b3c2cf
|
Don't crash when region weather chances don't add to 100
The invalid weather ID was resulting in out-of-bounds vector access later in the code.
|
2016-01-14 17:41:39 +01:00 |
|
scrawl
|
091ca9743e
|
Do not write LandData twice (Fixes #3140)
|
2016-01-14 16:41:50 +01:00 |
|
scrawl
|
62fe47b144
|
Load default terrain if there is none defined
|
2016-01-14 16:41:50 +01:00 |
|
Marc Zinnschlag
|
e07be2d912
|
Merge branch 'drop'
|
2016-01-14 13:36:51 +01:00 |
|
Marc Zinnschlag
|
55627c0853
|
handling drops into cells that do not exist or are not shown
|
2016-01-14 13:20:01 +01:00 |
|
Marc Zinnschlag
|
6eba647a9d
|
added accessor function for cell selection in paged worldspace
|
2016-01-14 13:19:37 +01:00 |
|
Jordan Ayers
|
2ce2e8a1e7
|
Add missing OOB slot check to InventoryStore.
|
2016-01-12 21:35:23 -06:00 |
|
scrawl
|
ef1a1125e0
|
Fix an error in restocking logic (Fixes #3131)
|
2016-01-12 17:10:23 +01:00 |
|
scrawl
|
4e6a60672d
|
When a spell explodes on an actor do not apply it to that actor twice (Fixes #3142)
|
2016-01-12 00:40:09 +01:00 |
|
scrawl
|
458a305bff
|
OpenCS: add lighting mask
|
2016-01-11 23:14:43 +01:00 |
|
scrawl
|
e1c7165bfb
|
Fix bounds calculation for addLight to a transform node
|
2016-01-11 23:14:43 +01:00 |
|
scrawl
|
93cc08a09c
|
Lighting fix for LightListCallbacks attached to a Transform node
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
7f967153ef
|
OpenCS: create light sources
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
e7bb8878f3
|
OpenCS: add a mask for particle systems
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
ad2145b463
|
OpenCS: use a separate enum for the toggle buttons
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
3089aeccc4
|
Factor out SceneUtil::addLight
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
438b30d6f0
|
Move configureLight to a separate file
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
fb849014bd
|
Pass the fallback map to CSMWorld::Data
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
11496b8075
|
Read fallback settings in OpenCS
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
6546c05428
|
Move Fallback map to components/
|
2016-01-11 23:10:16 +01:00 |
|
scrawl
|
f315a4386f
|
Accept an implicit reference in Journal (Fixes #3135)
|
2016-01-11 23:07:01 +01:00 |
|
scrawl
|
ef20962fc5
|
Disable fog of war rendering on the HUD map by default
|
2016-01-11 22:58:08 +01:00 |
|
scrawl
|
ca4e859f61
|
Remove unused argument
|
2016-01-11 22:58:01 +01:00 |
|
scrawl
|
4690fd3f22
|
Change the local map exploration radius to better match the original engine
|
2016-01-11 22:57:57 +01:00 |
|
scrawl
|
0da6d249fe
|
Fix the window pinning button's borders not accepting mouse clicks
|
2016-01-11 22:57:53 +01:00 |
|
scrawl
|
4f8f166f69
|
Fix GetPcInJail to work as in the original engine
|
2016-01-11 22:57:25 +01:00 |
|
scrawl
|
190bf15887
|
SettingsWindow: support auto-updating of slider labels through the layout file
|
2016-01-11 22:57:16 +01:00 |
|