Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 10:54:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24713 commits 71 branches 56 tags 1.2 GiB
Commit graph

24713 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
87e586dfe6 remove a stray space 2015-05-04 10:42:58 -07:00
Stephen Birarda
fb7646b02b add a QDebug for failed conversion in fromString 2015-05-04 10:32:49 -07:00
Stephen Birarda
aeb04cf9c3 use existing numerical constant in Avatar 2015-05-04 10:28:28 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Stephen Birarda
7eb965f24f Merge pull request #4756 from thoys/patch-4 
Fix for RealSense menu item
 2015-05-04 12:46:25 -04:00
Stephen Birarda
96b75b57fe Merge pull request #4754 from Atlante45/fix_local_injector_on_win 
Fix local injector modifying system volume
 2015-05-04 12:45:06 -04:00
Stephen Birarda
274e98974b Merge pull request #4734 from Atlante45/ac_fix 
Fix for bot_procedural
 2015-05-04 12:44:08 -04:00
Stephen Birarda
efb4d34598 Merge pull request #4755 from Atlante45/quiet_compiler 
Quiet compiler
 2015-05-04 12:43:13 -04:00
Thijs Wenker
9a6e442b25 Fix for RealSense menu item 
This was missed while moving to the new MenuWrapper class.
 2015-05-04 18:07:48 +02:00
Atlante45
fc1519c078 Quiet compiler 2015-05-04 16:49:33 +02:00
Clément Brisset
6b04ceffba Merge pull request #4752 from sethalves/quiet-compiler 
Quiet compiler
 2015-05-04 15:09:13 +01:00
Atlante45
1dcc2f7988 Fix local injector modifying system volume 2015-05-04 15:53:58 +02:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00
Seth Alves
b2583298a9 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-05-03 10:45:55 -07:00
Philip Rosedale
d7cc76e48b Merge pull request #4735 from jherico/menu_fix 
Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events
 2015-05-02 00:35:49 -07:00
Philip Rosedale
0f22b9beb8 Merge pull request #4741 from sethalves/box-stacking-1 
move common debugging rendering into a new class
 2015-05-02 00:34:44 -07:00
Brad Hefta-Gaub
6c4a4d0cdc Merge pull request #4749 from samcake/temp1 
Fix the dark objects rendering in porto and apartment due to the tga texture files not loaded correctly
 2015-05-01 17:39:17 -07:00
Brad Hefta-Gaub
c8cbaa2fc0 Merge pull request #4746 from huffman/update-zone-image 
Update add-zone icon in edit.js
 2015-05-01 17:34:34 -07:00
Brad Hefta-Gaub
417810c683 Merge pull request #4744 from huffman/show-zone-boundaries 
Add draw zone boundaries bool
 2015-05-01 17:34:15 -07:00
Stephen Birarda
0dbc4780ab use numerical constants header from LeapMotion 2015-05-01 17:18:35 -07:00
Stephen Birarda
8a3853f1d0 Merge pull request #4745 from sethalves/dont-crash-on-null-sessionid 
session id can be null.  don't crash
 2015-05-01 20:08:52 -04:00
Stephen Birarda
c273ea7d46 Merge pull request #4748 from sethalves/shutdown-harder 
try harder to make sure all the assignment-client children stop
 2015-05-01 20:08:29 -04:00
Stephen Birarda
455b91c2a5 add back string header for memset 2015-05-01 17:06:39 -07:00
Seth Alves
9f1cb2a4e5 fix kill/terminate order 2015-05-01 16:56:39 -07:00
Stephen Birarda
19a95cb25a remove string header that is not needed 2015-05-01 16:56:32 -07:00
Stephen Birarda
ddb08da4b7 include cstdlib for std::abs in AudioNoiseGate 2015-05-01 16:54:23 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Seth Alves
23c44500d8 no magic numbers 2015-05-01 16:45:04 -07:00
Sam Gateau
f9802a1072 IMprove the message 2015-05-01 16:39:25 -07:00
Stephen Birarda
7ce62f49e2 fix absolute value checks in MovingMinMaxAvgTests.cpp 2015-05-01 16:37:53 -07:00
Stephen Birarda
83d6569aa1 reference QTimer member variable for AvatarMixer 2015-05-01 16:34:50 -07:00
Seth Alves
4eac60b463 try harder to make sure all the assignment-client children stop 2015-05-01 16:34:44 -07:00
Stephen Birarda
841da65eaf fix abs value call warning 2015-05-01 16:34:34 -07:00
Stephen Birarda
a24789b721 remove extra space from SetupHifiProject 2015-05-01 16:32:05 -07:00
Stephen Birarda
475861c4be move KILO_PER_MEGA to numerical constants 2015-05-01 16:30:25 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
7b4522e950 nullify the current Highchart when modal closed 2015-05-01 16:21:05 -07:00
Stephen Birarda
6d0e612923 remove other tabs from moveJoints 2015-05-01 16:16:01 -07:00
Stephen Birarda
b32aecc456 fix tabs/spaces in moveJoints 2015-05-01 16:15:35 -07:00
Stephen Birarda
d602c71346 cleanup audio-mixer stats, add username interpolation 2015-05-01 16:12:46 -07:00
Sam Gateau
2382183075 FIxed the bug about the tga not loading by recognizing the file format type from the filename extension and passing the info to the QImage::fromData() 2015-05-01 16:09:41 -07:00
Stephen Birarda
5e2a22a006 perform requested interpolation when unpacking 2015-05-01 15:58:22 -07:00
Stephen Birarda
99bddcc102 insert usernames to JSONBreakableMarshal interpolate map 2015-05-01 15:45:53 -07:00
Ryan Huffman
ddec694393 Update add-zone icon in edit.js 2015-05-01 15:38:06 -07:00
Stephen Birarda
8037d383b1 remove extra debugging from AvatarMixer 2015-05-01 15:20:07 -07:00
Stephen Birarda
a7bff474e3 use JSONBreakableMarshal in AC monitor to get QJsonObject 2015-05-01 15:18:49 -07:00
Stephen Birarda
4b777f09e6 repairs to JSONBreakableMarshal for array values 2015-05-01 15:14:41 -07:00
Stephen Birarda
532bcc9376 complete initial algorithm for AM throttle 2015-05-01 14:56:40 -07:00
Seth Alves
560d89b38a session id can be null. don't crash 2015-05-01 14:56:03 -07:00
Sam Gateau
66a1d1f597 Merge branch 'temp1' of https://github.com/samcake/hifi into temp1 2015-05-01 13:38:38 -07:00