Commit graph

22063 commits

Author SHA1 Message Date
Doc West
bf49a3e760 Use setData() instead of emtitting dataChanged() which does not work on CI. Also Fixes the remaining issue with subviews not updating due to only the modified flag emitting a change, which prevented the widget mapper from working for updates. 2018-07-04 23:22:15 +02:00
Doc West
96cf2cbd05 Notify views of changes of all cells in a row to properly update the row after revert 2018-07-04 22:37:10 +02:00
Doc West
1c1b5986e9 Updated change log 2018-07-04 22:05:07 +02:00
Doc West
5d38160239 Updated change log 2018-07-04 22:03:42 +02:00
Doc West
2c39dba83b Updated change log 2018-07-04 22:01:45 +02:00
Doc West
baf21362e1 Fixed undo / redo actions losing their shortcuts 2018-07-04 21:47:16 +02:00
Doc West
414f626309 Implemented search case sensitivity 2018-07-04 21:03:54 +02:00
David Cernat
c2411982d2 [Client] Log object refNumIndexes and mpNums in a consistent way 2018-07-04 21:54:11 +03:00
Bret Curtis
2ff9dc34a4 Merge branch 'win10_ci' into 'master'
see if we can get win10 going

See merge request OpenMW/openmw!8
2018-07-04 16:54:28 +00:00
Bret Curtis
d4d46fc602 Build everything but branches until we can allow VM/CIs to run on forked projects. 2018-07-04 16:51:57 +00:00
Bret Curtis
739c49d59b Merge branch 'master' into 'win10_ci'
# Conflicts:
#   CI/before_script.msvc.sh
2018-07-04 15:21:45 +00:00
AnyOldName3
8c153d116b
Merge pull request #1786 from OpenMW/CI_before_script_msvc_fixes
Update before_script.msvc.sh to add GitLab CI support and update dependency links
2018-07-04 15:44:25 +01:00
David Cernat
7775780ad7 [Cllient] Update multiplayer code for handling quick keys 2018-07-04 05:56:10 +03:00
David Cernat
3438061b55 [Server] Add script function for getting a summoner's pid
Additionally, fix typos in the comments for other script functions relating to summoners.
2018-07-04 04:26:44 +03:00
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
Bret Curtis
57e2573593
Update before_script.msvc.sh
check if temp directory exists, error out and warn user about it.
2018-07-03 15:59:51 +02:00
Bret Curtis
70e9d5c0a0 ; it? 2018-07-03 13:53:13 +00:00
Bret Curtis
11030e56c4 detect existing dir 2018-07-03 13:41:06 +00:00
Bret Curtis
4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 2018-07-03 13:00:19 +00:00
Bret Curtis
d4c9586bd0 try just converting the \ to a / 2018-07-03 12:53:30 +00: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