Marc Zinnschlag
|
3e97943e06
|
Merge remote-tracking branch 'scrawl/includes'
|
2013-03-03 15:37:13 +01:00 |
|
Marc Zinnschlag
|
5595675664
|
Merge remote-tracking branch 'scrawl/effects'
|
2013-03-03 15:33:23 +01:00 |
|
scrawl
|
9a84f6744f
|
Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)
|
2013-03-03 13:11:02 +01:00 |
|
scrawl
|
6037c44ea6
|
Fix ingredient effect display
|
2013-03-03 12:41:57 +01:00 |
|
scrawl
|
6f05c4229f
|
Implemented potion & ingredient effect stacking
|
2013-03-03 12:41:37 +01:00 |
|
scrawl
|
8e05c4159d
|
Magic effect icons for permanent enchantments
|
2013-03-03 12:17:37 +01:00 |
|
scrawl
|
cf87708c1f
|
Magic effect icons for spells
|
2013-03-03 12:01:19 +01:00 |
|
Nathan Jeffords
|
109dff2d29
|
renamed high level NIF files...
|
2013-03-02 13:23:09 -08:00 |
|
Nathan Jeffords
|
d3c1f5e7b2
|
renamed low-level NIF related files and include guards to conform to naming convention
|
2013-03-02 10:46:12 -08:00 |
|
scrawl
|
e1957e4ee9
|
Potion effects should be hidden until discovered
|
2013-03-02 13:34:26 +01:00 |
|
Marc Zinnschlag
|
0f4f91605a
|
some cleanup
|
2013-03-02 11:19:48 +01:00 |
|
Marc Zinnschlag
|
401903c9ce
|
Merge remote-tracking branch 'lazydev/master'
|
2013-03-02 11:11:41 +01:00 |
|
lazydev
|
ccb7ed93b3
|
fix for https://bugs.openmw.org/issues/593
|
2013-03-02 03:54:25 +04:00 |
|
Marc Zinnschlag
|
3961fb36d4
|
Merge remote-tracking branch 'chris/transparency-fixes'
|
2013-03-01 23:18:35 +01:00 |
|
Chris Robinson
|
e6b547b9ba
|
Merge remote-tracking branch 'zini/master' into transparency-fixes
|
2013-03-01 13:32:30 -08:00 |
|
scrawl
|
ef1678e47e
|
Oops, rotation center should be dynamic
|
2013-03-01 22:32:02 +01:00 |
|
Chris Robinson
|
238a8feb18
|
Fix transparency checks
|
2013-03-01 13:27:25 -08:00 |
|
scrawl
|
d8f2d0195a
|
Got rid of the texture rotation hack by rendering the cursor manually.
|
2013-03-01 18:45:52 +01:00 |
|
scrawl
|
1d988676fe
|
Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this.
|
2013-02-28 22:56:29 +01:00 |
|
Chris Robinson
|
1168f15361
|
Don't disable depth writes when blending is enabled
|
2013-02-28 12:17:58 -08:00 |
|
scrawl
|
b7ab12e7cf
|
Workaround to prevent the map drawing on top of the world button
|
2013-02-28 21:12:13 +01:00 |
|
scrawl
|
3efbb5e728
|
Don't try to render a map in empty cells
|
2013-02-28 20:27:35 +01:00 |
|
Marc Zinnschlag
|
038c5c3e82
|
Merge remote-tracking branch 'mikesc/bug574'
|
2013-02-28 20:21:38 +01:00 |
|
Michal Sciubidlo
|
3df34fb5cc
|
fix bug 574
|
2013-02-28 19:52:32 +01:00 |
|
vorenon
|
c9a701cfa1
|
Removed the 3 dots after the load text.
|
2013-02-28 19:25:18 +01:00 |
|
vorenon
|
f66f67eaa1
|
Loading text uses now the corresponding GMSTs
|
2013-02-28 17:54:42 +01:00 |
|
vorenon
|
a6fb58bc59
|
Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell"
This commit replaces the default "Loading Cell" text with "Loading
Interior" and "Loading Exterior"
|
2013-02-28 16:31:24 +01:00 |
|
vorenon
|
d4aa33b9a7
|
Removing the unloading cells part instead of just commenting them.
|
2013-02-28 15:58:03 +01:00 |
|
vorenon
|
ffd96c7715
|
Removed "Unloading Cell..." text from loading screen
OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of
the "flicker" every time a cell loads.
|
2013-02-28 13:19:05 +01:00 |
|
Chris Robinson
|
bfe80bb8dc
|
Avoid duplicating skeletons due to casing issues
Manually created resource names are apparently always case sensitive, causing
some skeletons to get loaded multiple times.
|
2013-02-27 12:33:36 -08:00 |
|
Marc Zinnschlag
|
ce1310614c
|
Merge remote-tracking branch 'potatoesmaster/pinned'
|
2013-02-27 17:37:04 +01:00 |
|
Marc Zinnschlag
|
14459460c1
|
Merge remote-tracking branch 'potatoesmaster/gender'
|
2013-02-27 17:36:57 +01:00 |
|
Marc Zinnschlag
|
7cae69ee4e
|
Merge remote-tracking branch 'vorenon/master'
|
2013-02-27 17:36:03 +01:00 |
|
Emanuel Guevel
|
be9d49c510
|
Do not hide pinned windows during loadings
|
2013-02-27 16:17:41 +01:00 |
|
Emanuel Guevel
|
0bc4c3556a
|
Fix dialogue gender filter
|
2013-02-27 15:58:01 +01:00 |
|
vorenon
|
89cba3cf45
|
Replaced ifs/elseifs with switch
|
2013-02-26 19:52:51 +01:00 |
|
vorenon
|
13c33c1613
|
added missing click sound to main menu
|
2013-02-26 19:37:47 +01:00 |
|
Chris Robinson
|
35e2b6942a
|
Merge remote-tracking branch 'zini/master' into misc-cleanup
|
2013-02-26 10:21:28 -08:00 |
|
Chris Robinson
|
ceafcc2ebb
|
Support float samples with ffmpeg
Requires the AL_EXT_FLOAT32 extension in OpenAL
|
2013-02-26 10:19:33 -08:00 |
|
Nathan Jeffords
|
21f502e3dd
|
properly handle potentially non 16 bit planar audio formats
|
2013-02-26 09:37:18 -08:00 |
|
vorenon
|
b1ca719d61
|
Added click sound to OK button for message boxes
|
2013-02-26 16:37:59 +01:00 |
|
vorenon
|
1a43d86d9e
|
Close messages boxes with the activation key (Bug #589)
|
2013-02-26 15:58:32 +01:00 |
|
Marc Zinnschlag
|
dc445844d2
|
Merge remote-tracking branch 'scrawl/z-up'
|
2013-02-26 14:37:50 +01:00 |
|
scrawl
|
b9912a19e0
|
Z-up conversion: fix player arrow direction on global map
|
2013-02-26 14:31:30 +01:00 |
|
scrawl
|
cd68012498
|
Z-up conversion: raycasts
|
2013-02-26 14:28:35 +01:00 |
|
scrawl
|
cc9b72b9b1
|
Removing some leftovers of mwRoot node
|
2013-02-26 14:01:10 +01:00 |
|
scrawl
|
341f9b96e2
|
Local map: restore zHigh
|
2013-02-26 13:53:23 +01:00 |
|
scrawl
|
284ba58e1e
|
Z-up conversion: global map, shader fix
|
2013-02-26 13:52:01 +01:00 |
|
scrawl
|
2e7bc1a368
|
Z-up conversion: local map, fix tcg
|
2013-02-26 13:39:10 +01:00 |
|
scrawl
|
5c0c5854e8
|
Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not
|
2013-02-26 12:01:10 +01:00 |
|