David Cernat
|
fa3baac0f3
|
Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
|
7 years ago |
Koncord
|
2d91c60a11
|
[General] Change "Lib" to "lib" in FindRakNet cmake module
|
7 years ago |
|
Koncord
|
6192543381
|
[General] Move bracket to the right position
|
7 years ago |
scrawl
|
3356fb81ce
|
Merge pull request #1280 from Allofich/guard
Make guards that are attacked try to arrest player
|
7 years ago |
Allofich
|
028762a7dc
|
Make guards that are attacked try to arrest player
(Fixes #3706)
|
7 years ago |
Nikolay Kasyanov
|
160a67afe1
|
Merge pull request #1319 from OpenMW/ci-reenable-macos-packaging
[macOS, CI] reenable packaging & fix nightlies
|
7 years ago |
|
scrawl
|
cd1821c464
|
Merge pull request #1322 from Siimacore/wizardthreadfix
Stopping the thread in the wizard that prevented it to stop correctly
|
7 years ago |
|
scrawl
|
53264f34b3
|
Merge pull request #1321 from akortunov/spellpriority
Use mRange to check spell range instead of mArea.
|
7 years ago |
Bret Curtis
|
dfed710e5e
|
Merge pull request #1323 from Allofich/compile
Fixes for building in MSVC
|
7 years ago |
|
Allofich
|
42402976e3
|
Fixes for building in MSVC
|
7 years ago |
Siimacore
|
6af470ff03
|
Stopping the thread in the wizard that prevented it to stop correctly
|
7 years ago |
|
Nikolay Kasyanov
|
97c3c45ba8
|
[macOS, CI] Use Qt 5.7
|
7 years ago |
Andrei Kortunov
|
87939bf3b1
|
Use mRange to check spell range instead of mArea.
|
7 years ago |
|
Nikolay Kasyanov
|
016da1f10c
|
[macOS, CI] Use most recent dependencies
|
7 years ago |
|
scrawl
|
63f101e0cd
|
Update AUTHORS.md
|
7 years ago |
|
scrawl
|
f7969fb178
|
Merge pull request #1317 from Siimacore/master
Correcting https://bugs.openmw.org/issues/3906
|
7 years ago |
|
scrawl
|
dd3f612e88
|
Merge pull request #1316 from akortunov/doorfix
Doors usage improvements
|
7 years ago |
|
scrawl
|
80eb2ea35d
|
Merge pull request #1313 from akortunov/spellpriority
Make combat AI to do not cast target spells under water
|
7 years ago |
|
scrawl
|
6d90f5a9a5
|
Merge pull request #1312 from akortunov/guifixes
Split greeting from topic response
|
7 years ago |
|
Bret Curtis
|
830ecbe101
|
Merge pull request #1318 from psi29a/fix_deboosting
Fix deboosting
|
7 years ago |
|
Koncord
|
3803535bd5
|
[General] Implement CleanChat()
|
7 years ago |
|
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
|
7 years ago |
|
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
|
7 years ago |
|
Bret Curtis
|
f0b21cca22
|
use own inline hash_combine function
|
7 years ago |
|
scrawl
|
fb7479c194
|
Update CONTRIBUTING.md
|
7 years ago |
|
Koncord
|
7b98f9f7ff
|
[Server] Log all exceptions
|
7 years ago |
|
Andrei Kortunov
|
e9d0bf7c12
|
Added missed return statement
|
7 years ago |
|
Nikolay Kasyanov
|
913601facc
|
[macOS, CI] reenable packaging to make nightlies work
|
7 years ago |
|
Andrei Kortunov
|
9fdfb2a83f
|
Spell priority: make AI do not cast target spells when enemy is under water
|
7 years ago |
|
Siimacore
|
b0abed00e5
|
Correcting https://bugs.openmw.org/issues/3906
|
7 years ago |
|
Andrei Kortunov
|
cab51d26cc
|
Doors: small key search optimizations
|
7 years ago |
|
Andrei Kortunov
|
188424d5d3
|
Allow AI to use keys to open doors
|
7 years ago |
|
David Cernat
|
51b95f35cd
|
[Server] Fix problem with fetching interior cell descriptions
|
7 years ago |
|
David Cernat
|
db7709ee18
|
[Server] Modernize getting and setting of player cells
|
7 years ago |
|
Bret Curtis
|
266ffc84ff
|
Merge pull request #1315 from devnexen/getuid_build_fix
needs this head for getuid
|
7 years ago |
|
David Cernat
|
0d3976950b
|
[Server] Use consistent names for rotation script functions
|
7 years ago |
David Carlier
|
8a5c62de97
|
needs this head for getuid
|
7 years ago |
|
David Cernat
|
bea3afaec8
|
[Client] Ensure uninitialization of DedicatedActors for late packets
|
7 years ago |
|
David Cernat
|
1ae5bd19e1
|
[Client] Don't set difficulty based on client settings
|
7 years ago |
|
David Cernat
|
70d9374a6a
|
[General] Implement PlayerKillCount packets
|
7 years ago |
|
David Cernat
|
5b23da8e1c
|
[General] Rename unused PlayerRegionChange packet into PlayerKillCount
|
7 years ago |
|
David Cernat
|
ee5c9b65c5
|
[General] When changing region, send new region name in PlayerCellChange
|
7 years ago |
|
David Cernat
|
e5f5b047bc
|
[Client] Don't send empty ObjectSpawn packets for cells with no leveled creatures
|
7 years ago |
|
Bret Curtis
|
11c4aed4e5
|
algo needed for std::min/max in msvc2013
|
7 years ago |
|
David Cernat
|
f02ed0d621
|
[Server] Add script functions for getting and setting actor dynamic stat modifiers
|
7 years ago |
|
David Cernat
|
79351c737e
|
[Client] Disable back button in chargen race window
|
7 years ago |
|
David Cernat
|
002013294a
|
[Client] Add temporary fix for OpenMW crash caused by using default head
|
7 years ago |
|
David Cernat
|
312fc84a6f
|
[Client] Use update timer in mwmp::Cell instead of LocalActor
|
7 years ago |
|
Bret Curtis
|
dbf149f9b2
|
gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now
|
7 years ago |
|
Andrei Kortunov
|
4600f24e27
|
Playing sound when AI is opening a door
|
7 years ago |