Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 21:53:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40611 commits 25 branches 0 tags 1.1 GiB
Commit graph

40611 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
c1725dda58 living room lights 2016-03-17 15:09:07 -07:00
ericrius1
009326b085 logs 2016-03-17 14:34:41 -07:00
ericrius1
ef0872ec52 fan switch working; 2016-03-17 14:31:48 -07:00
ericrius1
8339955071 removed vr vj 2016-03-16 19:06:42 -07:00
ericrius1
03c1bd2970 lights turning on and off 2016-03-16 19:03:36 -07:00
ericrius1
1fb1e32a85 fixed merge conflicts; 2016-03-16 17:55:19 -07:00
James B. Pollack
0193889690 line endings 2016-03-16 17:49:20 -07:00
James B. Pollack
8477b721a4 add kinetic objects 2016-03-16 15:48:17 -07:00
ericrius1
9d24887ff4 Merge remote-tracking branch 'upstream/master' 2016-03-15 13:50:23 -07:00
Brad Hefta-Gaub
5245b6f7be Merge pull request #7323 from howard-stearns/zone-visibility 
Zone visibility
 2016-03-15 13:44:40 -07:00
Chris Collins
e47c8896db Merge pull request #7364 from hyperlogic/tony/fix-for-p-and-h 
Application: fix third-person and fullscreen-mirror toggle
 2016-03-15 11:50:22 -07:00
Anthony Thibault
addde84bee Merge pull request #7363 from markej/master 
Fill in the Downloads: line of the stats window
 2016-03-15 10:42:09 -07:00
Anthony J. Thibault
7539eec134 Application: fix third-person and fullscreen-mirror toggle 2016-03-15 10:11:56 -07:00
Howard Stearns
010aaa55c0 const ref 2016-03-14 22:13:26 -07:00
Howard Stearns
28f5ee16b8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 22:05:41 -07:00
Ryan Huffman
e54d5aa162 Merge pull request #7354 from birarda/udt-slow-start 
fix for UDT slow start phase with handshake changes
 2016-03-14 21:07:49 -07:00
Stephen Birarda
8cb602173a remove the unused member variable 2016-03-14 20:54:41 -07:00
James B. Pollack
b6955ec77f refs 2016-03-14 18:59:15 -07:00
Brad Hefta-Gaub
cf6a975a2b Merge pull request #7336 from ctrlaltdavid/text3d-tuning 
Improve text3d rendering
 2016-03-14 18:59:06 -07:00
Brad Hefta-Gaub
11e88f965d Merge pull request #7347 from hyperlogic/tony/prevent-roll-in-goto-location 
MyAvatar: prevent roll and pitch in avatar via snapshot url.
 2016-03-14 18:58:49 -07:00
Brad Hefta-Gaub
11c318305f Merge pull request #7340 from sethalves/edit-js-grabbable 
edit.js has checkboxes for grabbable pseudo-properties
 2016-03-14 18:58:37 -07:00
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Brad Hefta-Gaub
4018242045 Merge pull request #7360 from zzmp/feat/emplace-render-jobs 
Emplace render engine jobs
 2016-03-14 18:57:30 -07:00
James B. Pollack
432810704e tidy 2016-03-14 18:53:29 -07:00
James B. Pollack
8877a6c570 tidyyy guy! 2016-03-14 17:58:12 -07:00
Zach Pomerantz
ff0862b594 Emplace render engine jobs 2016-03-14 17:51:43 -07:00
Howard Stearns
d7e3699bc8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 17:45:52 -07:00
James B. Pollack
4017bea60f Merge pull request #7356 from AndrewMeadows/anemone 
anemones are not urchins
 2016-03-14 17:45:19 -07:00
Andrew Meadows
98eef26e69 Merge pull request #7357 from hyperlogic/tony/fix-for-set-swing-limits 
SwingTwistConstriant: fix for bad index.
 2016-03-14 17:36:42 -07:00
Anthony J. Thibault
16a57bda81 SwingTwistConstriant: fix for bad index. 2016-03-14 17:30:53 -07:00
Andrew Meadows
cb62af770f namechange urchin --> anemone 2016-03-14 17:10:33 -07:00
Andrew Meadows
d18f988cba namechange URCHIN --> ANEMONE 2016-03-14 17:07:35 -07:00
Clément Brisset
e38c08ebd9 Merge pull request #7335 from imgntn/photosphere 
Add Photo Sphere Example
 2016-03-14 16:56:17 -07:00
James B. Pollack
2c8f13b538 entity script reset 2016-03-14 16:47:18 -07:00
Anthony Thibault
5623fc1b89 Merge pull request #7328 from AndrewMeadows/dynamic-constraints 
reduce clamping of animation underpose by IK system
 2016-03-14 16:47:00 -07:00
James B. Pollack
169cd70a8c Merge branch 'homeswitches' into homereset 2016-03-14 16:00:19 -07:00
Stephen Birarda
7858b6b0cd fix for slow start initial value with new randomization 2016-03-14 15:06:05 -07:00
Philip Rosedale
c6de24f953 Merge pull request #7332 from imgntn/newfishes 
Add animated urchin to fishtank
 2016-03-14 14:29:41 -07:00
Philip Rosedale
5e532a703a Merge pull request #7352 from ZappoMan/fixLogSpam 
reduce log spam
 2016-03-14 14:26:23 -07:00
ZappoMan
1a17de6dbb reduce log spam 2016-03-14 14:02:25 -07:00
Howard Stearns
0f0b4519fd Merge pull request #7350 from sethalves/try-again-on-queryAACube 
try again on queryAACube
 2016-03-14 13:30:46 -07:00
Seth Alves
e8a03b725f try again on queryAACube 2016-03-14 13:03:27 -07:00
Andrew Meadows
aed0db743b Merge pull request #7341 from hyperlogic/tony/white-lines 
ApplicationOverlay: Fix for gray line at top of HMD UI overlay
 2016-03-14 12:49:57 -07:00
Mark Johnson
2834ff2935 Change Q: -> Pending: 2016-03-14 11:45:05 -07:00
Seth Alves
d811c4f6b5 dynamic is the same as grabbable-by-default 2016-03-14 11:39:56 -07:00
Seth Alves
1f8a55da3a dynamic is the same as grabbable-by-default 2016-03-14 11:36:44 -07:00
Andrew Meadows
5eadc265af Merge pull request #7327 from sethalves/auto-set-query-aa-cube 
if needed, set queryAACube when dimensions are updated
 2016-03-14 11:35:13 -07:00
Seth Alves
5292e537ea further unmangle merge 2016-03-14 11:22:01 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Brad Hefta-Gaub
830f53cc46 Merge pull request #7345 from sethalves/delete-parentless-entities-redux 
Delete parentless entities redux
 2016-03-14 10:04:22 -07:00