David Cernat
8a23a96da4
[Client] Update initialization of AiFollow packages in multiplayer code
2018-07-04 04:00:12 +03:00
David Cernat
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
2018-07-04 01:52:29 +03:00
Koncord
79903c455c
[General] Allow different types for vectorContains
2018-07-04 01:31:45 +08:00
Koncord
1f4e6e9114
[General] Add integrity checks to Handshake packet
2018-07-03 18:41:03 +08:00
Koncord
f9ff5f10df
[General] Reduce packets size and add integrity checks
2018-07-03 18:41:03 +08:00
Koncord
fa2bf0663e
[General] Simplify vectorContains
2018-07-03 18:41:03 +08:00
Marc Zinnschlag
908af3720f
Merged pull request #1791
2018-07-03 09:37:51 +02:00
Marc Zinnschlag
47d0321366
updated credits file
2018-07-03 09:09:48 +02:00
Marc Zinnschlag
2a367a0c35
updated changelog
2018-07-03 09:09:05 +02:00
Marc Zinnschlag
e50c3657b3
Merged merge request !16
2018-07-03 09:05:59 +02:00
Marc Zinnschlag
9a88f9147e
Merged merge request !15
2018-07-03 08:59:57 +02:00
Doc West
e9cc697b60
Sort EnumDelegate values by name
2018-07-03 00:52:23 +02:00
David Cernat
3aa125ceda
[Server] Add script functions for getting a summoner's refId and indexes
2018-07-03 00:54:08 +03:00
Koncord
53346e2663
[Client] Return 0 if effect not found
2018-07-03 03:43:38 +08:00
Koncord
c5c1a160b2
[Client] Comment out an unused variable
2018-07-03 03:35:48 +08:00
Koncord
c69819e0db
[General] Change type of refNumIndex & mpNum to unsigned
2018-07-03 03:34:30 +08:00
Koncord
99158beb2e
[General] Change effectCount type to unsigned
2018-07-03 03:32:46 +08:00
Koncord
895634cd16
[General] Change type of MpNum to "unsigned int"
2018-07-03 03:25:54 +08:00
Koncord
779f2a564d
[General] Change "unsigned long" to uint32_t for cross platform compatibility
2018-07-03 03:04:41 +08:00
Koncord
23684489da
[General] Fix clang-tidy warning
...
Converting integer literal to bool, use bool literal instead
2018-07-03 02:50:21 +08:00
Koncord
7639db02f3
[General] RW functions return true on success
2018-07-03 02:28:20 +08:00
Koncord
45c7c3a0b6
[General] Add integrity checks to PacketPreInit
2018-07-03 02:21:36 +08:00
Koncord
d999cc0d55
[General] Add packetValid flag to packets
2018-07-03 02:06:52 +08:00
Koncord
695fb7d4a7
[General] Reorder RW(string) arguments
...
Change limit of default max string size to 64 KiB
2018-07-03 01:12:59 +08:00
David Cernat
f9ebe400f7
[Server] Add script function for checking if object's summoner is player
2018-07-02 18:32:42 +03:00
Koncord
d162f6fd3a
[General] Explicitly use limitations of the master server
2018-07-02 23:29:07 +08:00
Koncord
a48d5b48ef
[General] Add maxSize parameter to RW(std::string)
...
Minor type changes
2018-07-02 23:19:39 +08:00
Koncord
62877f38b7
[General] Remove Terra support
...
Use LuaJIT instead.
2018-07-02 23:07:09 +08:00
Koncord
685a80887b
Remove Pawn support
2018-07-02 23:00:35 +08:00
Andrei Kortunov
f4330cf057
Editor: limit FPS in 3D preview windows (feature #3641 )
2018-07-02 12:20:34 +04:00
Thunderforge
7cbc4eeb49
Adding missing override keywords
...
Prevents compiler warnings such as this:
```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void onOpen();
^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
virtual void onOpen() {}
^
```
2018-07-01 19:17:50 -05:00
David Cernat
bef53749ed
[General] Replace BaseObject's hasMaster variable with isSummon
...
Additionally, add a GetObjectSummonState() script function to the server.
2018-07-02 02:25:06 +03:00
David Cernat
8ce225b1cc
[Client] Use the casters of damage-dealing spells as death reasons
2018-07-02 00:42:32 +03:00
Marc Zinnschlag
aa5ddd6b28
Merged merge request livestreamer https://www.twitch.tv/vanguardlx best
2018-07-01 15:25:38 +02:00
Finbar Crago
5d9035c6b2
[ Fixes #4482 ] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480 )
...
because apparently i can't count to ten...
2018-07-01 13:46:23 +10:00
David Cernat
958b220835
[General] Send summon duration to server in ObjectSpawn packets
2018-07-01 00:43:29 +03:00
Marc Zinnschlag
3660d55adf
updated credits file
2018-06-30 10:21:10 +02:00
Marc Zinnschlag
362798bd90
updated changelog
2018-06-30 10:20:12 +02:00
Marc Zinnschlag
2ea85d0bb6
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
2018-06-30 10:17:05 +02:00
Bret Curtis
dcb2ab80f5
Merge pull request #1788 from Capostrophic/armorcond
...
Make unarmed creature attacks not affect armor condition (bug #2455 )
2018-06-30 08:39:06 +02:00
Finbar Crago
09c9bd34c3
cleanup more unnecessary struct keywords...
2018-06-30 12:43:50 +10:00
Capostrophic
6e9c08083d
Add missing empty attacker checks
2018-06-29 20:35:45 +03:00
Capostrophic
bccba24c40
Make unarmed creature attacks not affect armor condition ( fixes #2455 )
2018-06-29 20:18:28 +03:00
Finbar Crago
69cd7031e7
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 23:46:36 +10:00
Finbar Crago
596be205c1
cleanup unnecessary struct keywords...
2018-06-29 23:43:51 +10:00
Finbar Crago
2722ca50fb
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
2018-06-29 23:32:05 +10:00
Marc Zinnschlag
a45d86bdf3
Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2'
2018-06-29 12:55:55 +02:00
Marc Zinnschlag
f06dd39892
Merge remote-tracking branch 'upstream/master'
2018-06-29 12:52:54 +02:00
Finbar Crago
7ae388086b
Merge branch 'master' into fix_quickkey_segfalt
2018-06-29 12:34:53 +10:00
Thunderforge
72f6b1a693
Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface"
2018-06-28 20:13:18 -05:00
