1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 13:53:53 +00:00
Commit graph

23125 commits

Author SHA1 Message Date
Alexei Dobrohotov
2a94fa8639
Merge pull request #2746 from Assumeru/aitravel-reset
Remove "extra argument" warning from AiTravel
2020-03-30 19:32:04 +03:00
Bret Curtis
5df95b95f2
Merge branch 'master' into empty-string 2020-03-30 09:11:18 +02:00
Evil Eye
15a95add08 remove false positive 2020-03-29 22:40:22 +02:00
Evil Eye
e07fa37fa3 ignore final whitespace/comments 2020-03-29 22:29:22 +02:00
Alexei Dobrohotov
d6d8ed2137
Merge pull request #2745 from Capostrophic/fever
Fix some serious oversights caused by my fever
2020-03-28 19:22:01 +03:00
Capostrophic
69219c18a7 Make sure blank lines at the end of settings.cfg don't disappear 2020-03-28 19:15:43 +03:00
Capostrophic
99e89f23a6 Fix calculateNpcStatModifiers call for non-NPCs 2020-03-28 19:15:13 +03:00
Bret Curtis
deac2abc0f add launchable type; rename files to be conform to freedesktop.org and debian standards 2020-03-27 08:12:06 +01:00
Andrei Kortunov
79e7155f50
Merge pull request #2743 from Capostrophic/formatting
Improve blank line handling in settings writer (bug #5326)
2020-03-27 09:01:19 +04:00
Capostrophic
bec5746fdd Improve blank line handling in settings writer (bug #5326) 2020-03-26 23:41:33 +03:00
Nelsson Huotari
66fba7cc51 Remove unneeded constructors, only initialize in cpp, minor fixes 2020-03-26 18:06:33 +02:00
Andrei Kortunov
60161e639c
Merge pull request #2742 from Capostrophic/skills
Reset skills of dead actors (bug #5328)
2020-03-26 16:50:48 +04:00
Nelsson Huotari
ec2ff2a9b0 Fix if oneliners 2020-03-26 14:47:40 +02:00
Capostrophic
04ebe5c4c9 Reset skills of dead actors (bug #5328) 2020-03-26 15:22:31 +03:00
Nelsson Huotari
c8c7501d97 Add changelog 2020-03-26 13:28:51 +02:00
Nelsson Huotari
18cdd3bd7c rebase-related fixes 2020-03-26 13:25:33 +02:00
Nelsson Huotari
da0add904b Fix and simplify brush outlines and coordinate calculations 2020-03-26 13:25:33 +02:00
Nelsson Huotari
8f625474fd Hotfix terraintexturemode circle brush radius calculations 2020-03-26 13:25:33 +02:00
Nelsson Huotari
e14c390a9b Fix crash 2020-03-26 13:25:33 +02:00
Nelsson Huotari
731e5b57f5 Tool outline for terraintexturemode and square shape. Various fixes. 2020-03-26 13:25:33 +02:00
Nelsson Huotari
24c8b32d4c Implement brush outline for terrainshapemode 2020-03-26 13:25:33 +02:00
Andrei Kortunov
fe75308fdb Disable warning C5204 which come from Boost library 2020-03-26 14:51:14 +04:00
Andrei Kortunov
2e7712a390 Fix C5204 warnings by adding default virtual destructors 2020-03-26 14:49:12 +04:00
Bret Curtis
4c5d2feee8
Merge pull request #2739 from Capostrophic/vampirism
Don't reset dead non-werewolf vampires' vampire NPC type (regression #5327)
2020-03-26 08:02:16 +01:00
Evil Eye
fea7e68fe9 silence operator precedence warning 2020-03-25 20:34:08 +01:00
Evil Eye
8dc081a60d ignore unterminated empty strings 2020-03-25 19:52:22 +01:00
Capostrophic
3e3f5d66b2 Don't reset dead non-werewolf vampires' vampire NPC type 2020-03-25 21:06:21 +03:00
Bret Curtis
8779d261ba
Merge pull request #2735 from OpenMW/psi29a-Bionic-name
Xenial -> Bionic name change
2020-03-24 10:23:54 +01:00
Alexei Dobrohotov
baff15362a
Merge pull request #2713 from unelsson/opencsdropobjects
Editor: Implement dropping objects with keypress in instancemode
2020-03-24 03:01:07 +03:00
Chris Djali
648256969d
Merge pull request #2737 from Capostrophic/property
Correct drawable property apply order (bug #5313)
2020-03-23 20:38:06 +00:00
Alexei Dobrohotov
8d02b619fd
Merge pull request #2728 from akortunov/swimfix
Trace down dead persistent actors underwater
2020-03-23 21:00:42 +03:00
Capostrophic
7319eda54e Correct drawable property apply order (bug #5313) 2020-03-23 20:47:47 +03:00
Andrei Kortunov
d21314231b
Merge pull request #2736 from akortunov/master
Fix Qt download link for Windows
2020-03-23 17:48:48 +04:00
Andrei Kortunov
d2acac0ebe Fix Qt download link for Windows 2020-03-23 17:40:30 +04:00
Bret Curtis
53da5b8c54
Xenial -> Bionic name change 2020-03-23 14:38:22 +01:00
Andrei Kortunov
9d254aefb3
Merge pull request #2731 from Capostrophic/gender
Fix Gender column filtering (bug #4601)
2020-03-23 17:27:41 +04:00
Bret Curtis
6410f57b42
Merge pull request #2733 from OpenMW/windows_sdl2012
give sdl2 2.0.12 for windows a try
2020-03-22 23:41:09 +01:00
Bret Curtis
444d667d22 give sdl2 2.0.12 for windows a try 2020-03-22 23:07:07 +01:00
Bret Curtis
a7e77d74eb
Merge pull request #2732 from OpenMW/travis_ci_bionic
bump to bionic; gcc-9 and clang-10
2020-03-22 23:05:14 +01:00
Bret Curtis
3fc5c499fb another try for system clang 2020-03-22 21:41:15 +01:00
Bret Curtis
42640b7811 no need to re-map when using system default 2020-03-22 21:34:46 +01:00
Bret Curtis
0a96f4c847 get the default... 2020-03-22 21:27:44 +01:00
Bret Curtis
f2f5b1104f try clang-6 since that is officially in repo 2020-03-22 21:20:31 +01:00
Bret Curtis
5091e2c371 bump to bionic; gcc-9 and clang-10 2020-03-22 20:56:48 +01:00
Capostrophic
18bfc6f2c5 Fix Gender column filtering (bug #4601) and correct filter descs 2020-03-22 22:09:38 +03:00
Andrei Kortunov
ed06fc2aa8 Merge branch 'data_files_refresh' into 'master'
Implement a refresh button on data files page

See merge request OpenMW/openmw!166
2020-03-21 19:35:20 +00:00
James Moore
a37bdfd492 Implement a refresh button on data files page 2020-03-21 19:35:20 +00:00
Andrei Kortunov
d2a2c74e08 Trace down dead persistent actors underwater (regression #5317) 2020-03-21 10:41:35 +04:00
Andrei Kortunov
f4ace20885
Merge pull request #2726 from Assumeru/robe
Make robes cover the chest slot
2020-03-21 10:24:36 +04:00
Andrei Kortunov
3d20df883e
Merge pull request #2727 from akortunov/guifixes
Make slider control in the wait window to be a more intuitive
2020-03-21 10:11:20 +04:00