scrawl
|
0d6a3367d3
|
Water shader no longer depends on object shaders being enabled
|
2013-02-24 10:28:50 +01:00 |
|
scrawl
|
3135482cee
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-24 10:06:04 +01:00 |
|
Marc Zinnschlag
|
9e8d0128e0
|
Merge remote-tracking branch 'blunted2night/size_t-warnings_v2'
|
2013-02-23 20:06:27 +01:00 |
|
Nathan Jeffords
|
44b1c66c4b
|
fixed various warnings about converting size_t to int
|
2013-02-23 10:23:38 -08:00 |
|
scrawl
|
4b51184ec4
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-23 14:37:28 +01:00 |
|
Marc Zinnschlag
|
59748a7647
|
Merge remote-tracking branch 'greye/cross-cell'
|
2013-02-23 13:55:31 +01:00 |
|
Sergey Shambir
|
a3adcf752d
|
TradeWindow: fixed coding style
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
|
2013-02-23 13:51:21 +01:00 |
|
greye
|
ac7095537f
|
remove insertMesh() call on object cell change
|
2013-02-23 16:50:37 +04:00 |
|
greye
|
d983ed5c78
|
fix invalid SceneNode pointer on cell change
|
2013-02-23 16:45:55 +04:00 |
|
greye
|
9659b4a95e
|
update NpcAnimation inventory reference on cell change
|
2013-02-23 16:45:55 +04:00 |
|
scrawl
|
01102f9c73
|
Don't emit if there wasn't enough movement
|
2013-02-23 05:53:20 +01:00 |
|
scrawl
|
5b099393fa
|
Fix time factor
|
2013-02-23 04:43:51 +01:00 |
|
scrawl
|
db9e49968e
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-23 04:13:51 +01:00 |
|
lazydev
|
71e5369f04
|
Loading translation data for all the plugin files, not only for the first one
|
2013-02-22 02:18:54 +04:00 |
|
Emanuel Guevel
|
3dc28baa28
|
Remove "PinToggle" event from layout file
|
2013-02-20 01:31:10 +01:00 |
|
Emanuel Guevel
|
3ba3c71556
|
Make the "lock window" button to change state visually
|
2013-02-20 01:30:39 +01:00 |
|
Emanuel Guevel
|
43d6392921
|
Change the way pinnable window are made visible
This ensure pinned window are not displayed in main menu, dialogue and
container mode.
|
2013-02-20 01:00:13 +01:00 |
|
scrawl
|
427152c518
|
Disabled ripples until we can properly trigger them from the new character controller.
|
2013-02-19 03:15:31 +01:00 |
|
scrawl
|
6cceb04adf
|
When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.
|
2013-02-19 03:08:00 +01:00 |
|
scrawl
|
32b837ebd4
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-19 00:15:54 +01:00 |
|
scrawl
|
42883ec64b
|
cleanup
|
2013-02-18 02:33:53 +01:00 |
|
scrawl
|
b52df83d84
|
Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again
|
2013-02-17 20:23:22 +01:00 |
|
scrawl
|
52d0f0b750
|
Fixed OpAddItem, OpRemoveItem
|
2013-02-17 19:44:00 +01:00 |
|
scrawl
|
e1ca0a15ae
|
Add message box when item is added to player's inventory
|
2013-02-17 18:58:54 +01:00 |
|
scrawl
|
170a9762ac
|
Fix travel services not actually costing gold.
|
2013-02-17 18:30:21 +01:00 |
|
scrawl
|
791d16bbdb
|
Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes
|
2013-02-17 18:12:38 +01:00 |
|
Marc Zinnschlag
|
31bfe62bbc
|
Merge remote-tracking branch 'scrawl/bug_562' into next
|
2013-02-17 17:41:19 +01:00 |
|
scrawl
|
7ffcfa3622
|
Water and clouds no longer depend on timescale.
|
2013-02-17 16:23:55 +01:00 |
|
scrawl
|
5a11ddc485
|
Pressing F1 again hides the quick keys menu.
|
2013-02-17 16:01:36 +01:00 |
|
scrawl
|
d899f33444
|
Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.
|
2013-02-17 16:00:31 +01:00 |
|
scrawl
|
00db13be32
|
Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.
|
2013-02-17 15:56:22 +01:00 |
|
Marc Zinnschlag
|
44d66cbf5a
|
Merge remote-tracking branch 'scrawl/bug_562' into next
|
2013-02-17 09:09:31 +01:00 |
|
Marc Zinnschlag
|
448293f270
|
Merge remote-tracking branch 'scrawl/bug_559' into next
|
2013-02-17 09:09:06 +01:00 |
|
Marc Zinnschlag
|
b8c0c94d5f
|
Merge remote-tracking branch 'wareya/master' into next
|
2013-02-17 08:58:41 +01:00 |
|
scrawl
|
c4f17f5596
|
playercontrols switch now disables activation in general (Chris' suggestion)
|
2013-02-17 03:03:41 +01:00 |
|
scrawl
|
373de19aee
|
Removed dialogue fix again, now on separate branch
|
2013-02-17 03:02:47 +01:00 |
|
scrawl
|
df8e502f8c
|
Ouch, I used && instead of &, this broke actions without a sound
|
2013-02-17 02:52:49 +01:00 |
|
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 |
|
scrawl
|
4da11a96a5
|
Fixed gold ref count always becoming 1 when dropped on the ground
|
2013-02-15 17:34:55 +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
|
6a49ea9b4f
|
Cleaning out some old bits
|
2013-02-13 18:39:36 +01: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 |
|
Marc Zinnschlag
|
5e3529783d
|
Merge remote-tracking branch 'ace/win-fixes' into next
|
2013-02-12 15:42:45 +01:00 |
|