mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 16:26:38 +00:00
Code Issues Releases Wiki Activity
20657 commits 115 branches 76 tags 128 MiB
Commit graph

20657 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bret Curtis
ae4cb0c3ee no need for macos_qt_formula since on osx there is no more qt4, just qt5 2018-06-26 13:50:45 +00:00
Finbar Crago
43c9fd4cec check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips 2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f rm ContainerStore/refItem 2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e Merged pull request #1777 2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309 Merged pull request #1778 2018-06-25 11:57:45 +02:00
Bret Curtis
a0cae78cb2
Merge pull request #1779 from akortunov/coverity 
Fix some code coverity issues
 2018-06-25 10:33:07 +02:00
Andrei Kortunov
97d8cc0efe Check if the local was not found, just for sure 2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2 Check cell for null 2018-06-25 10:26:58 +04:00
Finbar Crago
46c6abcf54 add string vectors for name/id in QuickKeysMenu for item lookups 2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c Validate map size 2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28 Initialize some missing fields in constructors 2018-06-25 09:35:42 +04:00
Bret Curtis
d008cd0c46 Update .gitlab-ci.yml 2018-06-24 21:26:53 +00:00
Bret Curtis
87f367ec11 Update .gitlab-ci.yml 2018-06-24 17:52:57 +00:00
Capostrophic
d6a170f848
Update changelog 2018-06-24 14:58:54 +03:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails 2018-06-24 14:39:48 +03:00
Bret Curtis
f1158e8129 Update .gitlab-ci.yml 2018-06-23 13:50:58 +00:00
Bret Curtis
55de1c1a72 Update .gitlab-ci.yml 2018-06-23 13:22:20 +00:00
Capostrophic
afbe8f2161
Update changelog 2018-06-23 14:29:15 +03:00
Capostrophic
35b0546737 Consider <p> tag when discarding post-EOL tag text (regression #4473) 2018-06-23 14:27:40 +03:00
Finbar Crago
da4c55d5ad prevent segfalt in QuickKeysMenu when item has been removed from player inventory 
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().

(storing the RefId could be a better solution but would probably leave tooltips broken...)
 2018-06-23 17:51:32 +10:00
Bret Curtis
40a9d8ac06 Update .gitlab-ci.yml 2018-06-23 07:19:05 +00:00
Bret Curtis
c2826ca878 Update .gitlab-ci.yml 2018-06-22 16:41:20 +00:00
Bret Curtis
393ec99944 Update .gitlab-ci.yml 2018-06-22 15:29:27 +00:00
Bret Curtis
88555c0463 Update .gitlab-ci.yml 2018-06-22 15:20:38 +00:00
Bret Curtis
601b69b36c Update .gitlab-ci.yml 2018-06-22 15:14:09 +00:00
Bret Curtis
dcba3a1058 Update .gitlab-ci.yml 2018-06-22 15:13:09 +00:00
Bret Curtis
516fc0283b Update .gitlab-ci.yml 2018-06-22 15:07:39 +00:00
Bret Curtis
64cc3b3a6a
Merge pull request #1774 from nikolaykasyanov/ci-macos-1013 
[macOS, CI] Build using macOS 10.13 SDK
 2018-06-22 10:21:00 +02:00
Bret Curtis
9667dd051c
Merge pull request #1771 from Xenkhan/master 
Retrieve SDL window settings instead of using magic numbers
 2018-06-21 22:22:42 +02:00
Bret Curtis
a55583a395
Merge branch 'master' into master 2018-06-21 22:22:01 +02:00
Xenkhan
f0acc64544
Update changelog 2018-06-21 15:04:04 -05:00
Marc Zinnschlag
f52e06fc19 Merge branch 'glsl-editorconfig' into 'master' 
Update .editorconfig to include GLSL

See merge request OpenMW/openmw!3
 2018-06-21 18:29:31 +00:00
AnyOldName3
d1736ad0c8 Update .editorconfig to include GLSL 2018-06-21 14:23:30 +00:00
Xenkhan
405a0caf29
Remove unneeded whitespace 2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<> 2018-06-20 13:33:59 -05:00
Nikolay Kasyanov
90ccf5b42b [macOS, CI] Build using macOS 10.13 SDK 2018-06-20 19:59:55 +02:00
Marc Zinnschlag
22eb037c18 Merged pull request #1773 2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression 
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
 2018-06-20 17:19:48 +02:00
Bret Curtis
9cf815505b
formatting 2018-06-20 16:21:23 +02:00
Marc Zinnschlag
4e121a7434 updated credits file 2018-06-20 16:17:47 +02:00
Marc Zinnschlag
c90996f991 Merged merge request !1 2018-06-20 16:16:34 +02:00
Marc Zinnschlag
6315848620 Merged merge request !2 2018-06-20 16:02:54 +02:00
Nikolay Kasyanov
65ec58a669 Move the changelog entry to 0.44.0 2018-06-20 15:43:55 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim 
Fast-forward death animation to end if death animation was finished earlier
 2018-06-20 13:28:36 +02:00
Andrei Kortunov
c195144b17 Take transformation from first node with given name in file (bug #4469) 2018-06-20 14:24:32 +04:00
Atahualpa
c0fc615cd6 Adds the option to ignore "Base" records when running the verifier. (fixes #4466) 
Improves previous commit:
1. Initialise mIgnoreBase boolean member with FALSE.
2. Remove isBaseOnly() function and replace with direct use of Record member.
 2018-06-20 11:29:38 +02:00
Bret Curtis
664edc5a39
Merge pull request #1757 from akortunov/musicfix 
Handle exception when try to load non-music file
 2018-06-20 11:18:50 +02:00
Andrei Kortunov
c9756cee4c Fast-forward death animation to end if death animation was finished earlier (regression #4468) 2018-06-20 12:37:58 +04:00
Bret Curtis
3ebebdf3c1
Merge pull request #1751 from wareya/terrainbleeding 
Fix #4452
 2018-06-20 10:20:11 +02:00
Bret Curtis
f3923a41c0
Merge pull request #1770 from Capostrophic/open 
Make Open spells casted by anything trigger player crime event (bug #4461)
 2018-06-20 09:44:45 +02:00