Andrew Meadows
|
76b10a60ba
|
Merge pull request #4285 from ZappoMan/editLogging
added logging of edit commands in the server
|
2015-02-13 17:02:05 -08:00 |
|
Andrew Meadows
|
45208d468e
|
Merge pull request #4282 from ZappoMan/bugfix
some backup logging improvements & a bug fix
|
2015-02-13 16:54:25 -08:00 |
|
Brad Hefta-Gaub
|
f6ff0665ca
|
Merge pull request #4286 from huffman/fix-nat-dims
Fix "reset to natural dimensions" when dimensions not known
|
2015-02-13 16:31:34 -08:00 |
|
Brad Hefta-Gaub
|
2f492082c1
|
Merge pull request #4287 from sethalves/fix-Rectangle3d-drawing-problem
fix Rectangle3d drawing problem
|
2015-02-13 16:30:46 -08:00 |
|
Andrew Meadows
|
45ec7fdf07
|
Merge pull request #4288 from ZappoMan/dependancyCleanup
change ScriptCache and SoundCache to derive from Dependency
|
2015-02-13 16:00:47 -08:00 |
|
ZappoMan
|
1fc0225939
|
change ScriptCache and SoundCache to derive from Dependency
|
2015-02-13 15:33:41 -08:00 |
|
Seth Alves
|
42511f3b7f
|
M-x mangle buffer
|
2015-02-13 15:23:22 -08:00 |
|
Seth Alves
|
98b445b22f
|
the geometryCacheID for Rectangle3DOverlay wasn't being initialized (so was randomish). if they overlapped, some would be drawn looking like others
|
2015-02-13 15:21:03 -08:00 |
|
Ryan Huffman
|
2df850eb8d
|
Fix natural dimensions check
|
2015-02-13 15:02:16 -08:00 |
|
Ryan Huffman
|
0495833ca6
|
Disallow entity models to be reset to natural dimensions if unknown
|
2015-02-13 15:00:37 -08:00 |
|
ZappoMan
|
bc5a1477e6
|
added logging of edit commands in the server
|
2015-02-13 14:59:57 -08:00 |
|
Brad Hefta-Gaub
|
5c048db5f5
|
Merge pull request #4284 from sethalves/fix-butterflies
if butterflies stop moving, they are no longer kinematic, so give them a velocity
|
2015-02-13 12:45:08 -08:00 |
|
Seth Alves
|
6ff4f8c2c0
|
give butterflies an initial velocity so that they are on the kinematics list
|
2015-02-13 11:52:23 -08:00 |
|
Andrew Meadows
|
5113258d72
|
Merge pull request #4279 from birarda/android
fix cleanup of AudioClient, avoid gvr-interface crash on OS X
|
2015-02-13 10:58:50 -08:00 |
|
Brad Hefta-Gaub
|
59b2c38eb1
|
Merge pull request #4277 from huffman/fix-select-box
Update editEntities to not select new entity when edit tools are off
|
2015-02-13 10:50:11 -08:00 |
|
Brad Hefta-Gaub
|
1827d9f3cd
|
Merge pull request #4256 from samcake/temp1
Getting rid of glLIghts and replacing by the model::Light
|
2015-02-13 10:49:53 -08:00 |
|
Stephen Birarda
|
e3475d4d7f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into android
|
2015-02-13 10:19:00 -08:00 |
|
Andrew Meadows
|
d69efa03d8
|
Merge pull request #4276 from birarda/master
repairs to memory management for AudioInjectors
|
2015-02-13 10:15:07 -08:00 |
|
Stephen Birarda
|
13fc0b1fcd
|
fix AudioInjector debug line to be more clear
|
2015-02-13 09:36:16 -08:00 |
|
Brad Hefta-Gaub
|
6c8a78a9a7
|
Merge pull request #4278 from huffman/fix-edit-grid
Fix edit grid
|
2015-02-12 17:20:03 -08:00 |
|
Brad Hefta-Gaub
|
3531463978
|
Merge pull request #4265 from Triplelexx/#20300
#20300
|
2015-02-12 17:19:01 -08:00 |
|
ZappoMan
|
f1a5865201
|
added more logging to persist and backup, fixed bug in start up case for no models.svo and backup
|
2015-02-12 15:17:48 -08:00 |
|
Stephen Birarda
|
30b371559d
|
fix a typo in RenderingClient
|
2015-02-12 15:11:24 -08:00 |
|
Stephen Birarda
|
4e71e128f3
|
remove QThread not currently used in client
|
2015-02-12 13:42:36 -08:00 |
|
Stephen Birarda
|
6c25205856
|
fix audio cleanup and close action in Application
|
2015-02-12 13:35:22 -08:00 |
|
Ryan Huffman
|
813673b720
|
Fix grid tool not showing minor grid width
|
2015-02-12 13:19:09 -08:00 |
|
Ryan Huffman
|
a3d09e6adc
|
Fix edit grid not showing up
|
2015-02-12 13:18:58 -08:00 |
|
Stephen Birarda
|
ff6f8ea4a1
|
cleaner cleanup of AudioClient from RenderingClient
|
2015-02-12 13:14:30 -08:00 |
|
Ryan Huffman
|
51ce8c7100
|
Update editEntities to not select new entity when edit tools are off
|
2015-02-12 13:09:37 -08:00 |
|
Stephen Birarda
|
ef9cc2aacc
|
repair ability for desktop to add gvr target
|
2015-02-12 12:49:29 -08:00 |
|
Stephen Birarda
|
0154ac9734
|
final script repairs for new AudioInjector API
|
2015-02-12 11:52:20 -08:00 |
|
Stephen Birarda
|
1120a5f963
|
use new injector API in inWorldTestTone
|
2015-02-12 11:50:48 -08:00 |
|
Stephen Birarda
|
eda7d8ffb1
|
use new injector APIs in movable script
|
2015-02-12 11:49:01 -08:00 |
|
Stephen Birarda
|
70e085009b
|
use injector restart in airGuitar script
|
2015-02-12 11:44:14 -08:00 |
|
Stephen Birarda
|
5f4e3528c2
|
override seek to handle warning once stopped
|
2015-02-12 11:29:55 -08:00 |
|
Stephen Birarda
|
5715642e04
|
fix for restart API in lobby script
|
2015-02-12 11:13:30 -08:00 |
|
Stephen Birarda
|
060b0bbfd6
|
tell injector it is not finished once restarted
|
2015-02-12 11:13:03 -08:00 |
|
Stephen Birarda
|
ea52cea5dd
|
more cleanup for AudioInjector mem management
|
2015-02-12 10:56:40 -08:00 |
|
Stephen Birarda
|
7becf62ba9
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-02-12 10:28:04 -08:00 |
|
Brad Hefta-Gaub
|
fa5eebd93e
|
Merge pull request #4269 from AndrewMeadows/thermonuclear
ModelEntityItem gets _shapeType
|
2015-02-12 10:06:01 -08:00 |
|
Andrew Meadows
|
9f62e8bbf6
|
Merge pull request #4274 from sethalves/lockers-can-change-metavoxels
if a MetavoxelEditMessage is received from a node which is not an editer...
|
2015-02-12 09:51:25 -08:00 |
|
Andrew Meadows
|
5553f0f531
|
Merge pull request #4275 from ctrlaltdavid/20306
CR for Job #20306 - When you load Interface on a PC if takes up the entire screen, this needs to change
|
2015-02-12 09:50:12 -08:00 |
|
Andrew Meadows
|
7304585103
|
Merge pull request #4271 from huffman/fix-overlays-text-size
Fix overlays text size
|
2015-02-12 09:35:37 -08:00 |
|
Seth Alves
|
6506d87eb6
|
Merge branch 'master' of github.com:highfidelity/hifi into lockers-can-change-metavoxels
|
2015-02-12 09:16:56 -08:00 |
|
Andrew Meadows
|
357dd963f3
|
Merge pull request #4273 from ZappoMan/bugfix
fix the quad color being broken after rendering text
|
2015-02-12 09:00:16 -08:00 |
|
Andrew Meadows
|
e737921e67
|
Merge pull request #4270 from sethalves/clean-up-stats
put bandwidth stats in first overlay column rather than in their own
|
2015-02-12 08:58:53 -08:00 |
|
Andrew Meadows
|
5bb504ad55
|
Merge pull request #4268 from huffman/remove-upload-model
Remove upload from file from editEntities.js
|
2015-02-12 08:57:22 -08:00 |
|
Andrew Meadows
|
b4bd60e979
|
give TextEntityItem a box collision shape
|
2015-02-12 08:28:34 -08:00 |
|
Stephen Birarda
|
43e777163e
|
use a QPointer to trigger delayed delete
|
2015-02-11 19:15:33 -08:00 |
|
David Rowe
|
6f03035169
|
Explicit casts for OSX and Linux
|
2015-02-11 18:05:25 -08:00 |
|