David Cernat
|
5d4b97645d
|
Merge pull request #374 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/CMakeLists.txt
|
2018-01-27 22:52:59 +02:00 |
|
scrawl
|
e2e48e0a50
|
Add default value for 'sAnd' GMST (Fixes #4269)
|
2018-01-14 00:27:05 +00:00 |
|
scrawl
|
d9d8de3061
|
Catch exceptions in updateWindowManager (Bug #4269)
|
2018-01-14 00:26:37 +00:00 |
|
David Cernat
|
ecb0ad0d77
|
Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
|
2017-12-25 02:03:02 +02:00 |
|
Andrei Kortunov
|
1a58171e86
|
Do not allow to sell items from containers with zero capacity (bug #4268)
|
2017-12-17 18:09:25 +04:00 |
|
Andrei Kortunov
|
a28cc37501
|
Do not sell ingredients from organic containers
|
2017-12-05 10:24:58 +04:00 |
|
David Cernat
|
38247ff086
|
Merge pull request #303 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
|
2017-10-06 04:10:04 +03:00 |
|
Andrei Kortunov
|
03daf2b9e3
|
Fix a failed assert in the getCell() check during a new game start
|
2017-09-29 22:28:09 +04:00 |
|
David Cernat
|
ddf0dfed55
|
Merge pull request #298 from OpenMW/master
Add OpenMW commits up to 26 Sep 2017
|
2017-09-26 21:54:55 +03:00 |
|
Andrei Kortunov
|
7d703a13a3
|
Fix a crash in the World::isUnderwater() if the cell is empty
|
2017-09-24 16:28:05 +04:00 |
|
MiroslavR
|
f15de6d3ca
|
ESS-Importer: Convert magic projectiles (Closes #2320)
|
2017-09-20 18:58:56 +02:00 |
|
David Cernat
|
4468e6ec4a
|
Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
2017-08-31 15:14:13 +03:00 |
|
spycrab
|
632d39ca76
|
Allow starting at an (unnamed) exterior cell using --start (Feature #3941)
|
2017-08-06 22:31:07 +02:00 |
|
David Cernat
|
721b218cc2
|
Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# README.md
|
2017-08-05 00:09:34 +03:00 |
|
David Cernat
|
fbec0d9443
|
[Client] Remove inertia from players who are teleported via a packet
|
2017-08-04 21:43:01 +03:00 |
|
scrawl
|
333648c975
|
Merge pull request #1324 from akortunov/doorfix
Improved doors detection
|
2017-07-31 17:42:53 +00:00 |
|
Andrei Kortunov
|
10eb6ec75f
|
AI: Check angle between actor and door
|
2017-07-31 19:28:02 +04:00 |
|
Andrei Kortunov
|
920021c61b
|
Update effects during rest (bug #3679)
|
2017-07-28 16:50:52 +04:00 |
|
David Cernat
|
2c1ece79fc
|
Merge pull request #245 from OpenMW/master
Add OpenMW commits up to 22 Jul 2017
|
2017-07-23 22:02:16 +03:00 |
|
scrawl
|
c9f8a220dc
|
Update the tooltip when the focusObject is set
|
2017-07-20 20:59:36 +02:00 |
|
David Cernat
|
b8b3856c73
|
Merge pull request #244 from OpenMW/master
Add OpenMW commits up to 19 Jul 2017
|
2017-07-19 20:49:56 +03:00 |
|
scrawl
|
a629d48df6
|
Update the facedObject after the camera is updated
|
2017-07-19 13:05:51 +02:00 |
|
Andrei Kortunov
|
37952c9a79
|
Added door detection based by ray casting
|
2017-07-03 22:08:29 +04:00 |
|
David Cernat
|
99640da111
|
Merge pull request #234 from OpenMW/master
Add OpenMW commits up to 30 Jun 2017
|
2017-07-02 14:22:06 +03:00 |
|
scrawl
|
951c4e12e0
|
Fix crash introduced by commit 1d8a9ff622 (Fixes #3940)
|
2017-06-30 00:52:02 +02:00 |
|
David Cernat
|
a358dc6af8
|
[Client] Revert 0020132 now that 534c819 provides a better fix
|
2017-06-26 07:36:57 +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 |
|
David Cernat
|
002013294a
|
[Client] Add temporary fix for OpenMW crash caused by using default head
|
2017-06-10 06:49:07 +03:00 |
|
Bret Curtis
|
d785344fad
|
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
|
2017-06-09 19:08:53 +02:00 |
|
David Cernat
|
89f6c6df96
|
Merge pull request #225 from OpenMW/master
Add OpenMW commits up to 4 Jun 2017
|
2017-06-05 03:38:58 +03:00 |
|
Nicholas
|
f6f07f5497
|
clear mGoToJail flag on load
|
2017-06-02 13:33:47 -05:00 |
|
David Cernat
|
8c785fb22c
|
[Client] Send ObjectDelete packets when summoned creatures despawn
|
2017-06-02 09:15:08 +03:00 |
|
David Cernat
|
f4cdedd8cb
|
[General] Synchronize summoned creatures
|
2017-05-30 10:11:01 +03:00 |
|
David Cernat
|
4e5c8873e0
|
[General] Use ObjectSpawn instead of ObjectPlace for actors
|
2017-05-29 06:59:05 +03:00 |
|
David Cernat
|
97768be14b
|
[Client] Send ObjectPlace packet for random creatures interrupting rest
|
2017-05-25 01:00:47 +03:00 |
|
David Cernat
|
dcc61a095a
|
[Client] Allow multiple WorldObjects to be added to a WorldEvent
|
2017-05-06 20:44:39 +03:00 |
|
David Cernat
|
809b4d78ba
|
[Client] Split off DedicatedPlayer and PlayerList into different files
|
2017-04-30 14:57:43 +03:00 |
|
Koncord
|
7af73782f3
|
[OpenMW] Implement MWWorld::createRecord for Creatures
|
2017-04-30 00:16:19 +08:00 |
|
David Cernat
|
a82646a130
|
[Client] Delineate tes3mp-only code more clearly, part 2
|
2017-04-24 19:46:12 +03:00 |
|
David Cernat
|
dba0d47973
|
[Client] Revert position changes on invalid cell changes to fix glitches
|
2017-04-23 22:25:16 +03:00 |
|
David Cernat
|
9ea69f4c1f
|
[Client] Add LocalActor & DedicatedActor cell transition logic to World::moveObject()
|
2017-04-23 14:01:13 +03:00 |
|
David Cernat
|
4e86d8781f
|
[Client] Clean up & simplify logic for DedicatedPlayer cell transitions
|
2017-04-23 14:01:13 +03:00 |
|
David Cernat
|
a5484d237b
|
Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
|
2017-04-21 21:07:37 +03:00 |
|
scrawl
|
1956602aa2
|
Merge pull request #1262 from Allofich/warnings
Fix more warnings
|
2017-04-21 14:34:36 +02:00 |
|
David Cernat
|
fec82dc033
|
Merge pull request #202 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017
|
2017-04-21 07:58:13 +03:00 |
|
scrawl
|
c2240e3af1
|
Call the WindowManager::updatePlayer after the startup script is run
|
2017-04-21 00:51:13 +02:00 |
|
Allofich
|
ff3e307059
|
Pass parameters by const reference
|
2017-04-20 23:47:03 +09:00 |
|
David Cernat
|
c6cd0a2953
|
Merge pull request #196 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
|
2017-04-13 07:07:49 +03:00 |
|
scrawl
|
8f335b3484
|
Merge pull request #1245 from akortunov/tgm
Vanilla-like tgm
|
2017-04-11 21:34:44 +02:00 |
|
David Cernat
|
9beaf9b7a1
|
[Client] Initialize and update LocalActors while their cells are active
|
2017-04-06 00:49:20 +03:00 |
|