teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
19643 commits 34 branches 0 tags 66 MiB
Commit graph

19643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Finbar Crago
69cd7031e7 Merge branch 'master' into fix_quickkey_segfalt 2018-06-29 23:46:36 +10:00
Finbar Crago
596be205c1 cleanup unnecessary struct keywords... 2018-06-29 23:43:51 +10:00
Finbar Crago
2722ca50fb fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570] 2018-06-29 23:32:05 +10:00
Marc Zinnschlag
a45d86bdf3 Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2' 2018-06-29 12:55:55 +02:00
Marc Zinnschlag
f06dd39892 Merge remote-tracking branch 'upstream/master' 2018-06-29 12:52:54 +02:00
Finbar Crago
7ae388086b Merge branch 'master' into fix_quickkey_segfalt 2018-06-29 12:34:53 +10:00
Thunderforge
72f6b1a693 Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface" 2018-06-28 20:13:18 -05:00
Finbar Crago
ed71656ea6 fix updateActivatedQuickKey() crash 
keyboard numbers don't start at zero...
 2018-06-29 01:58:57 +10:00
Finbar Crago
24d5fb09da fix crash on simultaneous key presses 2018-06-28 22:55:02 +10:00
Bret Curtis
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix 
Fix some GCC warnings
 2018-06-28 10:33:51 +02:00
Bret Curtis
102266d08d
Merge pull request #1784 from nikolaykasyanov/revert-sdl-get-attribute 
Revert "Retrieve SDL window settings instead of using magic numbers"
 2018-06-28 10:28:49 +02:00
Finbar Crago
d790a27060 Merge branch 'master' into fix_quickkey_segfalt 2018-06-28 18:16:00 +10:00
Andrei Kortunov
d9a1de0ec7 Do not use deprecated function 2018-06-28 11:13:32 +04:00
Andrei Kortunov
5455490ad2 Avoid fall-through in spell selection 2018-06-28 11:12:48 +04:00
Finbar Crago
80a3f0a0d4 switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers 2018-06-28 17:02:25 +10:00
Finbar Crago
335e2c5897 add keyData struct + general cleanup 2018-06-28 13:27:08 +10:00
Nikolay Kasyanov
5fcb091127 Replace FIXME with a detailed explanation of the issue 2018-06-27 22:40:09 +02:00
Nikolay Kasyanov
9c78364c45 Revert "Merge pull request #1771 from Xenkhan/master" 
This reverts commit 9667dd051c, reversing
changes made to f52e06fc19.
 2018-06-27 22:19:09 +02:00
Bret Curtis
87d9a4ff0b Merge branch 'zini_updates' into 'master' 
last minute updates from zini

See merge request OpenMW/openmw!7
 2018-06-27 11:33:01 +00:00
Marc Zinnschlag
520e65f822 last minute updates from zini 2018-06-27 13:32:08 +02:00
Marc Zinnschlag
5ee731d86f updated roadmap section 2018-06-27 12:33:23 +02:00
Marc Zinnschlag
8bc6c85396 last minute changes (this time for real; forgot to merge in the last update from the private repo) 2018-06-27 12:24:21 +02:00
Bret Curtis
f64d949169
Merge pull request #1780 from akortunov/persistanims 
Ignore movement from scripted animations
 2018-06-27 12:18:48 +02:00
Marc Zinnschlag
8cda355af6 last minute changes to design doc 2018-06-27 12:14:34 +02:00
Marc Zinnschlag
2afcea3870 added post-1.0 design document 2018-06-27 11:59:40 +02:00
Andrei Kortunov
3c7ab976c3 Ignore movement from scripted animations (bug #4475) 2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140 Merge branch 'master' into fix_quickkey_segfalt 2018-06-27 12:58:43 +10:00
Bret Curtis
26615d588e Merge branch 'multi_build' into 'master' 
Multi build

See merge request OpenMW/openmw!4
 2018-06-26 19:45:49 +00:00
Bret Curtis
4d6ca2c387 preserve dmg artifact 2018-06-26 17:45:20 +00:00
Bret Curtis
9e7731259d what if we try make -j2 package ? 2018-06-26 15:40:06 +00:00
Bret Curtis
cfcd9c3fc6 What happens when we don't make install? 2018-06-26 15:36:53 +00:00
Bret Curtis
dd60b8f179 only delete files inside OpenMW.app dir 2018-06-26 15:18:18 +00:00
Bret Curtis
c1aee49b76 clean up after our previous build. 2018-06-26 15:09:51 +00:00
Bret Curtis
06eb9539bd Let make install do it's thing, it's more reasonable on macos and let's only archive that. 2018-06-26 14:51:55 +00:00
Bret Curtis
e068ee3533 tell unzip to overwrite all files 2018-06-26 14:01:10 +00:00
Bret Curtis
9e2c6d9fe1 actually step into the build directory and build! 2018-06-26 13:57:13 +00:00
Bret Curtis
308d78e3da only download via curl if file on server is different than what is currently cached on VM. 2018-06-26 13:54:37 +00:00
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