David Cernat
|
48c63dbce9
|
[General] Fix ObjectLock packets by making hasCellData true for them
|
2017-06-22 05:49:44 +03:00 |
|
David Cernat
|
4ad87faac1
|
[Server] Create new Settings category for script functions
|
2017-06-20 07:24:15 +03:00 |
|
David Cernat
|
ebf7740969
|
[General] Repurpose GameConsole packet as GameSettings & add difficulty to it
|
2017-06-20 05:28:45 +03:00 |
|
David Cernat
|
df67ae4689
|
Merge pull request #229 from OpenMW/master
Add OpenMW commits up to 20 Jun 2017
|
2017-06-20 04:16:51 +03:00 |
|
scrawl
|
62f0ba6045
|
Merge pull request #1279 from Allofich/position
Fix actors not returning to their wander locations
|
2017-06-20 00:57:44 +02:00 |
|
scrawl
|
73fbaae97f
|
Merge pull request #1325 from jordan-ayers/bugfix/3684-restock-soul-gems
Adjust restock calculations to ignore filled soul gems. (Bug #3684)
|
2017-06-20 00:39:39 +02:00 |
|
scrawl
|
07ebf00f9c
|
Merge pull request #1327 from tlmullis/bugfix/pass-configuration-to-msbuild
build.msvc.sh msbuild configuration fix
|
2017-06-20 00:38:09 +02:00 |
|
scrawl
|
54bb1b13cb
|
Change NCO/NCC flags to NC* (Fixes #3915)
|
2017-06-20 00:36:17 +02:00 |
|
scrawl
|
41fb17f39b
|
Revert "Correcting https://bugs.openmw.org/issues/3906"
This reverts commit b0abed00e5.
|
2017-06-20 00:36:06 +02:00 |
|
tlmullis
|
fad760cc1d
|
msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh
|
2017-06-19 06:00:42 -07:00 |
|
David Cernat
|
c6aee3b780
|
[Client] Fix build by changing boost::shared_ptr into std::shared_ptr
|
2017-06-18 19:36:06 +03:00 |
|
David Cernat
|
fa3baac0f3
|
Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
|
2017-06-18 18:16:10 +03:00 |
|
Jordan Ayers
|
b277bd782e
|
Adjust restock calculations to ignore filled soul gems.
Bug #3684
|
2017-06-15 21:59:13 -05:00 |
|
Allofich
|
4f08084e79
|
Make stationary actors return to position on load
Also makes wandering actors resume their previous destination when an interrupting combat or pursuit ends.
(Fixes #3656)
|
2017-06-15 18:33:50 +09:00 |
|
Koncord
|
2d91c60a11
|
[General] Change "Lib" to "lib" in FindRakNet cmake module
|
2017-06-15 13:07:13 +08:00 |
|
Koncord
|
6192543381
|
[General] Move bracket to the right position
|
2017-06-15 13:06:07 +08:00 |
|
scrawl
|
3356fb81ce
|
Merge pull request #1280 from Allofich/guard
Make guards that are attacked try to arrest player
|
2017-06-15 00:39:57 +02:00 |
|
Allofich
|
028762a7dc
|
Make guards that are attacked try to arrest player
(Fixes #3706)
|
2017-06-15 01:47:10 +09:00 |
|
Nikolay Kasyanov
|
160a67afe1
|
Merge pull request #1319 from OpenMW/ci-reenable-macos-packaging
[macOS, CI] reenable packaging & fix nightlies
|
2017-06-13 21:24:58 +02:00 |
|
scrawl
|
cd1821c464
|
Merge pull request #1322 from Siimacore/wizardthreadfix
Stopping the thread in the wizard that prevented it to stop correctly
|
2017-06-13 19:48:06 +02:00 |
|
scrawl
|
53264f34b3
|
Merge pull request #1321 from akortunov/spellpriority
Use mRange to check spell range instead of mArea.
|
2017-06-13 17:06:47 +02:00 |
|
Bret Curtis
|
dfed710e5e
|
Merge pull request #1323 from Allofich/compile
Fixes for building in MSVC
|
2017-06-13 15:28:32 +02:00 |
|
Allofich
|
42402976e3
|
Fixes for building in MSVC
|
2017-06-13 19:38:12 +09:00 |
|
Siimacore
|
6af470ff03
|
Stopping the thread in the wizard that prevented it to stop correctly
|
2017-06-13 12:00:55 +02:00 |
|
Nikolay Kasyanov
|
97c3c45ba8
|
[macOS, CI] Use Qt 5.7
|
2017-06-13 09:18:02 +02:00 |
|
Andrei Kortunov
|
87939bf3b1
|
Use mRange to check spell range instead of mArea.
|
2017-06-13 11:02:40 +04:00 |
|
Nikolay Kasyanov
|
016da1f10c
|
[macOS, CI] Use most recent dependencies
|
2017-06-13 08:44:55 +02:00 |
|
scrawl
|
63f101e0cd
|
Update AUTHORS.md
|
2017-06-12 23:48:06 +02:00 |
|
scrawl
|
f7969fb178
|
Merge pull request #1317 from Siimacore/master
Correcting https://bugs.openmw.org/issues/3906
|
2017-06-12 23:47:07 +02:00 |
|
scrawl
|
dd3f612e88
|
Merge pull request #1316 from akortunov/doorfix
Doors usage improvements
|
2017-06-12 23:34:40 +02:00 |
|
scrawl
|
80eb2ea35d
|
Merge pull request #1313 from akortunov/spellpriority
Make combat AI to do not cast target spells under water
|
2017-06-12 23:32:35 +02:00 |
|
scrawl
|
6d90f5a9a5
|
Merge pull request #1312 from akortunov/guifixes
Split greeting from topic response
|
2017-06-12 23:19:45 +02:00 |
|
Bret Curtis
|
830ecbe101
|
Merge pull request #1318 from psi29a/fix_deboosting
Fix deboosting
|
2017-06-12 07:25:11 +02:00 |
|
Koncord
|
3803535bd5
|
[General] Implement CleanChat()
|
2017-06-12 08:01:47 +08:00 |
|
Bret Curtis
|
c6805314c2
|
be explicit about what we are trying to catch instead of catching everything and fixed up formatting
use Allman style brackets not K&R style, additional formatting for fallback.cpp which needed some love
revert allman formatting changes
|
2017-06-12 00:32:29 +02:00 |
|
Bret Curtis
|
7c758a6293
|
std::stof can not handle comma in us localization and can not handle period in french localization, using std::replace is not a solution, going back to boost::lexical_cast
|
2017-06-12 00:32:28 +02:00 |
|
Bret Curtis
|
f0b21cca22
|
use own inline hash_combine function
|
2017-06-12 00:32:28 +02:00 |
|
scrawl
|
fb7479c194
|
Update CONTRIBUTING.md
|
2017-06-11 23:52:01 +02:00 |
|
Koncord
|
7b98f9f7ff
|
[Server] Log all exceptions
|
2017-06-11 20:04:56 +08:00 |
|
Andrei Kortunov
|
e9d0bf7c12
|
Added missed return statement
|
2017-06-11 15:06:44 +04:00 |
|
Nikolay Kasyanov
|
913601facc
|
[macOS, CI] reenable packaging to make nightlies work
|
2017-06-11 11:18:39 +02:00 |
|
Andrei Kortunov
|
9fdfb2a83f
|
Spell priority: make AI do not cast target spells when enemy is under water
|
2017-06-11 10:13:00 +04:00 |
|
Siimacore
|
b0abed00e5
|
Correcting https://bugs.openmw.org/issues/3906
|
2017-06-10 21:36:35 +02:00 |
|
Andrei Kortunov
|
cab51d26cc
|
Doors: small key search optimizations
|
2017-06-10 22:33:14 +04:00 |
|
Andrei Kortunov
|
188424d5d3
|
Allow AI to use keys to open doors
|
2017-06-10 22:31:17 +04:00 |
|
David Cernat
|
51b95f35cd
|
[Server] Fix problem with fetching interior cell descriptions
|
2017-06-10 18:03:58 +03:00 |
|
David Cernat
|
db7709ee18
|
[Server] Modernize getting and setting of player cells
|
2017-06-10 17:49:41 +03:00 |
|
Bret Curtis
|
266ffc84ff
|
Merge pull request #1315 from devnexen/getuid_build_fix
needs this head for getuid
|
2017-06-10 16:25:37 +02:00 |
|
David Cernat
|
0d3976950b
|
[Server] Use consistent names for rotation script functions
|
2017-06-10 17:06:09 +03:00 |
|
David Carlier
|
8a5c62de97
|
needs this head for getuid
|
2017-06-10 14:50:43 +01:00 |
|