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

17097 commits

This branch
This branch
All branches
Author SHA1 Message Date
scrawl
92d42ef49b Merge pull request #1123 from Allofich/warnings 
Fix dereference of null pointer warning
 2016-11-07 22:22:32 +01:00
scrawl
4f8bfb7702 Merge pull request #1122 from MiroslavR/slow-repair 
Improve performance of repairing/recharging
 2016-11-07 22:16:11 +01:00
Allofich
c7313606f5 Fix dereference of null pointer warning 2016-11-07 22:39:20 +09:00
MiroslavR
e80636f0ca Improve performance of repairing/recharging (Fixes #2493) 2016-11-06 11:01:46 +01:00
scrawl
7af1e09151 Merge pull request #1120 from nikolaykasyanov/osx-link-libz 
Link OpenMW with libz on macOS explicitly
 2016-11-05 15:43:23 +01:00
Nikolay Kasyanov
3adf4cb97f Link OpenMW with libz on macOS 2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874 Revert "Link OpenMW with libz on macOS" 
This reverts commit 0c4dd05118.
 2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118 Link OpenMW with libz on macOS 2016-11-05 12:09:47 +01:00
scrawl
d8b506155e Merge pull request #1118 from MiroslavR/resize-perf 
Fix horrible performance when resizing/moving the settings window
 2016-11-04 20:24:27 +01:00
scrawl
681efdb6ca Merge pull request #1119 from nikolaykasyanov/use-local-config-path-in-launcher 
Use local config path from configuration manager in the launcher
 2016-11-01 21:48:28 +01:00
Nikolay Kasyanov
5d4734c02e Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:27:35 +01:00
Nikolay Kasyanov
224d7f27b0 Revert "Use local path from configuration manager to load openmw.cfg in launcher" 
89e85a6acf
 2016-11-01 21:19:27 +01:00
Nikolay Kasyanov
89e85a6acf Use local path from configuration manager to load openmw.cfg in launcher 2016-11-01 21:14:24 +01:00
MiroslavR
5cd04af3fa Fix horrible performance when resizing/moving the settings window 
Resize widgets instead of reconstructing them.
 2016-11-01 16:37:00 +01:00
scrawl
d073999340 Merge pull request #1117 from nikolaykasyanov/fix-osx-ci 
Fix & reenable OS X CI
 2016-10-30 23:27:57 +01:00
Nikolay Kasyanov
cf2e59c983 [OS X] Use Qt 5.5 on CI 
Newer Qt versions require C++11.
 2016-10-30 21:36:43 +01:00
Nikolay Kasyanov
c99d9a47e8 [OS X] Reenable CI 2016-10-30 21:36:43 +01:00
scrawl
e0f613661e Fix char -> int, fix shadowing warning 2016-10-30 20:10:33 +01:00
scrawl
cac8de0b29 Merge pull request #1116 from Allofich/paused 
Don't update ripple simulation when paused
 2016-10-30 19:26:56 +01:00
scrawl
e5cb7306c3 Merge pull request #1115 from Allofich/conversion 
Fix narrowing conversion warning
 2016-10-30 19:26:51 +01:00
scrawl
f514f53f52 Merge pull request #1114 from Allofich/warnings 
Fix shadowing warnings
 2016-10-30 19:26:38 +01:00
Allofich
19db070fca Don't update ripple simulation when paused 2016-10-31 01:19:38 +09:00
Allofich
68ed264f40 Fix narrowing conversion warning 2016-10-31 00:53:17 +09:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
scrawl
8a8aa664e3 Update AUTHORS.md 2016-10-25 16:44:54 +02:00
scrawl
8485f6aefb Merge pull request #1111 from Assumeru/weakness_resistance 
Fix Calm/Frenzy/Demoralize/Rally Creature weakness and resistance
 2016-10-25 16:44:12 +02:00
Assumeru
f6ef1ce276 Fix Calm/Frenzy/Demoralize/Rally Creature weakness and resistance 2016-10-25 15:42:37 +02:00
scrawl
efa35e9222 Merge pull request #1110 from MiroslavR/controls-state 
Save controls state
 2016-10-20 16:51:53 +02:00
MiroslavR
cd9de94c0c Import teleporting and levitation disabled state from vanilla savegames (Fixes #3420) 2016-10-20 14:38:18 +02:00
MiroslavR
f3ce0840be Import controls state from vanilla savegames 2016-10-20 02:14:36 +02:00
MiroslavR
301dd77efb Save controls state (Fixes #3598) 2016-10-20 02:12:01 +02:00
scrawl
5580123880 Merge pull request #1109 from MiroslavR/autoequip-weap2 
Fix auto-equipping of blunt weapons
 2016-10-20 00:39:00 +02:00
MiroslavR
407abc605f Fix auto-equipping of blunt weapons 2016-10-19 22:37:45 +02:00
scrawl
a5ca33ad0b Disable failing OSX build 2016-10-19 21:59:49 +02:00
scrawl
9c549a85ce Merge pull request #1108 from MiroslavR/autoequip-weap 
Auto-equip weapons
 2016-10-19 20:45:47 +02:00
MiroslavR
76ddd9bebb Add a setting for merchant auto-equipping prevention 2016-10-19 02:22:49 +02:00
scrawl
a7d4928593 Properly handle moved references in respawning code (Fixes #3600) 2016-10-18 23:51:45 +02:00
MiroslavR
1d3008594d Autoequip weapons (Fixes #3562) 2016-10-18 13:57:35 +02:00
scrawl
77bc807305 Attenuate the light ambient in lighting.glsl (Fixes #3597) 2016-10-17 15:01:10 +02:00
scrawl
f0e488e9c5 Merge pull request #1107 from MiroslavR/autoequip 
Fix autoEquip to better match vanilla
 2016-10-16 19:52:38 +02:00
MiroslavR
14240cf7a2 Fix autoEquip to better match vanilla (Fixes #3590) 2016-10-16 17:27:17 +02:00
scrawl
1d58733880 Merge pull request #1104 from MiroslavR/missing-weather-states 
Import base weather states before loading region modifiers
 2016-10-15 22:17:20 +02:00
scrawl
460eee9ad1 Merge pull request #1105 from Allofich/warnings 
Fix shadowing warnings
 2016-10-15 22:17:13 +02:00
Allofich
ccacad51be Fix shadowing warnings 2016-10-16 01:34:54 +09:00
MiroslavR
7b59eda13a Import base weather states before loading region modifiers (Fixes #3594) 2016-10-15 17:34:03 +02:00
scrawl
9e63c3ce63 Merge pull request #1103 from Allofich/warnings 
Fix shadowing warnings
 2016-10-14 21:18:12 +02:00
scrawl
5ccbabc27d Fix build against bullet with profiler disabled (Fixes #3592) 2016-10-14 21:00:35 +02:00
Allofich
1c54f54ab8 Fix shadowing warnings 2016-10-15 00:12:46 +09:00
scrawl
2ed0277839 Merge pull request #1102 from Allofich/spells 
Change several spell effects from instant to non-instant
 2016-10-13 21:36:14 +02:00
scrawl
9d2e0124dc Revert "Fix the cell changed flag no longer being reset after the player dies" 
This reverts commit d7acec74fd.
 2016-10-13 17:44:03 +02:00