Brad Davis
82c041d06a
Adding git attributes file
2015-10-18 22:54:04 -07:00
Brad Hefta-Gaub
4289d54bd9
Merge pull request #6102 from Atlante45/master
...
Fix particle bug by having lifetimes increase
2015-10-17 12:21:47 -07:00
Ryan Huffman
29a29d997d
Merge pull request #6100 from imgntn/edit_better
...
[Scripts] Edit.js - Add color bars below XYZ inputs to indicate world axis
2015-10-16 22:17:37 -07:00
Atlante45
1da68e0214
Fix particle bug by having lifetimes increase
2015-10-16 18:11:22 -07:00
Eric Levin
6738455a5a
Merge pull request #6099 from ctrlaltdavid/20709
...
QA for 20709 - Fix reading of QVector<float> from models files - polyline strokeWidths
2015-10-16 17:12:18 -07:00
James B. Pollack
31cc451fd4
css cleanup
2015-10-16 16:42:29 -07:00
James B. Pollack
c6fcaf158b
add color to more props
2015-10-16 16:15:20 -07:00
James B. Pollack
aa6aaf912e
add color bars below position inputs
2015-10-16 16:07:20 -07:00
David Rowe
8c22db17cc
Fix reading of QVector<float> from models files - polyline strokeWidths
2015-10-16 15:43:23 -07:00
Eric Levin
9a87f5c574
Merge pull request #6096 from imgntn/resetter_acs
...
[Scripts] - Move resetting basketballs and targets to an AC script
2015-10-16 12:18:15 -07:00
James B. Pollack
4b21bdf308
testing
2015-10-16 11:50:13 -07:00
Brad Hefta-Gaub
88a66d3c52
Merge pull request #6088 from hyperlogic/tony/regen-english-translation-strings
...
Updated english translation file
2015-10-16 10:59:26 -07:00
Seth Alves
8338491c3b
Merge pull request #6095 from Atlante45/master
...
Fix export bug
2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076
Merge pull request #6084 from AndrewMeadows/physics-cleanup
...
move DIRTY_FLAGS out of EntityItem namespace
2015-10-16 07:22:40 -07:00
Atlante45
a84fdecec9
Fix export bug
2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub
26f82e899e
Merge pull request #6079 from ericrius1/whiteboard
...
Entity whitelist for raypicking and whiteboard painting example
2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub
c3ee419ad7
Merge pull request #6086 from imgntn/flashlight_life
...
[Scripts] Add lifetime to lights created by flashlight
2015-10-15 17:42:57 -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
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
James B. Pollack
aee11d4c06
cleanup merge
2015-10-15 15:05:34 -07:00
James B. Pollack
112007e5a9
cleanup
2015-10-15 14:58:05 -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
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
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 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
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
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
Seth Alves
9f40c7bf8c
fix up AvatarActionHold
2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1
remove some debugging
2015-10-15 09:07:35 -07:00
