Brad Davis
82e3c4c587
Updating the build notes to refelect the new Qt version requirement
2015-04-25 16:26:15 -07:00
Seth Alves
3ce65d297a
Merge pull request #4696 from Atlante45/fix_warnings
...
Fix a few warnings
2015-04-25 12:43:47 -07:00
Atlante45
ba507cef98
Fix a few warnings
2015-04-25 11:01:02 +02:00
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
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
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
Brad Davis
0a9398808f
CR comments
2015-04-24 13:25:30 -07:00
Atlante45
a4f03f8b1c
Zones use avatar position not view frustum
2015-04-24 22:16:21 +02: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
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
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
David Rowe
1678d77af6
Log DDE FPS after a reset
2015-04-23 17:18:32 -07:00
Andrew Meadows
0daaf20f01
Merge pull request #4675 from sethalves/detect-ballistic
...
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
2015-04-23 14:19:51 -07:00
David Rowe
d10621f329
Revert DDE start-up permission change
2015-04-23 14:16:59 -07:00
Brad Davis
ae804357d8
Attempting to fix backspace issue in new UI
2015-04-23 14:10:54 -07:00
Clément Brisset
6669f21a4d
Merge pull request #4681 from ZappoMan/DomainZoneExample
...
Domain zone example & bug fix for default zone shape
2015-04-23 23:07:34 +02:00
ZappoMan
aac5675579
add full domain example
2015-04-23 13:45:00 -07:00
ZappoMan
5dddca37ca
fix default shape of zones
2015-04-23 13:44:39 -07:00
Seth Alves
bc65616bb3
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-23 13:09:22 -07:00
Brad Hefta-Gaub
ad7293d4ad
Merge pull request #4679 from jherico/offscreen
...
Fix a couple of bugs with the new offscreen UI
2015-04-23 12:45:51 -07:00
Brad Hefta-Gaub
33557e5b05
Merge pull request #4680 from huffman/edit-zone-limits
...
Add limits to zone fields in entity properties window
2015-04-23 12:42:32 -07:00
Brad Hefta-Gaub
a4e4e86669
Merge pull request #4676 from Atlante45/zones
...
Zones dynamic shapes
2015-04-23 12:42:07 -07:00
Atlante45
0b1d4fb1d6
Merge branch 'master' of https://github.com/highfidelity/hifi into zones
2015-04-23 21:16:11 +02:00
Ryan Huffman
1657c50920
Add limits to zone fields in entity properties window
2015-04-23 12:00:13 -07:00
Brad Hefta-Gaub
945433be28
Merge pull request #4678 from sethalves/fix-pile-at-origin
...
don't pile things up at the origin during a load
2015-04-23 11:40:46 -07:00
Brad Hefta-Gaub
f036992da6
Merge pull request #4677 from huffman/edit-zones
...
Zone editing
2015-04-23 11:39:41 -07:00
Brad Davis
d0af5580c8
Fix mouse wheel and clickthrough bugs in offscreen UI
2015-04-23 10:28:03 -07:00
Brad Davis
ac7b373231
Throttle rendering needs to ensure it's active context
2015-04-23 10:27:28 -07:00
Ryan Huffman
361bf7e441
Remove unnecessary print
2015-04-23 10:15:18 -07:00
