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 |
|
Marc Zinnschlag
|
868916a9a2
|
added add-on global variables in the same way add-on GMSTs were added
|
2013-02-23 12:51:45 +01:00 |
|
Marc Zinnschlag
|
6f5a772d02
|
fixed another case handling problem
|
2013-02-23 12:35:05 +01:00 |
|
Marc Zinnschlag
|
c9ca565462
|
removed a redundant function call
|
2013-02-23 12:05:09 +01:00 |
|
Marc Zinnschlag
|
8be789a81f
|
Merge remote-tracking branch 'graffy76/master'
|
2013-02-23 11:48:20 +01:00 |
|
scrawl
|
7046e7ae3d
|
Water fog fix
|
2013-02-23 09:02:05 +01:00 |
|
scrawl
|
01102f9c73
|
Don't emit if there wasn't enough movement
|
2013-02-23 05:53:20 +01:00 |
|
graffy76
|
6f89d453a5
|
Operations widget height fix and abort button feature. Successfully
tested resizing of Operations QDockWidget for multiple concurrent
operations.
|
2013-02-22 21:53:32 -06: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 |
|
Nathan Jeffords
|
5e1ec9e128
|
improved book window layout
|
2013-02-22 08:32:54 -08:00 |
|
Marc Zinnschlag
|
0c8c28e10c
|
Merge remote-tracking branch 'lazydev/master'
|
2013-02-22 08:46:41 +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 |
|
greye
|
82595e66b2
|
another missing header for #576
|
2013-02-21 22:47:18 +04:00 |
|
Marc Zinnschlag
|
a56e6d9422
|
Merge remote-tracking branch 'hasufell/master'
|
2013-02-21 19:30:17 +01:00 |
|
Marc Zinnschlag
|
9b7957cf20
|
fixed a missing inlcude
|
2013-02-21 19:27:07 +01:00 |
|
hasufell
|
56468eaecf
|
Add install rule for opencs
|
2013-02-21 19:19:53 +01:00 |
|
Marc Zinnschlag
|
ccf5c04706
|
updated credits files
|
2013-02-21 12:10:56 +01:00 |
|
Marc Zinnschlag
|
6ebd0aa56a
|
Merge remote-tracking branch 'potatoesmaster/pinned' into next
|
2013-02-20 14:26:53 +01:00 |
|
Marc Zinnschlag
|
f5445a8ce4
|
Merge remote-tracking branch 'scrawl/next' into next
|
2013-02-20 14:14:47 +01:00 |
|
scrawl
|
f4749f10da
|
NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)
|
2013-02-20 05:35:52 +01:00 |
|
Emanuel Guevel
|
3dc28baa28
|
Remove "PinToggle" event from layout file
|
2013-02-20 01:31:10 +01:00 |
|
Emanuel Guevel
|
2dea86bbc7
|
Make the "lock window" button appealing
|
2013-02-20 01:30:42 +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 |
|
Marc Zinnschlag
|
0713afb97d
|
Merge branch 'gmstfixing' into next
|
2013-02-18 09:24:22 +01:00 |
|
Marc Zinnschlag
|
a50ff34774
|
better default value for string GMSTs
|
2013-02-18 09:23:14 +01:00 |
|
scrawl
|
42883ec64b
|
cleanup
|
2013-02-18 02:33:53 +01:00 |
|
Marc Zinnschlag
|
1343c2c22b
|
Merge remote-tracking branch 'scrawl/next' into next
|
2013-02-17 20:29:45 +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 |
|
Marc Zinnschlag
|
e5149e57ac
|
Merge remote-tracking branch 'scrawl/next' into next
|
2013-02-17 20:04:18 +01:00 |
|
Marc Zinnschlag
|
475f4f9311
|
implicitly add Tribunal/Bloodmoon GMSTs to base, if present neither in base nor in modified
|
2013-02-17 20:03:39 +01:00 |
|
scrawl
|
52d0f0b750
|
Fixed OpAddItem, OpRemoveItem
|
2013-02-17 19:44:00 +01:00 |
|
Marc Zinnschlag
|
abd307d70e
|
Issue #567: workaround for crash with non-English ESX files
|
2013-02-17 19:26:01 +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 |
|
Marc Zinnschlag
|
9221c861c5
|
Merge remote-tracking branch 'graffy76/next' into next
Conflicts:
apps/opencs/CMakeLists.txt
|
2013-02-17 17:38:33 +01:00 |
|
Marc Zinnschlag
|
bb990b96bf
|
Merge branch 'globaltype' into next
|
2013-02-17 17:27:41 +01:00 |
|
Marc Zinnschlag
|
50d61a5b6e
|
proper implementation of gmst type column
|
2013-02-17 17:27:25 +01:00 |
|
scrawl
|
7ffcfa3622
|
Water and clouds no longer depend on timescale.
|
2013-02-17 16:23:55 +01:00 |
|