1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00

20172 Commits

Author SHA1 Message Date
AnyOldName3
3ce96997d1 Remove sneaky tabs. 2018-08-18 00:09:40 +01:00
AnyOldName3
80082308f0 Merge upstream (shadermanager log system revamp) 2018-08-17 18:22:13 +01:00
AnyOldName3
dd501f4132 Make ConvexHull::clip more resilient against large values. 2018-08-17 17:47:52 +01:00
Marc Zinnschlag
088463ebe6 Merged pull request #1868 2018-08-17 09:37:49 +02:00
Marc Zinnschlag
ebdb991225 Merged pull request #1875 2018-08-17 09:37:12 +02:00
Marc Zinnschlag
3489951410 Merged pull request #1866 2018-08-17 09:36:44 +02:00
Capostrophic
ce78a34010
Use container ID in Equip command warning 2018-08-17 03:32:33 +03:00
Capostrophic
372697489b Fix Equip command infinite loop (bug #3072) 2018-08-17 02:52:18 +03:00
AnyOldName3
987306feb9 Fix ConvexHull::extendTowardsNegativeZ 2018-08-16 23:48:19 +01:00
Bret Curtis
dcd381049c
Merge pull request #1872 from akortunov/extended_logging
Use new logging system
2018-08-16 11:38:29 +02:00
Bret Curtis
fa1f3ec51b
Merge pull request #1873 from Capostrophic/advanced
Remove an outdated checkbox from the advanced page of the launcher
2018-08-15 21:46:40 +02:00
Capostrophic
37f9d45182 Remove an outdated checkbox from the advanced page 2018-08-15 16:04:29 +03:00
Bret Curtis
758d9ca122 Merge branch 'desynced' into 'master'
Desynced

See merge request OpenMW/openmw!34
2018-08-15 07:18:24 +00:00
Bret Curtis
4cb9b52b81 fix rebase issue 2018-08-14 23:15:30 +02:00
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
Marc Zinnschlag
ffb103f7c5 updated credits file 2018-08-14 19:58:28 +02:00
Yohaulticetl
4ff6f64ecd Added entry to the changelog. 2018-08-14 19:58:28 +02:00
Yohaulticetl
640b32da56 Fixed merge conflicts 2018-08-14 19:57:48 +02:00
Yohaulticetl
d6f607e823 Fixed wrong starting index 2018-08-14 19:56:40 +02:00
Yohaulticetl
7e9ce99062 Made the werewolf check optional 2018-08-14 19:56:40 +02:00
Yohaulticetl
18e51e0e98 Added check for werewolves 2018-08-14 19:44:03 +02:00
Yohaulticetl
d19cbdb652 Factored strength into hand-to-hand combat 2018-08-14 19:44:03 +02:00
Andrei Kortunov
c7a5548475 Use new logging system for editor 2018-08-14 20:01:09 +04:00
Andrei Kortunov
1452684d9e Use new logging system for components 2018-08-14 19:42:41 +04:00
Capostrophic
52f70642d0
Update changelog 2018-08-14 18:25:19 +03:00
Capostrophic
22162dcbda
Replace std::find with std::set::find where applicable 2018-08-14 18:14:43 +03:00
Capostrophic
53599290c3 Make search for followers in getEnemiesNearby recursive 2018-08-14 16:14:48 +03:00
Capostrophic
75bd6e1d28 Make search for allies in actorAttacked recursive 2018-08-14 15:41:34 +03:00
Capostrophic
7029ed0e8d Refactor follower and enemy actor processing
Make another exception for wander packages when finding allies (bug #4304)
2018-08-14 15:36:52 +03:00
Bret Curtis
c0e50b2c02
Merge pull request #1865 from elsid/material_race_condition
Fix race condition (bug #4584)
2018-08-14 10:29:58 +02:00
Bret Curtis
d25147a930
Merge pull request #1863 from Capostrophic/aiming
Use the correct spell projectile speed GMST in AI aiming (bug #3948)
2018-08-14 10:29:22 +02:00
Bret Curtis
6a32a4aed0
Merge pull request #1810 from akortunov/weaponfix
Use fallbacks for missing weapon animations
2018-08-14 10:29:01 +02:00
Bret Curtis
f7715db25f
Merge pull request #1871 from akortunov/extended_logging
[Regression] Move cerr initialization out of 'try' block
2018-08-14 10:26:12 +02:00
Andrei Kortunov
9a5b016293 Move crashcatcher initialization to components 2018-08-14 11:17:05 +04:00
Andrei Kortunov
5e172ed831 Move cerr initialization out of 'try' block 2018-08-14 10:30:27 +04:00
Bret Curtis
d7989ac778
Merge pull request #1063 from Allofich/drain
Drain and Fortify fixes
2018-08-13 20:58:46 +02:00
Allofich
94d941cabc Update changelog 2018-08-13 22:39:03 +09:00
Allofich
fd89fa415a Do modifiers for dynamic stats before attributes
(Fixes #4231)
2018-08-13 21:59:27 +09:00
Allofich
2cc1b52baf Drain and fortify fixes for dynamicStats
(Fixes #3049)
2018-08-13 21:59:26 +09:00
Bret Curtis
61b34124e2
Merge pull request #1847 from akortunov/extended_logging
Improve console logging
2018-08-13 10:19:25 +02:00
Bret Curtis
f7bc862476
Merge pull request #1867 from akortunov/spelldetection
Add zero-duration spells effects to effect list (bug #3533)
2018-08-13 09:38:22 +02:00
Andrei Kortunov
4003fa1296 Keep jailing state for one frame after leaving jail (bug #3788) 2018-08-13 11:10:01 +04:00
Andrei Kortunov
9dfd775bf2 Implement GetPCTraveling console command 2018-08-13 08:30:50 +04:00
Andrei Kortunov
8de3383612 Add zero-duration spells effects to effect list (bug #3533) 2018-08-12 17:25:35 +04:00
Andrei Kortunov
307e0103dc Use fallbacks for missing weapon animations (bug #4470) 2018-08-12 16:14:24 +04:00
Andrei Kortunov
7d6e3673e0 Implement advanced logging system (feature #4581) 2018-08-12 13:38:15 +04:00
elsid
c2b8c7086a
Fix race condition
Values are accessed from main thread and cell preloader threads.
2018-08-12 01:06:58 +03:00
Bret Curtis
52d4e25314
Merge pull request #1851 from akortunov/launcherfix
Init SDL2 before Qt4 to avoid crash on Linux
2018-08-11 18:55:41 +02:00
Bret Curtis
953e3a4eba
Merge pull request #1864 from elsid/nifbullet_tests
Add unit tests for BulletNifLoader
2018-08-11 18:54:20 +02:00
elsid
2de38142e2
Replace raw pointers by unique_ptr 2018-08-11 18:00:52 +03:00