scrawl
9be27193a3
Merge pull request #1512 from Rhiyo/patch-1
...
fixed new clothing replacing old clothing of same value
2017-10-19 14:54:27 +00:00
Marc Zinnschlag
0b163f0a50
Merge remote-tracking branch 'aesylwinn/forceNewProject'
2017-10-19 14:44:30 +02:00
Marc Zinnschlag
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
2017-10-19 14:24:58 +02:00
Rhiyo
d9fe3aac99
fixed new clothing replacing old clothing of same value
...
Found on the bug http://bugs.openmw.org/issues/4165 .
In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind.
In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
2017-10-19 22:46:08 +10:30
Kyle Cooley
6d8666d80d
Force new project file when creating new project
2017-10-18 20:21:44 -04:00
AnyOldName3
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
2017-10-19 00:50:57 +01:00
scrawl
33ceddc58b
Merge pull request #1506 from akortunov/swimanimations
...
Use SwimTurnLeft/Right animations correctly
2017-10-18 10:03:30 +00:00
scrawl
21a705fb75
Merge pull request #1507 from AnyOldName3/data-local-fix
...
Fix the loading of 'data-local' lines which I broke
2017-10-18 09:59:43 +00:00
scrawl
7328de6c50
Merge pull request #1505 from drummyfish/master
...
Make snow create water ripples (fixes #4156 )
2017-10-18 09:59:21 +00:00
AnyOldName3
43e9e955c8
Do the same for the CS
2017-10-18 02:04:48 +01:00
AnyOldName3
1f77f9654b
Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path)
2017-10-18 01:42:11 +01:00
Andrei Kortunov
4d4d247565
Use SwimTurnLeft/Right animations correctly
2017-10-17 23:26:55 +04:00
Miloslav Číž
a7cad65aab
fix water shader switching bug
2017-10-17 10:00:01 +02:00
Miloslav Číž
8a1e0e74fd
update uniform from one place
2017-10-17 09:59:53 +02:00
Miloslav Číž
797e407269
make snow create water ripples
2017-10-17 09:59:53 +02:00
Miloslav Číž
da47653625
move rain intensity uniform to water node
2017-10-17 09:59:45 +02:00
scrawl
a3a7b5b357
Merge pull request #1504 from AnyOldName3/escape-hash-oversight-fix-two-electric-boogaloo
...
Switch openmw-cs to the escape versions of option types
2017-10-16 21:09:47 +00:00
scrawl
7f8d996eff
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
...
Launcher and wizard ampersand escape support
2017-10-16 21:09:04 +00:00
Kyle Cooley
6d7a24224b
Add documentation.
2017-10-16 12:52:13 -04:00
AnyOldName3
654bd401fb
Switch openmw-cs to the escape versions of option types
2017-10-16 15:38:17 +01:00
scrawl
136ef1f738
Fix incomplete settings in recreateShaders()
2017-10-15 17:24:23 +02:00
scrawl
03554b2f4b
Fix some style issues flagged by cppcheck
2017-10-15 17:06:58 +02:00
scrawl
64d02f577e
Fix missing null check
2017-10-15 17:06:58 +02:00
scrawl
624046c558
Fix unused event handler
2017-10-15 17:06:58 +02:00
scrawl
50d7eb8e54
Fix crash when adding a NULL object to the cache
2017-10-15 17:06:58 +02:00
scrawl
4c174ecd12
Merge changes to coverity scan script
2017-10-15 17:06:58 +02:00
scrawl
bbf9b0c0a7
Merge pull request #1503 from akortunov/regressions
...
Handle Trespassing crime differently from Theft
2017-10-15 09:08:52 +00:00
scrawl
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
2017-10-15 09:04:48 +00:00
Andrei Kortunov
8f255a6b72
Handle Trespassing crime differently from Theft (bug #4158 )
2017-10-15 11:03:02 +04:00
AnyOldName3
49dbb4a9ca
Add a third copy of a comment where I felt clarification was missing
2017-10-15 02:05:22 +01:00
AnyOldName3
7329e6a9ef
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
2017-10-15 01:59:21 +01:00
AnyOldName3
28ff677337
Save 'data=...' lines correctly when exiting the wizard
2017-10-15 00:07:46 +01:00
Miloslav Číž
af6eeddbe5
use operator instead of drawcallback
2017-10-15 00:04:14 +02:00
Miloslav Číž
65977b910e
wrap weather around in all directions
2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd
use bbox as wrap range & apply to all particle systems
2017-10-14 21:42:19 +02:00
Miloslav Číž
38bfa64100
transform weather particles to world space
2017-10-14 21:42:11 +02:00
Miloslav Číž
8114126a62
make use of renderinfo
2017-10-14 21:41:59 +02:00
Miloslav Číž
33a1459b11
search for particle system by class name
2017-10-14 21:41:47 +02:00
Miloslav Číž
b95c9ba483
rain independent from camera plus wrap-around
2017-10-14 21:40:28 +02:00
Kyle Cooley
11eae16645
Get rid of duplicate function, fix flag checking
2017-10-14 15:09:12 -04:00
scrawl
5fbdb64bb9
Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware
...
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
2017-10-14 18:28:46 +00:00
Kyle Cooley
d27071f06a
Fix LTEX import bug.
2017-10-14 13:18:54 -04:00
Kyle Cooley
98c38ad7d1
Merge cleanup.
2017-10-14 13:18:31 -04:00
Kyle Cooley
6d9d98c02c
Merge Land/LandTextures
2017-10-14 11:32:42 -04:00
scrawl
548af6dbfb
Fix jail screen fading
2017-10-14 14:03:16 +00:00
scrawl
f3ca9832b0
Merge pull request #1500 from akortunov/extraspell
...
Implement ExtraSpell magic effect
2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b
ExtraSpell magic effect: a basic implementation
2017-10-14 16:55:00 +04:00
scrawl
a5b39e0842
Update AUTHORS.md
2017-10-13 19:35:49 +00:00
scrawl
09d7681254
Merge pull request #1499 from lukago/bug4155
...
Bugfix #4155 : NPCs don't equip a second ring in some cases
2017-10-13 19:35:03 +00:00
scrawl
cf1106f3eb
Merge pull request #1498 from AnyOldName3/cmake-resource-handling
...
Make CMake copy the runtime resources to the correct location
2017-10-13 19:32:53 +00:00
