krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
17220 commits 35 branches 0 tags 65 MiB
Commit graph

17220 commits

This branch
This branch
All branches
Author SHA1 Message Date
NeveHanter
8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 2016-12-20 12:38:51 +01:00
scrawl
2b2a51d3b2 Update AUTHORS.md 2016-12-16 20:50:50 +01:00
scrawl
913a8fe1bd Merge pull request #1160 from Aussiemon/actorupdatecollision 
[Do not merge yet] Added check before attempting to remove actor's collision object
 2016-12-16 20:46:00 +01:00
scrawl
aafff1deb6 Fix memory leak 2016-12-16 20:40:15 +01:00
Aussiemon
b794aa7c2f Helper methods for updateCollisionMask(), prevent water collision being removed twice, remove Bullet 2.8.5 methods 2016-12-16 12:22:07 -07:00
scrawl
f8690dcd20 Set the drag-and-drop state after initiating the drag, not before (Fixes #3134) 2016-12-16 20:16:59 +01:00
scrawl
cca75499ee Clear the Skeleton's bone cache when a node is added/removed (Fixes #3663) 2016-12-16 20:09:20 +01:00
Marc Zinnschlag
34389e15cd Merge remote-tracking branch 'origin/master' 2016-12-16 12:28:22 +01:00
Marc Zinnschlag
827c78a4cd added text column to ref id table (books) 2016-12-16 12:28:09 +01:00
scrawl
f97be48bf4 Merge pull request #1162 from lkrieg/death_collision_fix 
Disable NPC collision only when death animation has finished (#3666)
 2016-12-15 22:45:49 +01:00
scrawl
c0faeea938 RigGeometry check if mesh has normals (Fixes #3667) 2016-12-15 22:39:21 +01:00
Leon Krieg
12c8c3276a Disable NPC collision only when death animation has finished (#3666) 2016-12-15 19:33:14 +01:00
scrawl
81b9b07820 Merge pull request #1161 from Aussiemon/sdlfix 
[Bug #2771] Handle SDL event 0x302 by doing nothing
 2016-12-15 16:10:52 +01:00
scrawl
0168c55c2d Merge pull request #1159 from lkrieg/spelling_fixes 
More spelling fixes
 2016-12-15 16:10:25 +01:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
Aussiemon
369272fc70 Handle SDL event 0x302 by doing nothing 2016-12-14 21:08:20 -07:00
Aussiemon
7c2a088b34 Added check before removing water collision object from world 2016-12-14 20:13:23 -07:00
Aussiemon
e30dfb13d3 Added check before attempting to remove actor's collision object from world 2016-12-14 19:05:30 -07:00
scrawl
2eb6ef50ca Revert "[OS X] Reenable CI" 
This reverts commit c99d9a47e8.
 2016-12-14 20:03:42 +01:00
scrawl
e6332d7c12 Merge pull request #1157 from lkrieg/spelling_fixes 
Multiple spelling fixes
 2016-12-14 17:56:51 +01:00
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
scrawl
8bdd5d1131 Merge pull request #1151 from Aussiemon/projectilelightsfix 
Update to implementation of projectile lights
 2016-12-14 14:33:09 +01:00
mrohrlach
71e74f5a93 Moved projectile light calculation to separate method 2016-12-13 18:04:20 -07:00
Bret Curtis
582acc8c71 Merge pull request #1156 from jeffreyhaines/patch-2 
Minor grammar and sentence changes
 2016-12-13 22:05:50 +01:00
Bret Curtis
3f9b36dc3d Merge branch 'master' into patch-2 2016-12-13 21:57:54 +01:00
jeffreyhaines
829f684899 Removed Oxford comma 2016-12-13 15:39:30 -05:00
jeffreyhaines
6fadcc6748 Replaced "prior" with "previous" 2016-12-13 13:29:22 -05:00
jeffreyhaines
2fe2b57faa Replaced choose with select 2016-12-13 13:27:43 -05:00
Bret Curtis
49e6232de5 Merge pull request #1155 from jeffreyhaines/patch-1 
Minor spelling correction
 2016-12-13 19:18:12 +01:00
jeffreyhaines
d95a663510 Minor grammar and sentence changes 2016-12-13 11:11:21 -05:00
jeffreyhaines
2d928fac36 Minor spelling correction 2016-12-13 10:46:16 -05:00
scrawl
88e07640d5 Merge pull request #1154 from MiroslavR/swish 
Fix swish sound ID and play swish sound effects for all creatures
 2016-12-11 21:18:55 +01:00
MiroslavR
76ee5845ac Fix swish sound ID and play swish sound effects for all creatures (Fixes #3653) 2016-12-11 19:35:53 +01:00
scrawl
7e797eeda0 Merge pull request #1153 from MiroslavR/itemshadow-bug 
Remove item shadows properly
 2016-12-10 22:25:56 +01:00
MiroslavR
8c97ac269d Remove item shadows properly (Fixes #3652) 2016-12-10 22:22:41 +01:00
scrawl
b7f8b572ae Merge pull request #1152 from Aussiemon/disintegration2 
Bug #2777: Fix for disintegration efffects eliminated by framerate (attempt #2)
 2016-12-10 18:02:02 +01:00
mrohrlach
f0f78c9d64 Slight adjustments to disintegration fix 2016-12-09 19:55:26 -07:00
mrohrlach
9624d8aade Added new method and variable to track float remainders of disintegration effections 2016-12-09 19:48:56 -07:00
mrohrlach
f5da179a90 Removed two more bad casts 2016-12-09 18:15:40 -07:00
mrohrlach
3b0c791892 Removed bad casts and unnecessary comments 2016-12-09 18:10:06 -07:00
scrawl
876d9c6a84 Merge pull request #1148 from Allofich/aicombat 
Require line of sight for AI attacks
 2016-12-06 20:02:39 +01:00
scrawl
5f92cc413d Merge pull request #1146 from Allofich/fortify 
Fix fortify maximum magicka expiration
 2016-12-06 18:02:23 +01:00
Allofich
a6dae51d87 Require line of sight for AI attacks (Fixes #3646) 2016-12-07 01:35:30 +09:00
Allofich
6816e935f1 Fix fortify maximum magicka expiration (Fixes #3648) 2016-12-06 21:00:03 +09:00
scrawl
9febb3e824 Merge pull request #1147 from MiroslavR/NiSphericalCollider 
Implement NiSphericalCollider (Closes #3644)
 2016-12-06 02:31:11 +01:00
MiroslavR
99bcf47167 Implement NiSphericalCollider (Closes #3644) 2016-12-06 01:32:13 +01:00
scrawl
3ac66ec9d4 Update AUTHORS.md 2016-12-05 00:56:11 +01:00
scrawl
4269a2d140 Merge pull request #1144 from Aussiemon/master 
Feature #3523:  Light source on magic projectiles
 2016-12-05 00:55:50 +01:00
mrohrlach
c2e5f24e98 Tidying up 2016-12-04 16:31:11 -07:00
mrohrlach
ef5cf76ad8 Implemented retrieval of effect colors for lights, made recommended changes 2016-12-04 16:11:21 -07:00