mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 22:19:54 +00:00
Code Issues Releases Wiki Activity
19728 commits 38 branches 54 tags 122 MiB
Commit graph

19728 commits

This branch
This branch
All branches
Author SHA1 Message Date
Doc West
3cbbbeceb4 Updated change log 2018-07-04 23:25:24 +02:00
Doc West
bf49a3e760 Use setData() instead of emtitting dataChanged() which does not work on CI. Also Fixes the remaining issue with subviews not updating due to only the modified flag emitting a change, which prevented the widget mapper from working for updates. 2018-07-04 23:22:15 +02:00
Doc West
96cf2cbd05 Notify views of changes of all cells in a row to properly update the row after revert 2018-07-04 22:37:10 +02:00
Bret Curtis
2ff9dc34a4 Merge branch 'win10_ci' into 'master' 
see if we can get win10 going

See merge request OpenMW/openmw!8
 2018-07-04 16:54:28 +00:00
Bret Curtis
d4d46fc602 Build everything but branches until we can allow VM/CIs to run on forked projects. 2018-07-04 16:51:57 +00:00
Bret Curtis
739c49d59b Merge branch 'master' into 'win10_ci' 
# Conflicts:
#   CI/before_script.msvc.sh
 2018-07-04 15:21:45 +00:00
AnyOldName3
8c153d116b
Merge pull request #1786 from OpenMW/CI_before_script_msvc_fixes 
Update before_script.msvc.sh to add GitLab CI support and update dependency links
 2018-07-04 15:44:25 +01:00
Bret Curtis
57e2573593
Update before_script.msvc.sh 
check if temp directory exists, error out and warn user about it.
 2018-07-03 15:59:51 +02:00
Bret Curtis
70e9d5c0a0 ; it? 2018-07-03 13:53:13 +00:00
Bret Curtis
11030e56c4 detect existing dir 2018-07-03 13:41:06 +00:00
Bret Curtis
4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 2018-07-03 13:00:19 +00:00
Bret Curtis
d4c9586bd0 try just converting the \ to a / 2018-07-03 12:53:30 +00:00
Marc Zinnschlag
908af3720f Merged pull request #1791 2018-07-03 09:37:51 +02:00
Marc Zinnschlag
47d0321366 updated credits file 2018-07-03 09:09:48 +02:00
Marc Zinnschlag
2a367a0c35 updated changelog 2018-07-03 09:09:05 +02:00
Marc Zinnschlag
e50c3657b3 Merged merge request !16 2018-07-03 09:05:59 +02:00
Marc Zinnschlag
9a88f9147e Merged merge request !15 2018-07-03 08:59:57 +02:00
Doc West
e9cc697b60 Sort EnumDelegate values by name 2018-07-03 00:52:23 +02:00
Andrei Kortunov
f4330cf057 Editor: limit FPS in 3D preview windows (feature #3641) 2018-07-02 12:20:34 +04:00
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() {}
                     ^
```
 2018-07-01 19:17:50 -05:00
Marc Zinnschlag
aa5ddd6b28 Merged merge request livestreamer https://www.twitch.tv/vanguardlx best 2018-07-01 15:25:38 +02:00
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...
 2018-07-01 13:46:23 +10:00
Marc Zinnschlag
3660d55adf updated credits file 2018-06-30 10:21:10 +02:00
Marc Zinnschlag
362798bd90 updated changelog 2018-06-30 10:20:12 +02:00
Marc Zinnschlag
2ea85d0bb6 Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt' 2018-06-30 10:17:05 +02:00
Bret Curtis
af75c1e909
Update before_script.msvc.sh 
reverting back to what works
 2018-06-30 08:40:21 +02:00
Bret Curtis
dcb2ab80f5
Merge pull request #1788 from Capostrophic/armorcond 
Make unarmed creature attacks not affect armor condition (bug #2455)
 2018-06-30 08:39:06 +02:00
Bret Curtis
4d60fe5a76 reverting back 2018-06-30 06:10:26 +00:00
Finbar Crago
09c9bd34c3 cleanup more unnecessary struct keywords... 2018-06-30 12:43:50 +10:00
Bret Curtis
b8b07b52f0 try this... 2018-06-29 22:42:12 +00:00
Bret Curtis
4177fd04eb
Update before_script.msvc.sh 
Does it blend?
 2018-06-29 21:08:42 +02:00
Bret Curtis
209359bbc3 Try this on for size... 2018-06-29 19:07:39 +00:00
Bret Curtis
78a3f95ee4 Update before_script.msvc.sh 2018-06-29 18:03:25 +00:00
Bret Curtis
2bf0d598cf
Update before_script.msvc.sh 
Wrap in quites
 2018-06-29 20:01:35 +02:00
Capostrophic
6e9c08083d
Add missing empty attacker checks 2018-06-29 20:35:45 +03:00
Capostrophic
bccba24c40 Make unarmed creature attacks not affect armor condition (fixes #2455) 2018-06-29 20:18:28 +03:00
Bret Curtis
9b6ea0e89f # because our CI VMs are not public, MRs can't use them and timeout 2018-06-29 15:15:29 +00:00
Bret Curtis
d3dfe17441 try limiting scope 2018-06-29 15:13:06 +00:00
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
Bret Curtis
06216aa124 Update .gitlab-ci.yml 2018-06-29 13:36:00 +00: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
Bret Curtis
c474709127
Update before_script.msvc.sh 2018-06-29 15:26:11 +02:00
Bret Curtis
ca0f6fff4a Update before_script.msvc.sh 2018-06-29 13:25:36 +00:00
Bret Curtis
dc48a46e50 Update before_script.msvc.sh 2018-06-29 13:22:07 +00:00
Bret Curtis
a6d6dd5995 updating for the nits 2018-06-29 13:17:19 +00:00
Bret Curtis
8811c7141a
Update before_script.msvc.sh 
taking nits into account :)
 2018-06-29 15:14:23 +02: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
Bret Curtis
c2ff30c4d7 correcting from GH/AV feedback, testing on GL. 2018-06-29 09:33:51 +00:00