Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-02 11:52:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33610 commits 25 branches 0 tags 1.1 GiB
Commit graph

33610 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
0964180f2c code review 2015-10-15 17:10:47 -07:00
ericrius1
97fe0170cb glowing box for black color 2015-10-15 17:09:41 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Brad Hefta-Gaub
3718149157 include inbound queue PPS stats in server stats page 2015-10-15 15:49:12 -07:00
samcake
d44beca29f Merge pull request #6092 from jherico/controllers 
Controllers Branch - Fix hardware access from JS...
 2015-10-15 15:41:36 -07:00
Ryan Huffman
421e2a6c21 Merge pull request #6078 from imgntn/top_tool_tabs 
Move  Edit.js Tool Window Tabs to the Top
 2015-10-15 15:40:42 -07:00
Brad Hefta-Gaub
e1570e3197 include inbound queue PPS stats in server stats page 2015-10-15 15:31:52 -07:00
Brad Hefta-Gaub
82a211174b added packet recieved,lost,recovered stats to detailed server stats page 2015-10-15 15:23:12 -07:00
Brad Hefta-Gaub
1f6a2f3c21 Merge pull request #6081 from samcake/controllers 
Controllers mapping created from JSON, first draft
 2015-10-15 15:19:42 -07:00
James B. Pollack
aee11d4c06 cleanup merge 2015-10-15 15:05:34 -07:00
samcake
63ad9ae198 Fixing the include file names... 2015-10-15 15:02:55 -07:00
samcake
1b03b6867c Fixing the include file names... 2015-10-15 15:01:34 -07:00
James B. Pollack
112007e5a9 cleanup 2015-10-15 14:58:05 -07:00
Seth Alves
462918ffcf cleanups 2015-10-15 14:55:17 -07:00
Seth Alves
487131dde1 cleanups 2015-10-15 14:52:38 -07:00
samcake
249efa383e MErging maybe finally ?????? 2015-10-15 14:49:22 -07:00
samcake
2ad6c2067b MErging maybe finally ?????? 2015-10-15 14:43:15 -07:00
Seth Alves
36a523478f Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-15 14:21:30 -07:00
samcake
416df1c44c Fixing the mac build 2015-10-15 14:21:08 -07:00
Seth Alves
4903db45b1 give other avatars an anim-skeleton 2015-10-15 14:21:06 -07:00
James B. Pollack
8b57b3c0ff fix memory leak 2015-10-15 14:13:07 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
Brad Davis
eff8c28a28 Fixing access to hardware devices 2015-10-15 14:04:55 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
Brad Davis
4f8e2c9f6b Fix JSON format errors 2015-10-15 13:18:04 -07:00
Brad Davis
80cffdb764 Merge pull request #6082 from ZappoMan/renameInputPlugins 
Controllers branch - Rename input plugins
 2015-10-15 12:29:35 -07:00
James B. Pollack
e63ed5cf84 Merge pull request #6087 from thoys/20708 
CR for Job #20708 - Script Editor Improvements
 2015-10-15 12:28:32 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
Brad Hefta-Gaub
923e1ed208 add more processing stats 2015-10-15 12:21:36 -07:00
Brad Hefta-Gaub
93113af2d2 improve server error message for failed edit 2015-10-15 11:55:20 -07:00
Stephen Birarda
b6a2cc396c Merge pull request #6089 from ZappoMan/fixStat 
fix Queue OUT stat
 2015-10-15 11:53:34 -07:00
ericrius1
dc6875f5b5 Strokes moving forward to avoid zfighting and incorrect overlaps 2015-10-15 11:50:23 -07:00
Seth Alves
a70ba4cd5a add some accessors 2015-10-15 11:42:53 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00
ericrius1
3b59bffb79 Deleting only strokes from the whiteboard where the erase button was clicked on 2015-10-15 11:38:18 -07:00
Anthony J. Thibault
605da499c8 Updated english translation file 
Generated using the following command:

    ~/code/hifi > lupdate interface -ts interface/i18n/interface_en.ts
    Scanning directory 'interface'...
    Updating 'interface/i18n/interface_en.ts'...
        Found 146 source text(s) (130 new and 16 already existing)
        Kept 28 obsolete entries

NOTE: this translation file is far from complete, many menu strings from Menu.h do not show up in this list.
 2015-10-15 11:15:06 -07:00
Seth Alves
1d8db13f41 switch to low-entity-server traffic hold 2015-10-15 10:56:47 -07:00
samcake
cdfe9788d1 Merging 2015-10-15 10:49:08 -07:00
Seth Alves
c884f466bc adjust timing of action refresh 2015-10-15 10:40:58 -07:00
Seth Alves
64c5cde2d2 further unmangle branch split 2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b further unmangle branch split 2015-10-15 10:29:25 -07:00
Seth Alves
e571cb7ca4 more lock adjustments 2015-10-15 10:22:25 -07:00
Seth Alves
8195145dc7 further unmangle branch split 2015-10-15 10:13:00 -07:00
ericrius1
55c68e0509 Merge branch 'master' into whiteboard 2015-10-15 10:08:32 -07:00
James B. Pollack
d8c979b9d4 add lifetime to lights created by flashlight 2015-10-15 10:07:21 -07:00
Seth Alves
d833fb08d7 further unmangle branch split 2015-10-15 10:03:32 -07:00
Andrew Meadows
2ae62de84e Merge pull request #6026 from birarda/qt-polling-env 
set bearer poll timeout env for wlan scan in Qt 5.5
 2015-10-15 09:58:32 -07:00
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Seth Alves
7ef5fc9613 remove line that leaked over from other branch 2015-10-15 09:19:47 -07:00