1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 02:15:33 +00:00
openmw-tes3mp/apps/openmw
Sophie Kirschner a1e076a37e Merge branch 'master' into pineapple/fix-video-incomplete-type-2
Resolve merge issues related to CHANGELOG.md

* master:
  Optimize skinning (task #4605)
  Update changelog
  Update some comments
  Set the OpenAL source offset after setting the buffer
  Make Move and MoveWorld console commands move actors standing on moving object (bug #2274)
  Adding Changelog entry
  Allow messageboxes arguments to have newline characters (bug #3836)
  Check for impact immediately when launch a projectile (bug #3059)
  Fix gold count calculation in pickupObject (bug #4604)
  Correct special case soundgen comparisons
  Move "land" check earlier
  Fixes #3681
  Play landing sound manually and ignore land soundgen textkeys (bug #2256)
  Make some more optimizations to actor processing loops
  Fix freeze in getActorsSidingWith
  Addiong missing "to" word
  Adding common problems that were previous on the site FAQ
  Treat <> and << operators as < and  >< and >> as > in scripts
  stage1: priorities for event music and other minor improvements to the music system

# Conflicts:
#	CHANGELOG.md
2018-08-26 12:05:02 +03:00
..
mwbase Merged pull request #1885 2018-08-25 10:00:22 +02:00
mwclass Play landing sound manually and ignore land soundgen textkeys (bug #2256) 2018-08-21 19:03:03 +03:00
mwdialogue Use new logging system for game itself 2018-08-14 23:05:43 +04:00
mwgui Merge branch 'master' into pineapple/fix-video-incomplete-type-2 2018-08-26 12:05:02 +03:00
mwinput Fix incorrect 'preparing' word spelling 2018-08-16 17:47:06 +04:00
mwmechanics Merge pull request #1880 from Capostrophic/landing 2018-08-23 08:40:55 +02:00
mwphysics Use new logging system for game itself 2018-08-14 23:05:43 +04:00
mwrender Check for impact immediately when launch a projectile (bug #3059) 2018-08-24 15:03:54 +04:00
mwscript Make Move and MoveWorld console commands move actors standing on moving object (bug #2274) 2018-08-25 10:34:33 +04:00
mwsound Update some comments 2018-08-25 01:24:35 -07:00
mwstate Use new logging system for game itself 2018-08-14 23:05:43 +04:00
mwworld Merged pull request #1885 2018-08-25 10:00:22 +02:00
android_commandLine.cpp Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
android_commandLine.h Remove empty line at the beginning of files 2015-08-18 23:06:12 +02:00
android_main.c android: Update for sdl 2.0.8 2018-03-30 12:44:38 -04:00
CMakeLists.txt Rework manual spellcasting (e.g. via scripts) 2018-07-12 16:24:25 +04:00
doc.hpp Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
engine.cpp Use new logging system for game itself 2018-08-14 23:05:43 +04:00
engine.hpp Merge branch 'master' into screenshot360 2018-02-25 11:25:19 +01:00
main.cpp Use new logging system for game itself 2018-08-14 23:05:43 +04:00