Commit graph

23903 commits

Author SHA1 Message Date
Seth Alves
2fbfa34c5c removed uneeded logging 2015-04-06 09:14:53 -07:00
Clément Brisset
efbd74f539 Merge pull request #4597 from huffman/light-overlays
Light overlays
2015-04-06 16:02:44 +02:00
Sam Gateau
10269bd556 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Seth Alves
e06dada756 Merge pull request #4592 from AndrewMeadows/thermonuclear
profiling for physics simulation
2015-04-04 15:00:44 -07:00
Andrew Meadows
568050686d replace tabs with spaces for indentation 2015-04-04 13:50:16 -07:00
Seth Alves
61fb9adfca avoid calling QAudioDeviceInfo::availableDevices once per second on linux because it blocks the audio thread for ~1 second each time 2015-04-03 19:36:22 -07:00
Sam Gateau
17743c6013 FIxed the broken shadows 2015-04-03 17:58:21 -07:00
Sam Gateau
3b5c8d7b38 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-03 17:32:34 -07:00
Brad Hefta-Gaub
285cfe1f46 Merge pull request #4593 from AndrewMeadows/isentropic
Fix bug where change of entity dimensions would not update physics for others
2015-04-03 17:26:45 -07:00
Sam Gateau
38d1e29a1d getting ready for pr for a few syntax issues 2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4 getting ready for pr for a few syntax issues 2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7 getting ready for pr for a few syntax issues 2015-04-03 17:05:08 -07:00
Bradley Austin Davis
f75ddb95f5 Enable Direct HMD mode only on windows 2015-04-03 17:01:21 -07:00
Ryan Huffman
ce2c23de51 Fix color not working for wire circle3d 2015-04-03 16:28:12 -07:00
Ryan Huffman
f311cc5f07 Add light overlays 2015-04-03 16:27:42 -07:00
Ryan Huffman
748534cb9a Fix spotlight checkbox on entity properties 2015-04-03 16:25:28 -07:00
Ryan Huffman
5fd960fb43 Add entity light cutoff/dimensions constraints 2015-04-03 15:32:53 -07:00
Andrew Meadows
abd78fede5 fix: change of dimensions would not update physics 2015-04-03 15:11:57 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2 mirror means we render the Closkwise side 2015-04-03 10:45:30 -07:00
Sam Gateau
7718680091 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-03 10:33:24 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
Andrew Meadows
88ee1c313a Merge pull request #4583 from huffman/fix-script-editor-icons
Update script editor to set icons programatically
2015-04-03 09:31:58 -07:00
Andrew Meadows
223c62c6f9 Merge pull request #4587 from jherico/warnings
Working on removing some of the warnings in the xcode build
2015-04-03 09:31:36 -07:00
Clément Brisset
7bd6d5ca5b Merge pull request #4588 from ZappoMan/svoImportFixes
add logging for delete operations in the server
2015-04-03 17:51:36 +02:00
Brad Hefta-Gaub
d34133a89b Merge pull request #4591 from Atlante45/entity_random_delete
Remove unload callback
2015-04-03 08:33:07 -07:00
Atlante45
0434b1fd28 Remove unload callback 2015-04-03 16:09:23 +02:00
ZappoMan
45ab438339 add logging for delete operations in the server 2015-04-02 16:44:04 -07:00
Bradley Austin Davis
44c9d4a742 Working on removing some of the warnings in the xcode build 2015-04-02 16:12:44 -07:00
Andrew Meadows
2089a8c2dd temporary debug setup: dump physics stats on F key 2015-04-02 15:33:06 -07:00
Andrew Meadows
eaef08abd5 add break to Key_Comma switch case 2015-04-02 15:25:55 -07:00
Andrew Meadows
27d6d9f720 add Bullet profiling hooks for physics simulation 2015-04-02 15:20:16 -07:00
Sam Gateau
f96079f4f9 fixed the getViewFUrstum warning in DEBUG mode 2015-04-02 14:43:15 -07:00
Seth Alves
cc7cda39f1 Merge pull request #4586 from ZappoMan/svoImportFixes
BUG FIX - Import entities sometimes fails
2015-04-02 14:30:06 -07:00
ZappoMan
84940d8e43 fix SVO import 2015-04-02 14:13:19 -07:00
Brad Davis
605cf19f6f Merge pull request #4565 from ctrlaltdavid/20422
CR for #20422 - Add the ability to manage friends via Interface
2015-04-02 14:10:40 -07:00
Clément Brisset
c7540af787 Merge pull request #4585 from birarda/no-gpu-link
fix for resampled stereo audio array size
2015-04-02 21:31:53 +02:00
Stephen Birarda
3f079e10aa user AudioConstants for size of int16_t 2015-04-02 11:35:23 -07:00
Stephen Birarda
41290dd3e3 push data pointer for recursive read from front 2015-04-02 11:34:39 -07:00
Stephen Birarda
164c06a190 fix resampled stereo audio array size 2015-04-02 10:41:52 -07:00
Andrew Meadows
a824403132 Merge pull request #4582 from sethalves/island
Comma toggles rendering of collision hulls; more changes to vhacd stuff
2015-04-02 10:37:17 -07:00
Bradley Austin Davis
8a757a4b6e Further work on menu handling on OSX in fullscreen / VR mode 2015-04-02 10:27:11 -07:00
Bradley Austin Davis
fb2b1204db Stop the menu from breaking on leaving HMD mode 2015-04-02 10:16:52 -07:00
Brad Davis
91b38785ea Merge pull request #4573 from AndrewMeadows/bispinor
fix for avatar unable to jump into hover on mac
2015-04-02 09:45:46 -07:00
Seth Alves
41ec2fdbe3 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-02 09:19:54 -07:00
Seth Alves
a01ade2d8d more command-line options 2015-04-02 09:19:47 -07:00
Ryan Huffman
df5a03b447 Update script editor to set icons programatically 2015-04-02 09:10:47 -07:00
Andrew Meadows
fc4e6e9355 merge upstream/master into andrew/bispinor 2015-04-02 09:04:15 -07:00
Andrew Meadows
f4f219ca36 tweak jump velocity and hover transition 2015-04-02 09:03:33 -07:00