Commit Graph

228 Commits (232ea4f793ae2888307aa2316dfbeb58572a460c)

Author SHA1 Message Date
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
6 years ago
Sophie Kirschner 9e253f6a46 Add issue #4613 to changelog 6 years ago
Marc Zinnschlag 327f36b081 Merged pull request #1876 6 years ago
Marc Zinnschlag fe38b806e7 Merged pull request #1882 6 years ago
Andrei Kortunov ff241fb787 Optimize skinning (task #4605) 6 years ago
Chris Robinson 77bdd0ea66 Update changelog 6 years ago
Marc Zinnschlag c2c595407c Merged pull request #1883 6 years ago
Marc Zinnschlag f25a9a6fb3 Merged pull request #1885 6 years ago
Marc Zinnschlag e203159d70 Merged pull request #1889 6 years ago
Marc Zinnschlag 9816643bef Merged merge request !39 6 years ago
Andrei Kortunov de08c1cb1b Make Move and MoveWorld console commands move actors standing on moving object (bug #2274) 6 years ago
Thunderforge 67055b18c4 Adding Changelog entry 6 years ago
Andrei Kortunov a560a9e00d Allow messageboxes arguments to have newline characters (bug #3836) 6 years ago
Andrei Kortunov 3d4f5536d2 Check for impact immediately when launch a projectile (bug #3059) 6 years ago
Bret Curtis 78d9787212
Merge pull request #1880 from Capostrophic/landing
Play landing sound manually and ignore land soundgen textkeys (bug #2256)
6 years ago
Capostrophic 3f76f1d3ed Fix gold count calculation in pickupObject (bug #4604) 6 years ago
Capostrophic 2b45fd84ea Play landing sound manually and ignore land soundgen textkeys (bug #2256) 6 years ago
Capostrophic a06c9c767d Treat <> and << operators as < and >< and >> as > in scripts
(bug #4597)
6 years ago
Bret Curtis 3c827da702
Merge branch 'master' into combat_anims 6 years ago
Andrei Kortunov 31f8bea1dd Rework spell effects management 6 years ago
Marc Zinnschlag 088463ebe6 Merged pull request #1868 6 years ago
Marc Zinnschlag ebdb991225 Merged pull request #1875 6 years ago
Marc Zinnschlag 3489951410 Merged pull request #1866 6 years ago
Capostrophic 372697489b Fix Equip command infinite loop (bug #3072) 6 years ago
Andrei Kortunov b7a448cf42 Update idle animations after reset of mIdleState (bug #4531) 6 years ago
Andrei Kortunov 66a8402cdf Add missing changelog entries 6 years ago
Yohaulticetl 4ff6f64ecd Added entry to the changelog. 6 years ago
Capostrophic 52f70642d0
Update changelog 6 years ago
Bret Curtis d25147a930
Merge pull request #1863 from Capostrophic/aiming
Use the correct spell projectile speed GMST in AI aiming (bug #3948)
6 years ago
Bret Curtis 6a32a4aed0
Merge pull request #1810 from akortunov/weaponfix
Use fallbacks for missing weapon animations
6 years ago
Allofich 94d941cabc Update changelog 6 years ago
Bret Curtis 61b34124e2
Merge pull request #1847 from akortunov/extended_logging
Improve console logging
6 years ago
Andrei Kortunov 4003fa1296 Keep jailing state for one frame after leaving jail (bug #3788) 6 years ago
Andrei Kortunov 8de3383612 Add zero-duration spells effects to effect list (bug #3533) 6 years ago
Andrei Kortunov 307e0103dc Use fallbacks for missing weapon animations (bug #4470) 6 years ago
Andrei Kortunov 7d6e3673e0 Implement advanced logging system (feature #4581) 6 years ago
Capostrophic 3527f3800e Use the correct spell projectile speed GMST in AI aiming 6 years ago
Marc Zinnschlag 1cfc1f9bdb Merged pull request #1666 6 years ago
Marc Zinnschlag 0aedb3aada Merged puil request #1808 6 years ago
Marc Zinnschlag b67b17010d Merged pull request #1826 6 years ago
Andrei Kortunov ec9a1b0d05 Handle RootCollisionNode, attached to non-root node (bug #4311) 6 years ago
Andrei Kortunov 780648b584 Do not reset idle animations if we do not have ammo 6 years ago
Andrei Kortunov df577babe9 Increase priority of 1st-person weapon animations to avoid issues with animation blending 6 years ago
Andrei Kortunov 6a03aa6fdb Reduce jittering during turning animations for player 6 years ago
Marc Zinnschlag a2a57cf694 Merged pull request #1858 6 years ago
Marc Zinnschlag 0f510011b3 Merged pull request #1852 6 years ago
Marc Zinnschlag cb62936949 Merged pull request #1853 6 years ago
Andrei Kortunov 51af729305 Do not use headtracking in the 1st-person view (bug #4573) 6 years ago
Capostrophic 85208eff7f Revert untextured shapes rendering changes 6 years ago
Andrei Kortunov b7859b3fa9 Cap underwater view distance (bug #4565) 6 years ago