Marc Zinnschlag
908af3720f
Merged pull request #1791
7 years ago
Marc Zinnschlag
47d0321366
updated credits file
7 years ago
Marc Zinnschlag
2a367a0c35
updated changelog
7 years ago
Marc Zinnschlag
e50c3657b3
Merged merge request !16
7 years ago
Marc Zinnschlag
9a88f9147e
Merged merge request !15
7 years ago
Doc West
e9cc697b60
Sort EnumDelegate values by name
7 years ago
Andrei Kortunov
f4330cf057
Editor: limit FPS in 3D preview windows (feature #3641 )
7 years ago
Thunderforge
7cbc4eeb49
Adding missing override keywords
...
Prevents compiler warnings such as this:
```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void onOpen();
^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
virtual void onOpen() {}
^
```
7 years ago
Marc Zinnschlag
aa5ddd6b28
Merged merge request livestreamer https://www.twitch.tv/vanguardlx best
7 years ago
Finbar Crago
5d9035c6b2
[ Fixes #4482 ] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480 )
...
because apparently i can't count to ten...
7 years ago
Marc Zinnschlag
3660d55adf
updated credits file
7 years ago
Marc Zinnschlag
362798bd90
updated changelog
7 years ago
Marc Zinnschlag
2ea85d0bb6
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
7 years ago
Bret Curtis
dcb2ab80f5
Merge pull request #1788 from Capostrophic/armorcond
...
Make unarmed creature attacks not affect armor condition (bug #2455 )
7 years ago
Finbar Crago
09c9bd34c3
cleanup more unnecessary struct keywords...
7 years ago
Capostrophic
6e9c08083d
Add missing empty attacker checks
7 years ago
Capostrophic
bccba24c40
Make unarmed creature attacks not affect armor condition ( fixes #2455 )
7 years ago
Finbar Crago
69cd7031e7
Merge branch 'master' into fix_quickkey_segfalt
7 years ago
Finbar Crago
596be205c1
cleanup unnecessary struct keywords...
7 years ago
Finbar Crago
2722ca50fb
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
7 years ago
Marc Zinnschlag
a45d86bdf3
Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2'
7 years ago
Marc Zinnschlag
f06dd39892
Merge remote-tracking branch 'upstream/master'
7 years ago
Finbar Crago
7ae388086b
Merge branch 'master' into fix_quickkey_segfalt
7 years ago
Thunderforge
72f6b1a693
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
7 years ago
Finbar Crago
ed71656ea6
fix updateActivatedQuickKey() crash
...
keyboard numbers don't start at zero...
7 years ago
Finbar Crago
24d5fb09da
fix crash on simultaneous key presses
7 years ago
Bret Curtis
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix
...
Fix some GCC warnings
7 years ago
Bret Curtis
102266d08d
Merge pull request #1784 from nikolaykasyanov/revert-sdl-get-attribute
...
Revert "Retrieve SDL window settings instead of using magic numbers"
7 years ago
Finbar Crago
d790a27060
Merge branch 'master' into fix_quickkey_segfalt
7 years ago
Andrei Kortunov
d9a1de0ec7
Do not use deprecated function
7 years ago
Andrei Kortunov
5455490ad2
Avoid fall-through in spell selection
7 years ago
Finbar Crago
80a3f0a0d4
switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers
7 years ago
Finbar Crago
335e2c5897
add keyData struct + general cleanup
7 years ago
Nikolay Kasyanov
5fcb091127
Replace FIXME with a detailed explanation of the issue
7 years ago
Nikolay Kasyanov
9c78364c45
Revert "Merge pull request #1771 from Xenkhan/master"
...
This reverts commit 9667dd051c
, reversing
changes made to f52e06fc19
.
7 years ago
Bret Curtis
87d9a4ff0b
Merge branch 'zini_updates' into 'master'
...
last minute updates from zini
See merge request OpenMW/openmw!7
7 years ago
Marc Zinnschlag
520e65f822
last minute updates from zini
7 years ago
Marc Zinnschlag
5ee731d86f
updated roadmap section
7 years ago
Marc Zinnschlag
8bc6c85396
last minute changes (this time for real; forgot to merge in the last update from the private repo)
7 years ago
Bret Curtis
f64d949169
Merge pull request #1780 from akortunov/persistanims
...
Ignore movement from scripted animations
7 years ago
Marc Zinnschlag
8cda355af6
last minute changes to design doc
7 years ago
Marc Zinnschlag
2afcea3870
added post-1.0 design document
7 years ago
Andrei Kortunov
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
7 years ago
Finbar Crago
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
7 years ago
Bret Curtis
26615d588e
Merge branch 'multi_build' into 'master'
...
Multi build
See merge request OpenMW/openmw!4
7 years ago
Bret Curtis
4d6ca2c387
preserve dmg artifact
7 years ago
Bret Curtis
9e7731259d
what if we try make -j2 package ?
7 years ago
Bret Curtis
cfcd9c3fc6
What happens when we don't make install?
7 years ago
Bret Curtis
dd60b8f179
only delete files inside OpenMW.app dir
7 years ago
Bret Curtis
c1aee49b76
clean up after our previous build.
7 years ago