Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-12 02:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19789 commits 67 branches 56 tags 1.2 GiB
Commit graph

19789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
a9079b64e4 Merge pull request #3922 from AndrewMeadows/thermonuclear 
overhaul EntitySimulation API (and relay relevant EntityItem properties to simulation when they change)
 2014-12-08 13:56:06 -08:00
Brad Hefta-Gaub
efd1a9eb13 Merge pull request #3923 from RyanDowne/master 
Swap lobby model
 2014-12-08 13:52:46 -08:00
Ryan
7fffcd3b53 Swap out the lobby model for the one with the correct light value 2014-12-08 12:47:37 -08:00
Ryan
c2c75eedb4 Merge remote-tracking branch 'hifi/master' 2014-12-08 11:55:51 -08:00
Atlante45
716fca6ae7 tabs to spaces 2014-12-08 11:49:55 -08:00
Atlante45
b4f18f15d7 Ignore Visage resources in .gitignore except for tracker.cfg 2014-12-08 11:49:42 -08:00
Clément Brisset
681a1a3297 Merge pull request #3917 from ctrlaltdavid/20202 
CR for Job #20202 - Add "backgroundVisible" property to text overlays
 2014-12-08 11:43:52 -08:00
Andrew Meadows
9e9929da91 merge upstream/master into andrew/thermonuclear 2014-12-08 11:22:39 -08:00
Andrew Meadows
3ce1d4a38d set dirty bit when script changes simulation stuff 
also fixes for linear and angular damping
 2014-12-08 11:21:01 -08:00
Andrew Meadows
6fdfde31d9 whoops, forgot to increment the iterator 2014-12-08 11:20:27 -08:00
Ryan
0f5aca867f Merge remote-tracking branch 'hifi/master' 2014-12-08 11:11:01 -08:00
ZappoMan
27bc394bed repair collision info mismatch 2014-12-08 10:52:53 -08:00
Atlante45
299389ccef Fixed typo 2014-12-08 09:59:33 -08:00
Brad Hefta-Gaub
36311c3007 Merge pull request #3920 from ZappoMan/master 
more debugging for ryan's rotation problems
 2014-12-08 09:42:42 -08:00
ZappoMan
aefeda37bd more debugging 2014-12-08 09:41:58 -08:00
Ryan
94af583949 Merge remote-tracking branch 'hifi/master' 2014-12-08 09:24:12 -08:00
Philip Rosedale
7de2256744 Merge pull request #3919 from ZappoMan/enforceDimensionsForLightsAndText 
enforce dimensions for Light and Text entities
 2014-12-08 09:19:06 -08:00
Philip Rosedale
732b40f68c Merge pull request #3918 from ZappoMan/acEntityCrash 
Ac entity crash
 2014-12-08 09:16:40 -08:00
Philip Rosedale
36615c19cc Merge pull request #3916 from ZappoMan/fixEllipsoidRayPick 
implement proper ray picking against ellipsoids
 2014-12-08 07:43:40 -08:00
ZappoMan
cf98bff28b enforce dimensions for Light and Text entities 2014-12-08 07:23:45 -08:00
ZappoMan
0f5930a43d add identifyEntity() to butterflies script 2014-12-08 06:50:28 -08:00
ZappoMan
497fbade9b fix crash in entity related AC scripts 2014-12-08 06:48:04 -08:00
Ryan
80323e8b69 Merge remote-tracking branch 'hifi/master' 2014-12-07 22:32:13 -08:00
ZappoMan
398b5b1f91 Merge branch 'master' of https://github.com/highfidelity/hifi into fixEllipsoidRayPick 
Conflicts:
	libraries/entities/src/SphereEntityItem.cpp
	libraries/entities/src/SphereEntityItem.h
 2014-12-07 21:03:09 -08:00
ZappoMan
dd4f3a4006 coding standard, added comments 2014-12-07 20:18:30 -08:00
Philip Rosedale
60c2a89292 Merge pull request #3915 from ZappoMan/modelRayPick 
Proper Model Ray Picking
 2014-12-07 14:19:26 -08:00
Philip Rosedale
331d3ad7b6 Merge pull request #3907 from Atlante45/mouse_pick_in_oculus 
Mouse pick in oculus outside of screen projection bounds + some refactoring
 2014-12-07 14:15:52 -08:00
Ryan Huffman
a53e1c69fd Merge pull request #3914 from thoys/20163 
CR for Job #20163 - Implement virtual keyboard for use in HMD
 2014-12-07 10:22:34 -08:00
ZappoMan
b9891748e1 remove dead code 2014-12-07 01:32:31 -08:00
ZappoMan
b08d5b87ca implement proper ray picking against ellipsoids 
Conflicts:
	libraries/entities/src/SphereEntityItem.cpp
 2014-12-07 01:31:40 -08:00
ZappoMan
d698594899 use common findRayTriangleIntersection 2014-12-06 19:39:02 -08:00
ZappoMan
8dd1a2815f use precision picking in newEditEntities 2014-12-06 15:43:17 -08:00
ZappoMan
91fd574eb5 Merge branch 'master' of https://github.com/highfidelity/hifi into modelRayPick 2014-12-06 15:28:54 -08:00
ZappoMan
7011162c70 removed dead code 2014-12-06 15:07:02 -08:00
ZappoMan
08092e7abe removed dead code 2014-12-06 15:06:00 -08:00
ZappoMan
1a1fb18ba1 removed dead code 2014-12-06 15:03:26 -08:00
ZappoMan
c8e648c4d7 removed unused menu item 2014-12-06 15:00:29 -08:00
ZappoMan
a03984a561 removed some debug code 2014-12-06 14:59:50 -08:00
Thijs Wenker
351819708b style fixes 2014-12-06 23:50:30 +01:00
ZappoMan
3bb16ce831 properly wire up precision picking in JS api 2014-12-06 12:03:46 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
David Rowe
dbb547507d Merge branch 'master' into 20202 2014-12-06 11:14:45 -08:00
David Rowe
ca62e61579 Update scripts with text overlays to use new backgroundAlpha property 2014-12-06 11:11:52 -08:00
David Rowe
4ee99ef38a Remove dead code that's causing problems 2014-12-06 11:03:28 -08:00
ZappoMan
303274a554 tweaks and debug cleanup 2014-12-06 10:59:48 -08:00
ZappoMan
ec907d1d1d removed debug 2014-12-06 09:44:30 -08:00
David Rowe
fd00ad95ca Fix voxel size text display 2014-12-06 09:24:30 -08:00
Ryan
920b47f0a1 Merge remote-tracking branch 'hifi/master' 2014-12-06 08:50:18 -08:00
Brad Hefta-Gaub
2bf93bd9f0 Merge pull request #3913 from huffman/entity-tool-property-fixes 
Entity tool property fixes + add script property
 2014-12-06 00:40:18 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -08:00