Commit graph

  • 045dc566ea Merge branch 'master' into new-script-api Koncord 2017-09-12 21:41:25 +0800
  • bb183457a6 [Master] Init BanAddress/UnbanAddress before opening script Koncord 2017-09-12 21:30:37 +0800
  • dc18916f46 [Master] Add isServerValid lambda. Add "OnServerAnnounce" callback Koncord 2017-09-12 21:29:42 +0800
  • f99dafbf51 [Master] Add scripts for generating certificates for testing purposes Koncord 2017-09-12 21:27:07 +0800
  • aee6fb1265 [Master] Add master lua scripts Koncord 2017-09-12 21:24:06 +0800
  • d1388cdf84 [Master] Add Admin Rest Server Koncord 2017-09-12 20:56:21 +0800
  • b869fe0b76 [Master] Add Lua Koncord 2017-09-12 20:50:28 +0800
  • 0e2817da88 [Master] Move response stuff to ResponseUtils.hpp Koncord 2017-09-12 20:38:51 +0800
  • fc8232f943 [Master] Add ban/unban functions Koncord 2017-09-12 20:24:50 +0800
  • 26324c2578 [Master] Change Ban structure to vector<string> Koncord 2017-09-12 20:23:17 +0800
  • 4e93905350 [Master] Backport SimpleWeb Koncord 2017-09-12 20:21:32 +0800
  • bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts David Cernat 2017-09-12 07:38:49 +0300
  • 76e8a0b768 Add changes I missed in a merge. AnyOldName3 2017-09-11 22:32:45 +0100
  • a5397e5f2d Merge master AnyOldName3 2017-09-11 22:26:46 +0100
  • bd667c3847 Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir scrawl 2017-09-11 10:30:50 +0000
  • 00ae9a01a1 Merge pull request #1445 from akortunov/guifixes scrawl 2017-09-11 10:28:09 +0000
  • 407640322d Merge pull request #1439 from akortunov/resistfix scrawl 2017-09-11 10:27:47 +0000
  • 5904e5a267 updated credits file Marc Zinnschlag 2017-09-11 10:47:35 +0200
  • 9a8a4c744f Merge remote-tracking branch 'capostrophic/controlplus' Marc Zinnschlag 2017-09-11 10:46:34 +0200
  • 7760e4514c Allow to add levelup a description for levels > 20 Andrei Kortunov 2017-09-10 22:47:34 +0400
  • 7688696765 Merge pull request #1437 from Capostrophic/nodemapfix scrawl 2017-09-10 18:15:20 +0000
  • c6fd75bf42 Take in account elemental shields for GetResist and SetResist script commands (bug #4093) Andrei Kortunov 2017-09-10 14:21:05 +0400
  • 97ff24b8d6 Change ctl to ctrl in OpenMW-CS shortcut manager Capostrophic 2017-09-10 20:48:09 +0300
  • afbdc27a34 Move calls to cmake_minimum_required as early in the CMake process as possible. AnyOldName3 2017-09-10 18:30:10 +0100
  • 618ec6dcdd Merge pull request #1440 from akortunov/guardfix scrawl 2017-09-10 17:06:14 +0000
  • dcb2e20a55 Merge pull request #1436 from MiroslavR/missing-bookart scrawl 2017-09-10 16:59:02 +0000
  • 661232222f Allow guards to attack fighting creatures only in fAlarmRadius range Andrei Kortunov 2017-09-10 15:26:48 +0400
  • 09e645a0e0 Fix careless mistake. Kyle Cooley 2017-09-09 23:18:09 -0400
  • de14e43680 Seemingly fix everything by setting policies that were unset upon entering the macro AnyOldName3 2017-09-10 03:18:22 +0100
  • 9503d61866 Use const nodeMap in creature animation Capostrophic 2017-09-09 23:22:16 +0300
  • 25d4a0370f Changes to land data access in tables, also update Land once per frame in scene view. Kyle Cooley 2017-09-09 15:37:52 -0400
  • 33c77d7a2a Try using cmake_parse_arguments to make the macro work AnyOldName3 2017-09-09 17:22:55 +0100
  • d030b595f8 Fix potential segfault, cleanup, get rid of warnings. Kyle Cooley 2017-09-09 11:48:13 -0400
  • c9f099ce07 Change CMake version check to include 3.8 krizd 2017-09-09 03:06:03 +0100
  • 72cb405de2 Some bug fixes, changes to land load code. Kyle Cooley 2017-09-08 21:03:52 -0400
  • a9b95596bc Add a missed trailing new line. AnyOldName3 2017-09-08 22:21:00 +0100
  • 8c74f16247 Restore trailing new lines to shrink PR AnyOldName3 2017-09-08 22:20:04 +0100
  • 5ce34f1cbf Move new behaviour into macro to reduce code duplication AnyOldName3 2017-09-08 22:17:42 +0100
  • 1e585ac71a Log a warning in case of missing bookart instead of showing a pink rectangle (Fixes #3826) MiroslavR 2017-09-08 22:50:07 +0200
  • 335ecd1162 Merge pull request #1434 from akortunov/guifixes scrawl 2017-09-08 19:14:52 +0000
  • 2eacc2f093 Changes to land creation, add ability to specifically clear terrain cache Kyle Cooley 2017-09-08 14:37:03 -0400
  • 3c0ec0d6d0 If CMake supports it, sets the debugger working directory for Visual Studio AnyOldName3 2017-09-08 17:26:46 +0100
  • ac2f20f983 Update a disposition bar when a dialogue widget is disabled, but visible Andrei Kortunov 2017-09-08 19:42:06 +0400
  • ab607f3028 Tweaks to land loading, land cloning, terrain signals, placeholder land update handling Kyle Cooley 2017-09-08 00:51:46 -0400
  • 8f1c8759e4 Merge pull request #1432 from akortunov/alchemyfix scrawl 2017-09-07 20:51:42 +0000
  • a7cecd491c Merge pull request #1433 from akortunov/factionfix scrawl 2017-09-07 20:51:18 +0000
  • dc0313a36f Use base skill value when calculating rank requirements Andrei Kortunov 2017-09-07 21:06:10 +0400
  • 538498230b Declare mClient variable Andrei Kortunov 2017-09-06 15:59:54 +0400
  • 7559d25317 Update alchemy effects after every created potion (#4079) Andrei Kortunov 2017-09-06 15:11:47 +0400
  • 99e90ef808 Cleanup. Also modify ltex index generation. Kyle Cooley 2017-09-05 19:29:07 -0400
  • 97d0fd756a LTEX importing Kyle Cooley 2017-09-04 19:31:09 -0400
  • dca31b7ffa Remove redundant _boundingBoxComputed which no longer exists in osg master (Fixes #4075) scrawl 2017-09-04 19:34:26 +0000
  • 5c3e90da88 Fix includes Kyle Cooley 2017-09-04 15:14:42 -0400
  • d3014cf394 Temporary fix for adding new lands, cloned lands will still reference old data though Kyle Cooley 2017-09-04 15:13:45 -0400
  • b94c0a9991 [Client] Don't send Attribute & Skill packets as werewolf, part 2 David Cernat 2017-09-04 20:21:06 +0300
  • b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts David Cernat 2017-09-04 18:05:24 +0300
  • 3ba6a0e000 Merge pull request #284 from Johnnynator/desktop Stanislav Zhukov 2017-09-04 21:58:10 +0800
  • 8c9d6a0160 [Client] Ensure that LocalPlayer's isWerewolf starts out false David Cernat 2017-09-04 15:44:10 +0300
  • ccb15cc09e [Client] When players die, make guards willing to arrest them again David Cernat 2017-09-04 15:13:05 +0300
  • 90c485104a Land creator Kyle Cooley 2017-09-04 01:06:58 -0400
  • 7cc95a11a4 Add more land table columns Kyle Cooley 2017-09-03 20:00:19 -0400
  • 30ba1d4c25 Move touch command to creator, to allow customization and not break abstraction Kyle Cooley 2017-09-03 16:41:54 -0400
  • f5e23d5fc6 [General] Empty strings should be sent too Koncord 2017-09-04 04:03:02 +0800
  • 84bbb83109 Merge pull request #1431 from Thunderforge/adding-note-about-reflect-actors scrawl 2017-09-03 14:16:54 +0000
  • 2e58024f1c Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable. scrawl 2017-09-03 16:02:40 +0200
  • d904628103 [General] Avoid limitation of 512 symbols in RakString Ctor Koncord 2017-09-03 18:53:45 +0800
  • 10fff499a2 Adding that Reflect Actors can be toggled in the video panel Thunderforge 2017-09-02 19:02:55 -0500
  • 7441f80e4c Merge pull request #1430 from Thunderforge/Bug-#4027-fix-OpenMW-CS-name scrawl 2017-09-02 23:26:46 +0000
  • e0ffc94f3e Fix OpenMW-CS internal name Thunderforge 2017-09-02 18:07:12 -0500
  • 0060e457a6 [General] Add .desktop file for Server Browser John 2017-09-02 16:19:18 +0200
  • 510e657c93 Merge branch 'master' into new-script-api Koncord 2017-09-02 19:48:44 +0800
  • 060ebe3d4a [Server] Init isWerewolf variable Koncord 2017-09-02 19:45:19 +0800
  • 74c9a26d16 [Server] Fix "wrong packet with id: 14" Koncord 2017-09-02 14:01:01 +0800
  • 5e790b567e Fix node path issue scrawl 2017-09-01 22:12:40 +0000
  • 4bef8260ab Add const qualifiers scrawl 2017-09-01 23:02:19 +0200
  • 5d524a6a10 Add custom version of MorphGeometry replacing osgAnimation scrawl 2017-09-01 22:56:09 +0200
  • f1ebb129c1 Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry scrawl 2017-09-01 22:01:50 +0200
  • 4c5992a0d5 Warn if removing a node fails scrawl 2017-09-01 21:45:18 +0200
  • 209e139aa8 Move double buffering implementation inside RigGeometry scrawl 2017-09-01 18:27:00 +0200
  • 132ac6001b Fix bug of Animation::mSkeleton not being assigned scrawl 2017-09-01 18:24:48 +0200
  • 7a79ebb713 Merge pull request #1428 from akortunov/stancechangefixes scrawl 2017-09-01 21:42:08 +0000
  • 51c7efa3f3 [CMake] CMake fix install John 2017-09-01 12:36:41 +0200
  • 7f5f5458d4 Reset player attack animation when unequip weapon or tool Andrei Kortunov 2017-09-01 18:03:23 +0400
  • a5b01fefec Allow to interrupt an attack, if attack button is held Andrei Kortunov 2017-09-01 09:34:15 +0400
  • 0d7279ea2a Fixes a regression with bound weapons equipping (bug #4050) Andrei Kortunov 2017-09-01 08:59:05 +0400
  • 1d480015b4 Add ability to touch records, LAND records in particular Kyle Cooley 2017-08-31 22:01:38 -0400
  • 9e41f1340a Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture Kyle Cooley 2017-08-25 19:51:30 -0400
  • 5d14a2afcc Initial LTEX/LAND tables Kyle Cooley 2017-08-24 17:12:15 -0400
  • a8005c33d9 Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51 scrawl 2017-08-31 21:57:26 +0000
  • 45f7563a55 Revert "Revert "Check for a Geometry node when attaching bodyparts"" scrawl 2017-08-31 21:40:35 +0000
  • b9931fb71c Set the shader on the node containing the StateSet scrawl 2017-08-31 21:39:21 +0000
  • da7253bb57 [Documentation] Update documentation for 0.6.1 tes3mp-0.6.1 David Cernat 2017-08-31 23:06:16 +0300
  • 08df8f8d83 [General] Update version to 0.6.1 David Cernat 2017-08-31 18:45:24 +0300
  • 2e8718a0e0 Merge pull request #282 from OpenMW/master David Cernat 2017-08-31 18:42:54 +0300
  • 3fc1bdecb3 [Client] Shorten player names to 31 characters after they are inputted David Cernat 2017-08-31 18:41:37 +0300
  • ac3254d85f [General] Don't send PlayerAttribute and PlayerSkill packets as werewolf David Cernat 2017-08-31 18:21:38 +0300
  • d749b7f2a7 Merge pull request #1426 from akortunov/multiplesoundfix scrawl 2017-08-31 14:59:08 +0000
  • 93d1aa2e4a [Client] Comment out the broken sending of custom spells until 0.7.0 David Cernat 2017-08-31 17:07:45 +0300
  • 1c0adc47ee [Server] Fix [get/set]MajorSkills and [get/set]MinorSkills Koncord 2017-08-31 20:46:39 +0800
  • e81dafb28a Merge pull request #281 from TES3MP/0.6.0 David Cernat 2017-08-31 15:46:06 +0300