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

19625 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
ada325da2b Merge pull request #3931 from Atlante45/mouse_pick_in_oculus 
Misc fixes
 2014-12-09 12:13:24 -08:00
Stephen Birarda
68c7985412 Merge pull request #3930 from ZappoMan/crashOnSwitch 
fix to crash on rapidly switching domains
 2014-12-09 12:13:05 -08:00
Atlante45
36eecf1d15 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-09 11:53:47 -08:00
Atlante45
649940de24 wrong pickray function 2014-12-09 11:53:32 -08:00
Atlante45
eaaaa0687c spacing 2014-12-09 11:53:14 -08:00
Atlante45
a6f7a1ce15 guard against NULL _models 2014-12-09 11:52:20 -08:00
ZappoMan
1eaa2caa6c fix to crash on rapidly switching domains 2014-12-09 11:40:47 -08:00
Andrzej Kapolka
dbbfccc309 Merge pull request #3926 from ey6es/master 
Reduce the MTU size to deal with Windows networking issue.
 2014-12-08 18:08:52 -08:00
Andrzej Kapolka
d0ca75dd2c Reduce the MTU size to deal with Windows networking issue. 2014-12-08 18:04:45 -08:00
Brad Hefta-Gaub
651e550063 Merge pull request #3925 from AndrewMeadows/thermonuclear 
fix for non-animating models
 2014-12-08 16:58:16 -08:00
Atlante45
ba81030aa1 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:53:56 -08:00
Clément Brisset
db751ca0c4 Merge pull request #3924 from ZappoMan/entityCollisions 
make collision callbacks work as entity methods
 2014-12-08 16:47:25 -08:00
Atlante45
fa73730359 Merge branch 'master' of https://github.com/highfidelity/hifi into mouse_pick_in_oculus 2014-12-08 16:46:34 -08:00
Andrew Meadows
675a2dd989 add DIRTY_UPDATEABLE flag for changes that need it 2014-12-08 16:32:25 -08:00
Andrew Meadows
27bfc9907f fix bug preventing butterflies from animating 
(forgot to make base method virtual)
 2014-12-08 16:31:36 -08:00
ZappoMan
0d636314ba fixed CR feedback 2014-12-08 16:20:39 -08:00
Brad Hefta-Gaub
39b1f73976 Merge pull request #3921 from Atlante45/tabs_to_spaces 
Tabs to spaces
 2014-12-08 15:55:05 -08:00
ZappoMan
7449821a9b add ID to the properties dialog box 2014-12-08 15:06:50 -08:00
ZappoMan
cdeaaf2ca9 fix deadlock in enter/leave events 2014-12-08 15:06:34 -08:00
ZappoMan
efbe8ce757 Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions 2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06 make collision callbacks work 2014-12-08 14:15:03 -08:00
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