Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:13:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
37048 commits 71 branches 56 tags 1.2 GiB
Commit graph

37048 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
6eb177091b overhaul of MotionState cleanup 
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
 2016-01-07 10:19:46 -08:00
Andrew Meadows
8886f48c78 minor cleanup 2016-01-07 10:19:46 -08:00
Andrew Meadows
f5d24a87ca remove entities from physics before we delete them 2016-01-07 10:19:46 -08:00
Andrew Meadows
b34df211df cleanup API for removal from EntitySimulation 2016-01-07 10:19:46 -08:00
Andrew Meadows
4208380d1c namechange 2016-01-07 10:19:46 -08:00
Andrew Meadows
534bfa5983 remove dangling whitespace 2016-01-07 10:19:46 -08:00
Brad Hefta-Gaub
553e455a53 Merge pull request #6759 from huffman/script-engine-slot-exception 
Add logging of signal slot exceptions in ScriptEngine
 2016-01-07 08:54:34 -08:00
Brad Hefta-Gaub
a78d5274e7 Merge pull request #6780 from jherico/z_order 
Address some z-ordering issues in overlay windows
 2016-01-06 20:08:52 -08:00
Brad Hefta-Gaub
cb88ebd1e4 Merge pull request #6787 from Atlante45/fix/skybox 
Fix skybox rendering
 2016-01-06 20:07:22 -08:00
Atlante45
e59397a97a Merge branch 'master' of https://github.com/highfidelity/hifi into fix/skybox 2016-01-06 18:56:58 -08:00
Clément Brisset
447f2f6361 Merge pull request #6785 from ZappoMan/fixWarnings 
fix warnings
 2016-01-06 18:56:26 -08:00
Atlante45
3effa9d5e1 Fix skybox rendering 2016-01-06 17:03:29 -08:00
Brad Hefta-Gaub
b0b13fc523 fix warning in stack manager 2016-01-06 15:48:00 -08:00
Seth Alves
01c9de4f9d Merge pull request #6771 from ericrius1/directDistanceGrab 
Squeezing bumper while distance grabbing now brings object to your hand in all cases
 2016-01-06 15:30:23 -08:00
Brad Hefta-Gaub
8b9c2cde63 fix warnings 2016-01-06 15:29:05 -08:00
Brad Hefta-Gaub
335ab3c501 fix warnings 2016-01-06 15:24:52 -08:00
ericrius1
1f6e45d135 Fix for close grab jumping 2016-01-06 15:10:53 -08:00
Philip Rosedale
56967972e0 Merge pull request #6782 from AndrewMeadows/flying-speed 
reduced avatar max fly speed
 2016-01-06 15:08:08 -08:00
ericrius1
67f4c250fd Search sphere goes away on far to near grab 2016-01-06 14:59:31 -08:00
Brad Hefta-Gaub
f0338690c8 whitespace change 2016-01-06 14:54:50 -08:00
ericrius1
cb03eda6d1 Instant far to near grabbing now works by using the bumper, or equip, button 2016-01-06 13:37:26 -08:00
Brad Davis
656a7da70a Merge pull request #6779 from ZappoMan/onlyNotifyOwner 
only emit collision events if you're the owner
 2016-01-06 16:14:29 -05:00
Brad Hefta-Gaub
6ac8d081dc include debug log in collision example 2016-01-06 13:02:07 -08:00
Brad Hefta-Gaub
d4e039ea7a include debug log in collision example 2016-01-06 13:00:50 -08:00
Brad Hefta-Gaub
a5f618ef33 include debug log in collision example 2016-01-06 12:54:14 -08:00
Brad Hefta-Gaub
edc132efce fix warning 2016-01-06 12:53:57 -08:00
Brad Hefta-Gaub
0b43685f1e Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 11:26:05 -08:00
Andrew Meadows
b8b113844f reduced avatar max fly speed from 300 to 30 2016-01-06 11:22:58 -08:00
Brad Hefta-Gaub
a3ceb3a298 Merge pull request #6781 from sethalves/fix-network-version-number 
fix network version number
 2016-01-06 11:11:00 -08:00
Brad Davis
44b9bc7115 Force active focus on the address bar line while address bar is visible 2016-01-06 11:10:05 -08:00
Seth Alves
096ab44311 fix network version number 2016-01-06 11:01:31 -08:00
Brad Davis
1b82200ecb Address some z-ordering issues in overlay windows 2016-01-06 10:58:56 -08:00
Brad Hefta-Gaub
f3aeaec6a9 Merge branch 'master' of https://github.com/highfidelity/hifi into onlyNotifyOwner 2016-01-06 10:58:50 -08:00
Seth Alves
8800a74186 Merge pull request #6778 from imgntn/mousegrabfix 
Only grab/release mouse grab with left button
 2016-01-06 10:36:36 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints 
hook up a way for scripts to set model-entity joint state
 2016-01-05 17:31:18 -08:00
Brad Davis
e4913a56ab Merge pull request #6775 from sethalves/fix-polyvox-rendering 
update polyvox shader to track changes in packDeferredFragment
 2016-01-05 20:24:33 -05:00
Brad Davis
4a9c558809 Merge pull request #6776 from Atlante45/fix/lambda-crash 
Cleanup web entity connections
 2016-01-05 20:23:51 -05:00
Seth Alves
722fe46a27 Merge pull request #6777 from AndrewMeadows/whitespace 
nothing but whitespace
 2016-01-05 17:14:19 -08:00
Brad Hefta-Gaub
2435e160a8 only emit collision events if you're the owner 2016-01-05 16:56:24 -08:00
James B. Pollack
8c7c436ef2 fix 2016-01-05 16:54:18 -08:00
Clément Brisset
a2135dfdd2 Merge pull request #6720 from ctrlaltdavid/20760 
Fix particle radius and rgba start, middle, finish interpolation
 2016-01-05 16:48:13 -08:00
Andrew Meadows
9ab5ef358a remove dangling whitespace 2016-01-05 16:44:36 -08:00
ericrius1
eb44e54d87 fixed merge conflicts 2016-01-05 16:28:22 -08:00
ericrius1
882ec9fe80 Using offset from intersection point to center of object for insta-grab 2016-01-05 16:24:15 -08:00
Seth Alves
086ea66c04 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2016-01-05 16:24:10 -08:00
David Rowe
4d7ed6b68f Whitespace 2016-01-06 13:20:44 +13:00
Brad Hefta-Gaub
5fad7aa51b Merge pull request #6774 from imgntn/targetsfix 
Fix Wall Targets Collision Callback
 2016-01-05 16:18:59 -08:00
James B. Pollack
7c18359fba cleanup 2016-01-05 16:17:11 -08:00
Atlante45
981c6c7af5 Cleanup web entity connections 2016-01-05 16:08:25 -08:00
Seth Alves
1e69f695b4 update polyvox shader to track changes in packDeferredFragment 2016-01-05 16:06:59 -08:00