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

24458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
e5df17eb99 Merge pull request #4691 from ZappoMan/defaultAvatars 
fix default avatars on first run
 2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub
dbb1e3c820 Merge pull request #4682 from jherico/offscreen 
Attempting to fix backspace issue in new UI
 2015-04-24 16:10:42 -07:00
Brad Hefta-Gaub
4fccb74855 Merge pull request #4692 from huffman/checkbox-fix 
Checkbox fix
 2015-04-24 16:08:52 -07:00
Brad Hefta-Gaub
1d6001af53 Merge pull request #4694 from Atlante45/zone_use_avatar_pos 
Zones use avatar position not view frustum
 2015-04-24 16:08:19 -07:00
Seth Alves
6e6793cbcc remove debugging prints 2015-04-24 15:18:02 -07:00
Clément Brisset
23ac8b1c8c Merge pull request #4693 from ctrlaltdavid/faceshift-fps 
Log Faceshift FPS after a reset
 2015-04-24 23:59:37 +02:00
Andrew Meadows
3ecf959b3e removed cached copies of damping and restitution 2015-04-24 14:50:37 -07:00
Seth Alves
2a8fbeca32 sync 2015-04-24 14:43:39 -07:00
Seth Alves
e7c6ee597a sync 2015-04-24 14:36:05 -07:00
Seth Alves
ea250c037a sync 2015-04-24 14:27:32 -07:00
Seth Alves
6b53fefebe sync 2015-04-24 14:21:59 -07:00
Seth Alves
fea8d84618 sync 2015-04-24 14:09:10 -07:00
Seth Alves
ad85837b5a sync 2015-04-24 13:44:34 -07:00
David Rowe
e33f3c9d00 Remove unnecessary #include 2015-04-24 13:42:56 -07:00
Ryan Huffman
547b0e5ee6 Update style of webview to only be set when 'fusion' exists 2015-04-24 13:42:03 -07:00
Ryan Huffman
6087a3e8a9 Revert "Add checkboxes.html" 
This reverts commit 4127ec8019.
 2015-04-24 13:40:02 -07:00
Andrew Meadows
7cd9023e23 build Avatar shape on SkeletonModel load 2015-04-24 13:26:26 -07:00
Andrew Meadows
f09a67af6c don't need temp variable 2015-04-24 13:26:26 -07:00
Andrew Meadows
79cb55eabc rename setJointStates() --> initJointStates() 2015-04-24 13:26:26 -07:00
Andrew Meadows
c4395e75bb cleanup and comments 2015-04-24 13:26:26 -07:00
Brad Davis
0a9398808f CR comments 2015-04-24 13:25:30 -07:00
Brad Davis
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Atlante45
a4f03f8b1c Zones use avatar position not view frustum 2015-04-24 22:16:21 +02:00
Seth Alves
902e84c711 sync 2015-04-24 13:10:38 -07:00
David Rowe
a141ebbf93 Log Faceshift FPS after a reset 2015-04-24 12:49:41 -07:00
Ryan Huffman
df591f9ad7 Set style of webview 2015-04-24 11:49:33 -07:00
ZappoMan
37928dcd6d fix default avatars on first run 2015-04-24 11:30:18 -07:00
Seth Alves
a27f8f3f10 sync 2015-04-24 11:28:44 -07:00
Seth Alves
926694517f sync 2015-04-24 11:07:45 -07:00
Seth Alves
b40e78311b disable hack to notice that the server is sending the same thing repeatedly 2015-04-24 11:00:06 -07:00
Seth Alves
1b84be6e10 attempting to have visual indicator of simulatorID 2015-04-24 10:55:43 -07:00
Stephen Birarda
b387c3e93a Merge pull request #4689 from Atlante45/master 
Send generated touchEndEvent if we don't get one from Qt
 2015-04-24 13:07:12 -04:00
Atlante45
53577107de Formatting 2015-04-24 19:06:46 +02:00
Atlante45
fb5a0c8b01 Only send touchUpdateEvent if it is one 
ie. not for touchBeginEvent
 2015-04-24 18:50:45 +02:00
Atlante45
e2b60d35f0 Generate touchEndEvent if last event was more than 50 ms ago 2015-04-24 18:50:03 +02:00
Ryan Huffman
4127ec8019 Add checkboxes.html 2015-04-24 09:42:59 -07:00
Seth Alves
6fdbce9ee3 oops 2015-04-24 09:29:57 -07:00
Seth Alves
c2422c2382 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-24 09:29:26 -07:00
Seth Alves
6d151ee3ed try a different way of identifying when to claim simulation ownership of a moving entity 2015-04-24 09:29:05 -07:00
Brad Hefta-Gaub
6c830459a6 Merge pull request #4688 from huffman/fix-zone-overlay 
Fix new zone overlays not moving
 2015-04-24 09:09:17 -07:00
Brad Hefta-Gaub
22ff2ba1b8 Merge pull request #4687 from Atlante45/zone_shape_edit_js 
Zone ShapeType/CompoundShapeURL in edit.js
 2015-04-24 09:08:56 -07:00
Ryan Huffman
6a48010c0b Fix new zone overlays not moving 2015-04-24 09:01:12 -07:00
Stephen Birarda
a3edb7b02a Merge pull request #4686 from Atlante45/fix_keylight_color 
Fix keylight color
 2015-04-24 11:35:47 -04:00
Atlante45
82a53c9139 Turn off all sections then turn on selected one 
This fixes the issue of properties present in a couple sections but not
all that are going to only be displayed for the last section the are in
that is being processed.
 2015-04-24 16:53:39 +02:00
Atlante45
32b78f02b4 Group ShapeType and CompoundShapeURL + add it to Zones 2015-04-24 16:52:51 +02:00
Atlante45
a26d9ef353 Fix ShapeType/String conversion 2015-04-24 16:49:18 +02:00
Atlante45
fff8b99d10 Fix keylight color 
Was an integer division producing a float
 2015-04-24 15:31:25 +02:00
Clément Brisset
9c5f384080 Merge pull request #4683 from ctrlaltdavid/dde-revert 
Revert DDE start-up permission change
 2015-04-24 14:34:00 +02:00
Clément Brisset
efc5e5d52b Merge pull request #4684 from ctrlaltdavid/dde-fps 
Log DDE FPS after a reset
 2015-04-24 14:28:26 +02:00
Brad Davis
a4619c8e59 Merge branch 'master' into offscreen 2015-04-23 23:41:36 -07:00