Atlante45
913172b490
Fix extension checking
2016-02-10 18:17:13 -08:00
Chris Collins
b1c6d1d256
Merge pull request #7070 from sethalves/no-sink-upon-server-restart
...
don't sink through floor when server restarts
2016-02-10 14:42:28 -08:00
Seth Alves
11d296a477
if we are told to clear the octree, disable physics until we have (re)loaded entities
2016-02-10 14:08:35 -08:00
Andrew Meadows
132169395c
use const reference for std:vector
2016-02-10 10:36:34 -08:00
Brad Davis
6a66d74e19
Limit the number of concurrent file parsing threads
2016-02-08 23:55:03 -08:00
samcake
07759bb5db
Merge pull request #7034 from zzmp/feat/render-to-json
...
Add toJson methods to render config objects in JS
2016-02-08 18:00:25 -08:00
Zach Pomerantz
8bf6c66327
Add (de)serializer for QObject->JSON
2016-02-05 13:03:46 -08:00
Bradley Austin Davis
ebf0bf394a
Fix native text rendering by forcing positions to integer values
2016-02-05 11:43:31 -08:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Bradley Austin Davis
f24f2749e1
Make users.js show QML window for edit friends
2016-02-02 15:19:12 -08:00
Bradley Austin Davis
5adf9adb0e
Make mirror rectaqngle move with mirror controls
2016-02-02 12:00:17 -08:00
Ryan Huffman
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -08:00
samcake
e645f8a1f1
FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore
2016-02-01 16:25:55 -08:00
Brad Hefta-Gaub
6779bc4073
Merge pull request #7000 from jherico/qml
...
Snapshot UI in QML
2016-02-01 14:00:25 -08:00
Brad Hefta-Gaub
711787a997
Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal
...
Animate iff visible with step2 billboard removal
2016-02-01 13:54:25 -08:00
Brad Davis
27c38599a9
Snapshot dialogs
2016-02-01 11:07:48 -08:00
Brad Davis
eb7988e4ef
Cleaning up unused code
2016-02-01 11:07:46 -08:00
Seth Alves
753fc44c12
Merge pull request #6996 from thoys/hydra-scaling-fix
...
Fix for controller palm movement for scaled avatars
2016-02-01 09:17:22 -08:00
Seth Alves
b553c8400d
Merge pull request #6988 from huffman/market-import-fail
...
Fix marketplace imports failing silently if edit.js not running
2016-02-01 07:06:34 -08:00
Thijs Wenker
8f6e7018bd
Fix for Hydra scaling
...
This PR fixes the hydra (and probably other hand controllers) while scaling.
Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
2016-01-31 23:39:43 +01:00
Ryan Huffman
acf96a401f
Fix marketplace imports failing silently if edit.js not running
2016-01-29 15:48:08 -08:00
David Rowe
a5bc1cfd19
Periodically store avatar location
2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94
Store avatar location after a teleport
2016-01-30 12:26:50 +13:00
David Rowe
be4022983b
Don't store avatar location immediately after a host change
...
Because the avatar location is 0,0,0 rather than the end target.
2016-01-30 12:25:56 +13:00
howard-stearns
9601b65269
Merge branch 'master' of https://github.com/highfidelity/hifi into animate-iff-visible
2016-01-29 11:40:13 -08:00
Brad Davis
5b2e739ef3
Fixing warning
2016-01-28 16:39:40 -08:00
Brad Davis
aa03241dd9
Make all load script dialogs QML and respect previous script location
2016-01-28 15:53:04 -08:00
howard-stearns
1225e50581
One round of billboard shredding. Server/wire/AvatarData have not been
...
touched.
2016-01-27 16:15:43 -08:00
samcake
f4e0352f61
Merge pull request #6930 from zzmp/feat/bubble-render-settings
...
Bubble up render settings from CPP to JS/QML
2016-01-27 14:20:51 -08:00
Brad Davis
f53aaa1d64
Removing old attachment dialog, updating menu code
2016-01-26 21:55:42 -08:00
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Zach Pomerantz
e770d7b679
Add PhysicsShowOwned back to Menu
2016-01-26 18:56:52 -08:00
Zach Pomerantz
2da2bc60db
Tie shadow frustum to boom offset
2016-01-26 12:26:16 -08:00
howard-stearns
6928984448
remaining Application message boxes, EXCEPT asset upload, which has a
...
checkbox.
2016-01-25 14:45:26 -08:00
howard-stearns
eb19f293c4
Fix askToSetAvatarUrl dialogs to use new style.
2016-01-25 14:04:06 -08:00
Zach Pomerantz
f3265db298
Gut RenderContext
2016-01-25 12:14:58 -08:00
Zach Pomerantz
f5a408d82a
Notes for later
2016-01-25 12:14:58 -08:00
Zach Pomerantz
9064438bf0
Replace RenderScriptingInterface with dynamic Task::Config
2016-01-25 12:13:55 -08:00
Zach Pomerantz
2e1fbf66ad
Refine Configuration for render::Job
...
wip
wip
wip
wip
2016-01-25 12:13:55 -08:00
Zach Pomerantz
8b68d5922c
Make Engine a Task
2016-01-25 12:13:55 -08:00
Brad Davis
208d7c3cfc
Killing the old preferences dialog
2016-01-22 19:24:38 -08:00
Brad Davis
858bbbf987
Adding OffscreenUI API for QInputDialog functionality
2016-01-22 17:31:03 -08:00
Brad Davis
2026821d9e
Moving preferences to dependency mananger
2016-01-22 17:30:08 -08:00
Brad Davis
205ab05506
First pass on preferences dialog
...
Conflicts:
tests/ui/qmlscratch.pro
2016-01-22 17:30:07 -08:00
samcake
338342cdec
Merge pull request #6859 from zzmp/flag/shadows
...
Add shadows behind a render-menu flag
2016-01-22 16:28:17 -08:00
Andrew Meadows
200676ac68
Merge pull request #6896 from AndrewMeadows/another-crash-fix
...
fix crash when deleting entities quickly
2016-01-22 14:04:46 -08:00
Seth Alves
7a3401a8d7
Merge pull request #6867 from AndrewMeadows/collision-group-prep
...
cleanup in preparation for smarter collision grouping
2016-01-22 11:45:42 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Zach Pomerantz
dee8e0ba9d
Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows
2016-01-22 10:03:06 -08:00
Brad Hefta-Gaub
e1c369dc10
Merge pull request #6766 from samcake/hdr
...
Ambient Occlusion
2016-01-21 18:10:52 -08:00
