AnyOldName3
|
69da89be39
|
Mark a method I missed out the first time as override
|
2017-10-18 13:05:04 +01:00 |
|
AnyOldName3
|
2aad5bed7a
|
Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos
|
2017-10-18 05:06:09 +01:00 |
|
David Cernat
|
e164e6305e
|
Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
2017-10-16 07:37:29 +03:00 |
|
glbwsk
|
83a5c7c3d8
|
removed unnecessary comments, added gitignore for clion cmake
|
2017-10-13 20:32:52 +02:00 |
|
glbwsk
|
ff9cb22a58
|
npc swap cheaper ring during auto equip
|
2017-10-13 15:16:07 +02:00 |
|
glbwsk
|
e6e482ea98
|
added some comments for autoEquip
|
2017-10-13 14:47:26 +02:00 |
|
glbwsk
|
a25903b075
|
fixed autoequiping rings by npc - now checks if right hand is free
|
2017-10-13 14:39:44 +02:00 |
|
David Cernat
|
3e8d7c8416
|
Merge pull request #306 from OpenMW/master
Add OpenMW commits up to 7 Oct 2017
|
2017-10-07 21:54:21 +03:00 |
|
Andrei Kortunov
|
e2afd3690c
|
Remove item by id from InventoryStore
|
2017-10-06 10:54:25 +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 |
|
scrawl
|
8c0790580a
|
Add screen fading for exterior cell transitions
|
2017-10-05 18:41:02 +02: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 |
|
scrawl
|
64e27c032b
|
Merge pull request #1481 from scrawl/keyfocus
WindowManager overhaul & improved keyboard support
|
2017-09-28 22:34:05 +00: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 |
|
scrawl
|
2ce79e07a4
|
Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
|
2017-09-25 23:38:28 +02:00 |
|
scrawl
|
84657271c7
|
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
|
2017-09-24 19:08:12 +02:00 |
|
Andrei Kortunov
|
7d703a13a3
|
Fix a crash in the World::isUnderwater() if the cell is empty
|
2017-09-24 16:28:05 +04:00 |
|
scrawl
|
2494c22d66
|
Merge pull request #1470 from MiroslavR/convertmprj
ESS-Importer: Convert magic projectiles
|
2017-09-23 22:55:56 +00:00 |
|
MiroslavR
|
b5f5268ff3
|
Clean up faraway projectiles
|
2017-09-23 18:54:17 +02:00 |
|
David Cernat
|
73e7aa838d
|
Merge pull request #296 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwgui/container.cpp
|
2017-09-22 19:12:41 +03:00 |
|
scrawl
|
0e648222b8
|
Merge pull request #1446 from akortunov/takeallfix
Do not allow to equip a replacement, when take all items from a dead corpse
|
2017-09-22 09:14:21 +00:00 |
|
Andrei Kortunov
|
4580024d76
|
Unequip all items from dead corpse when take all items (bug #4095)
|
2017-09-22 12:32:47 +04:00 |
|
MiroslavR
|
f15de6d3ca
|
ESS-Importer: Convert magic projectiles (Closes #2320)
|
2017-09-20 18:58:56 +02:00 |
|
David Cernat
|
960b91a53c
|
Merge pull request #290 from OpenMW/master
Add OpenMW commits up to 17 Sep 2017
|
2017-09-17 10:53:33 +03:00 |
|
scrawl
|
5dd2e871c8
|
Merge pull request #1450 from kcat/master
Sound improvements
|
2017-09-16 15:59:13 +00:00 |
|
Andrei Kortunov
|
44738e1141
|
Clear player fields upon reload (bug #2639)
|
2017-09-15 22:39:56 +04:00 |
|
Chris Robinson
|
780e82480d
|
Make the PlayMode and PlayType enums scoped
Also shorten them by putting them in the MWSound namespace
|
2017-09-15 02:36:59 -07:00 |
|
Chris Robinson
|
1fe60dd8e2
|
Replace some shared_ptrs with pointers to deque entries
|
2017-09-14 16:00:30 -07:00 |
|
David Cernat
|
98a7769b91
|
Merge branch 'master' into 0.6.0
|
2017-08-31 15:44:27 +03: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 |
|
David Cernat
|
f6d36d5d80
|
[Client] Ensure that objects searched for have a valid reference number
|
2017-08-31 03:40:36 +03:00 |
|
AnyOldName3
|
1578fcbec7
|
Escape content file names before sending them to the GUI
|
2017-08-25 10:05:56 +00:00 |
|
Andrei Kortunov
|
7c80ddc9de
|
Owned crosshair improvements (bug #2789)
|
2017-08-18 17:08:15 +04: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 |
|
MiroslavR
|
d24286273b
|
Prevent respawned references from being added to the scene twice in certain cases (Fixes #3864)
|
2017-08-01 00:11:14 +02: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
|
20606a2aff
|
Add 'prediction time' setting for cell/terrain pre-loading
|
2017-07-19 16:44:37 +02:00 |
|
scrawl
|
a629d48df6
|
Update the facedObject after the camera is updated
|
2017-07-19 13:05:51 +02:00 |
|
David Cernat
|
fd046e42ef
|
Merge pull request #242 from OpenMW/master
Add OpenMW commits up to 16 Jul 2017
|
2017-07-17 21:34:44 +03:00 |
|
scrawl
|
2c95f40640
|
Merge pull request #1333 from akortunov/guidistortionfix
Disable sound distortion for GUI actions and PlaySound command [discussion]
|
2017-07-16 18:28:03 +00:00 |
|
Andrei Kortunov
|
dca8317083
|
Disable sound distortion for player actions in GUI mode
|
2017-07-15 10:59:08 +04: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 |
|
Koncord
|
aa1f5c3cd3
|
[Client] Change pointer type to reference
|
2017-06-27 21:58:36 +08:00 |
|
David Cernat
|
813a3c89c4
|
[General] Implement PlayerBook packet to track skill books read
|
2017-06-27 08:27:14 +03:00 |
|
David Cernat
|
a358dc6af8
|
[Client] Revert 0020132 now that 534c819 provides a better fix
|
2017-06-26 07:36:57 +03:00 |
|
David Cernat
|
77758596a1
|
Merge pull request #230 from OpenMW/master
Add OpenMW commits up to 25 Jun 2017
|
2017-06-26 03:13:00 +03:00 |
|
scrawl
|
534c81976c
|
Add missing cell update for physics system (Fixes #3917)
|
2017-06-25 12:47:57 +02: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 |
|
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 |
|
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 |
|
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 |
|
Bret Curtis
|
07f75e1104
|
replace boost::shared_ptr in extern and components
|
2017-06-09 19:08:53 +02:00 |
|
Ewan Higgs
|
38a2de3c51
|
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
|
2017-06-09 16:49:25 +02:00 |
|
Andrei Kortunov
|
3190f28710
|
Spell priority: make AI do not cast target spells under water
|
2017-06-09 10:23:46 +04: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
|
75a60a4700
|
[Client] Update debug in CellStore
|
2017-06-02 05:26:07 +03:00 |
|
David Cernat
|
461ab790e2
|
[Client] Correctly disable auto-equipping for DedicatedPlayers & DedicatedActors
|
2017-05-31 05:11:39 +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
|
ea2a060c67
|
[Client] Sync actor movements from interiors to exteriors & vice versa
|
2017-05-28 01:11:32 +03:00 |
|
David Cernat
|
7177d56cfb
|
[Client] Only require refNumIndex & mpNum for CellStore::searchExact()
|
2017-05-27 16:59:23 +03:00 |
|
David Cernat
|
cdfc2db2d1
|
Merge pull request #220 from OpenMW/master
Add OpenMW commits up to 26 May 2017
|
2017-05-26 17:38:59 +03:00 |
|
David Cernat
|
32879adc5b
|
[General] Allow ObjectTrap to trigger traps, not just disarm them
|
2017-05-26 01:28:43 +03:00 |
|
David Cernat
|
7ac115b359
|
[Client] Implement sending and reading of ObjectTrap packets
|
2017-05-26 00:21:24 +03:00 |
|
Andrei Kortunov
|
f17badb3cd
|
Makes cells cache size configurable
|
2017-05-25 13:09:40 +04:00 |
|
David Cernat
|
97768be14b
|
[Client] Send ObjectPlace packet for random creatures interrupting rest
|
2017-05-25 01:00:47 +03:00 |
|
David Cernat
|
26087a182d
|
Merge pull request #213 from OpenMW/master
Add OpenMW commits up to 8 May 2017
|
2017-05-08 01:03:19 +03:00 |
|
David Cernat
|
34f0a5e076
|
[Client] Disable leveled creatures from their class instead of scene.cpp
|
2017-05-07 03:18:15 +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
|
bdc8b7f863
|
[Client] Send level creatures in ObjectPlace reply to ActorList request
|
2017-05-06 08:40:36 +03:00 |
|
David Cernat
|
9eef867928
|
[Client] Disable regular spawning of leveled creatures
|
2017-05-06 08:37:51 +03:00 |
|
David Cernat
|
8d41a0c53b
|
[Client] Make LocalActor initialization include newly spawned Actors
|
2017-05-05 02:46:16 +03:00 |
|
David Cernat
|
ebf9df3fe2
|
[Client] Add getMergedRefs() method to CellStore
|
2017-05-02 03:29:52 +03:00 |
|
David Cernat
|
9b58973929
|
[Client] Remove variable added by tes3mp to CellStore that is not used
|
2017-05-02 02:42:37 +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 |
|
Andrei Kortunov
|
bba822c014
|
Purge all effects with same ID instead only first (fixes #3839)
|
2017-04-26 17:18:06 +04: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
|
5c5c62f33a
|
Merge pull request #206 from OpenMW/master
Add OpenMW commits up to 23 Apr 2017, part 2
|
2017-04-23 21:35:09 +03:00 |
|
MiroslavR
|
eada8c6822
|
Fix wrong incrementation in InventoryStore::visitEffectSources (Fixes #3838)
|
2017-04-23 18:05:41 +02: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 |
|