Commit graph

  • 739c49d59b Merge branch 'master' into 'win10_ci' Bret Curtis 2018-07-04 15:21:45 +0000
  • 8c153d116b
    Merge pull request #1786 from OpenMW/CI_before_script_msvc_fixes AnyOldName3 2018-07-04 15:44:25 +0100
  • 7775780ad7 [Cllient] Update multiplayer code for handling quick keys David Cernat 2018-07-04 05:56:10 +0300
  • 3438061b55 [Server] Add script function for getting a summoner's pid David Cernat 2018-07-04 04:26:44 +0300
  • 8a23a96da4 [Client] Update initialization of AiFollow packages in multiplayer code David Cernat 2018-07-04 04:00:12 +0300
  • a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts David Cernat 2018-07-04 01:52:29 +0300
  • 79903c455c [General] Allow different types for vectorContains Koncord 2018-07-04 01:31:45 +0800
  • 57e2573593
    Update before_script.msvc.sh Bret Curtis 2018-07-03 15:59:51 +0200
  • 70e9d5c0a0 ; it? Bret Curtis 2018-07-03 13:53:13 +0000
  • 11030e56c4 detect existing dir Bret Curtis 2018-07-03 13:41:06 +0000
  • 4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. Bret Curtis 2018-07-03 13:00:19 +0000
  • d4c9586bd0 try just converting the \ to a / Bret Curtis 2018-07-03 12:53:30 +0000
  • 1f4e6e9114 [General] Add integrity checks to Handshake packet Koncord 2018-07-03 18:40:58 +0800
  • f9ff5f10df [General] Reduce packets size and add integrity checks Koncord 2018-07-03 18:40:11 +0800
  • fa2bf0663e [General] Simplify vectorContains Koncord 2018-07-03 18:34:41 +0800
  • 908af3720f Merged pull request #1791 Marc Zinnschlag 2018-07-03 09:37:51 +0200
  • 47d0321366 updated credits file Marc Zinnschlag 2018-07-03 09:09:48 +0200
  • 2a367a0c35 updated changelog Marc Zinnschlag 2018-07-03 09:09:05 +0200
  • e50c3657b3 Merged merge request !16 Marc Zinnschlag 2018-07-03 09:05:59 +0200
  • 9a88f9147e Merged merge request !15 Marc Zinnschlag 2018-07-03 08:59:57 +0200
  • e9cc697b60 Sort EnumDelegate values by name Doc West 2018-07-03 00:52:23 +0200
  • 3aa125ceda [Server] Add script functions for getting a summoner's refId and indexes David Cernat 2018-07-03 00:53:52 +0300
  • 53346e2663 [Client] Return 0 if effect not found Koncord 2018-07-03 03:43:38 +0800
  • c5c1a160b2 [Client] Comment out an unused variable Koncord 2018-07-03 03:35:48 +0800
  • c69819e0db [General] Change type of refNumIndex & mpNum to unsigned Koncord 2018-07-03 03:34:30 +0800
  • 99158beb2e [General] Change effectCount type to unsigned Koncord 2018-07-03 03:32:46 +0800
  • 895634cd16 [General] Change type of MpNum to "unsigned int" Koncord 2018-07-03 03:25:54 +0800
  • 779f2a564d [General] Change "unsigned long" to uint32_t for cross platform compatibility Koncord 2018-07-03 03:04:41 +0800
  • 23684489da [General] Fix clang-tidy warning Koncord 2018-07-03 02:50:21 +0800
  • 7639db02f3 [General] RW functions return true on success Koncord 2018-07-03 02:28:20 +0800
  • 45c7c3a0b6 [General] Add integrity checks to PacketPreInit Koncord 2018-07-03 02:21:36 +0800
  • d999cc0d55 [General] Add packetValid flag to packets Koncord 2018-07-03 02:06:52 +0800
  • 695fb7d4a7 [General] Reorder RW(string) arguments Koncord 2018-07-03 01:12:59 +0800
  • f9ebe400f7 [Server] Add script function for checking if object's summoner is player David Cernat 2018-07-02 15:54:39 +0300
  • d162f6fd3a [General] Explicitly use limitations of the master server Koncord 2018-07-02 23:28:25 +0800
  • a48d5b48ef [General] Add maxSize parameter to RW(std::string) Koncord 2018-07-02 23:19:39 +0800
  • 62877f38b7 [General] Remove Terra support Koncord 2018-07-02 23:05:25 +0800
  • 685a80887b Remove Pawn support Koncord 2018-07-02 22:59:34 +0800
  • f4330cf057 Editor: limit FPS in 3D preview windows (feature #3641) Andrei Kortunov 2018-07-02 11:50:59 +0400
  • 7cbc4eeb49 Adding missing override keywords Thunderforge 2018-07-01 19:17:50 -0500
  • dbd6ccaf97
    Merge pull request #455 from testman42/patch-1 David Cernat 2018-07-02 02:35:42 +0300
  • bef53749ed [General] Replace BaseObject's hasMaster variable with isSummon David Cernat 2018-07-02 02:25:06 +0300
  • 702d5b44c9
    Rename "loglevel" to "logLevel" Testman 2018-07-02 01:12:26 +0200
  • 8ce225b1cc [Client] Use the casters of damage-dealing spells as death reasons David Cernat 2018-07-02 00:42:32 +0300
  • aa5ddd6b28 Merged merge request livestreamer https://www.twitch.tv/vanguardlx best Marc Zinnschlag 2018-07-01 15:25:38 +0200
  • 5d9035c6b2 [Fixes #4482] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480) Finbar Crago 2018-07-01 13:46:23 +1000
  • 958b220835 [General] Send summon duration to server in ObjectSpawn packets David Cernat 2018-07-01 00:43:29 +0300
  • 3660d55adf updated credits file Marc Zinnschlag 2018-06-30 10:21:10 +0200
  • 362798bd90 updated changelog Marc Zinnschlag 2018-06-30 10:20:12 +0200
  • 2ea85d0bb6 Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt' Marc Zinnschlag 2018-06-30 10:17:05 +0200
  • af75c1e909
    Update before_script.msvc.sh Bret Curtis 2018-06-30 08:40:21 +0200
  • dcb2ab80f5
    Merge pull request #1788 from Capostrophic/armorcond Bret Curtis 2018-06-30 08:39:06 +0200
  • 4d60fe5a76 reverting back Bret Curtis 2018-06-30 06:10:26 +0000
  • 09c9bd34c3 cleanup more unnecessary struct keywords... Finbar Crago 2018-06-30 12:43:50 +1000
  • b8b07b52f0 try this... Bret Curtis 2018-06-29 22:42:12 +0000
  • 4177fd04eb
    Update before_script.msvc.sh Bret Curtis 2018-06-29 21:08:42 +0200
  • 209359bbc3 Try this on for size... Bret Curtis 2018-06-29 19:07:39 +0000
  • 78a3f95ee4 Update before_script.msvc.sh Bret Curtis 2018-06-29 18:03:25 +0000
  • 2bf0d598cf
    Update before_script.msvc.sh Bret Curtis 2018-06-29 20:01:35 +0200
  • 6e9c08083d
    Add missing empty attacker checks Capostrophic 2018-06-29 20:35:45 +0300
  • bccba24c40 Make unarmed creature attacks not affect armor condition (fixes #2455) Capostrophic 2018-06-29 19:57:09 +0300
  • 9b6ea0e89f # because our CI VMs are not public, MRs can't use them and timeout Bret Curtis 2018-06-29 15:15:29 +0000
  • d3dfe17441 try limiting scope Bret Curtis 2018-06-29 15:13:06 +0000
  • 69cd7031e7 Merge branch 'master' into fix_quickkey_segfalt Finbar Crago 2018-06-29 23:46:36 +1000
  • 596be205c1 cleanup unnecessary struct keywords... Finbar Crago 2018-06-29 23:43:51 +1000
  • 06216aa124 Update .gitlab-ci.yml Bret Curtis 2018-06-29 13:36:00 +0000
  • 2722ca50fb fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570] Finbar Crago 2018-06-29 23:32:05 +1000
  • c474709127
    Update before_script.msvc.sh Bret Curtis 2018-06-29 15:26:11 +0200
  • ca0f6fff4a Update before_script.msvc.sh Bret Curtis 2018-06-29 13:25:36 +0000
  • dc48a46e50 Update before_script.msvc.sh Bret Curtis 2018-06-29 13:22:07 +0000
  • a6d6dd5995 updating for the nits Bret Curtis 2018-06-29 13:17:19 +0000
  • 8811c7141a
    Update before_script.msvc.sh Bret Curtis 2018-06-29 15:14:23 +0200
  • a45d86bdf3 Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2' Marc Zinnschlag 2018-06-29 12:55:55 +0200
  • f06dd39892 Merge remote-tracking branch 'upstream/master' Marc Zinnschlag 2018-06-29 12:52:54 +0200
  • c2ff30c4d7 correcting from GH/AV feedback, testing on GL. Bret Curtis 2018-06-29 09:33:51 +0000
  • a532aef935
    Update before_script.msvc.sh Bret Curtis 2018-06-29 11:31:37 +0200
  • 4c0e475092
    Update before_script.msvc.sh Bret Curtis 2018-06-29 10:16:28 +0200
  • bccd83c656 Use 1.67 Bret Curtis 2018-06-29 08:09:41 +0000
  • bc830a9c45 use boost_temp Bret Curtis 2018-06-29 08:00:54 +0000
  • 63bbc77ee7 try using the powershell trick from AnyOldName3 Bret Curtis 2018-06-29 07:51:45 +0000
  • 7ae388086b Merge branch 'master' into fix_quickkey_segfalt Finbar Crago 2018-06-29 12:34:53 +1000
  • 72f6b1a693 Separating "Game" Advanced Settings into "Game Mechanics" and "User Interface" Thunderforge 2018-06-28 20:13:18 -0500
  • 3379eafd33 Update before_script.msvc.sh Bret Curtis 2018-06-28 20:44:22 +0000
  • 3ceb9116de Give pwd -W a try Bret Curtis 2018-06-28 20:28:58 +0000
  • ed71656ea6 fix updateActivatedQuickKey() crash Finbar Crago 2018-06-29 01:58:57 +1000
  • c4a4111b2e Update before_script.msvc.sh Bret Curtis 2018-06-28 15:33:32 +0000
  • fb6ad9faec try %TMP% ? Bret Curtis 2018-06-28 15:23:56 +0000
  • 4ad3d66629 try using just ${TMP} Bret Curtis 2018-06-28 14:18:58 +0000
  • 8be52d228e
    Update before_script.msvc.sh Bret Curtis 2018-06-28 15:12:26 +0200
  • 24d5fb09da fix crash on simultaneous key presses Finbar Crago 2018-06-28 22:55:02 +1000
  • 60ec340fa3 remove toolset_real, use just toolset, do proper comparison Bret Curtis 2018-06-28 12:18:01 +0000
  • 71314f0c3a Use boost 1.67 instead of 1.61 Bret Curtis 2018-06-28 12:03:52 +0000
  • 46575d8de7
    Update before_script.msvc.sh Bret Curtis 2018-06-28 14:01:41 +0200
  • 660193ae1b
    Update before_script.msvc.sh Bret Curtis 2018-06-28 13:59:23 +0200
  • 1c4363eaa6 Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd. Bret Curtis 2018-06-28 11:22:54 +0000
  • 7bf502dd02 Bash it out! Bret Curtis 2018-06-28 11:09:27 +0000
  • 1061270ac0 Try using @TEMP@ instead of hard coding it. Bret Curtis 2018-06-28 11:05:10 +0000
  • 45d77372a0 with 260 char path fixed, this should work. Bret Curtis 2018-06-28 10:41:12 +0000
  • 2d70c94733 gather up everything with 7zip Bret Curtis 2018-06-28 09:05:39 +0000
  • f07d50e5bf
    Merge pull request #1785 from akortunov/warnfix Bret Curtis 2018-06-28 10:33:51 +0200