Ryan Huffman
d54dc5f2aa
Merge branch 'master' of github.com:highfidelity/hifi into 19935
...
Conflicts:
interface/src/Menu.h
2014-09-04 12:05:17 -07:00
Clément Brisset
cc6d70c5ab
Merge pull request #3336 from huffman/19995
...
Code Review for Job #19995
2014-09-04 11:37:35 -07:00
Brad Hefta-Gaub
0d69122ec1
Merge pull request #3344 from huffman/19944
...
Code Review for Job #19944
2014-09-04 10:25:53 -07:00
Andrew Meadows
1e19566e93
fix for bad avatar bounding shape on resize
2014-09-04 09:53:07 -07:00
AndrewMeadows
8223481ecb
Merge pull request #3341 from huffman/19967
...
Code Review for Job #19967
2014-09-03 16:51:19 -07:00
AndrewMeadows
bd55da4a83
Merge pull request #3335 from ZappoMan/virtualEntities
...
Model Server to Entity Server Refactoring
2014-09-03 15:48:58 -07:00
ZappoMan
25e8c7d3f1
useless semicolon removal
2014-09-03 12:22:02 -07:00
Ryan Huffman
d4ebe577df
Remove commented out icons
2014-09-03 08:28:25 -07:00
MarcelEdward
9662dced09
This patch updates the MyAvatar.cpp file.
...
It adds a check MyAvatar::goToLocationFromResponse to see if the user is online, if the teleport to the avatar is done and if not a message is shown which said that the user is not online
2014-09-03 16:59:00 +02:00
MarcelEdward
e62834c197
This patch updates Application::updateLocationInServer() in Application.cpp
...
The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds.
This function had an LastLocationObject in which only send in the location info to the data web in case the location changed.
Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.
2014-09-03 16:43:39 +02:00
ZappoMan
835071ab06
tweak rendering of model entities without valid models to be cubes
2014-09-02 19:21:15 -07:00
ZappoMan
a555eeda23
CR feedback and warning fixes
2014-09-02 18:43:16 -07:00
Ryan Huffman
55acff02a1
Update RunningScripts height to take menu bar into account
2014-09-02 14:13:42 -07:00
Ryan Huffman
e6def6e35b
Fix spacing on RunningScripts
2014-09-02 14:01:24 -07:00
Andrzej Kapolka
34ba5cc31f
More shader fixes.
2014-09-02 13:54:47 -07:00
Ryan Huffman
67cefc8d54
Reduce height of RunningScripts so titlebar is inside main window
2014-09-02 13:12:52 -07:00
Ryan Huffman
a95b670716
Update RunningScripts style: font, spacing, title
2014-09-02 12:37:51 -07:00
Andrzej Kapolka
bf5e5fd72c
Quick fix for base colors underneath terrain.
2014-09-02 12:31:25 -07:00
ZappoMan
033017346c
removed debug code
2014-09-02 08:53:19 -07:00
Ryan Huffman
ece3390b4e
Fix bug with dropping hifi images not working on Windows
...
URLs on Windows included three forward-slashes, ex `file:///C:...`.
Using `toLocalFile()` correctly stringifies the location.
2014-09-01 22:14:28 -07:00
Ryan Huffman
9e510632b9
Remove box styling from RunningScripts
2014-08-31 12:29:54 -07:00
Ryan Huffman
936a9fad47
Disable icons on RunningScripts buttons
2014-08-31 12:28:45 -07:00
Ryan Huffman
2283b68dba
Remove 'recently loaded' widgets from RunningScripts
2014-08-31 11:31:45 -07:00
Ryan Huffman
ce0e0a9c59
Remove custom background, font, and button styles on RunningScripts
2014-08-31 11:30:26 -07:00
ZappoMan
d1a046e6ed
properly handle LOD in rendering by not rendering small entities
2014-08-29 21:18:31 -07:00
ZappoMan
2fab662e8c
fixed some problems in UpdateEntityOperator in case where original containing element isn't best fit
2014-08-29 17:48:14 -07:00
ZappoMan
2bcad6ab2b
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
examples/editModels.js
2014-08-28 21:19:56 -07:00
ZappoMan
de968ba4f6
fix the issue with moving entities not being simulated makes motion smoother
2014-08-28 16:44:52 -07:00
ZappoMan
c66ef90ca0
fix Model mew/delete and thread issues
2014-08-28 16:27:46 -07:00
Stephen Birarda
29ed1b3fcd
Merge pull request #3331 from ctrlaltdavid/19961
...
Code Review for Job #19961
2014-08-28 14:30:01 -07:00
David Rowe
1d3a176f5f
Rename method
2014-08-28 13:53:47 -07:00
ZappoMan
76c77d6994
first cut at properly working lifetime
2014-08-28 13:46:54 -07:00
David Rowe
85e9f8064a
Simplify to use bool instead of storing domain name
2014-08-28 12:21:55 -07:00
David Rowe
46c1a9d59a
Make login dialog automatically show only once per domain visit
2014-08-28 11:25:13 -07:00
Stephen Birarda
cc2a35c2a8
handle not found errors returned for addresses from data-web
2014-08-28 10:54:05 -07:00
Atlante45
2448229b46
fix for crash in Audio
2014-08-27 16:03:53 -07:00
ZappoMan
2f90df04ee
correct cleanup of Models/geometry and all EntityItems for various cases
2014-08-27 15:45:45 -07:00
ZappoMan
ed6363ca02
fixed bug in processing of entity erase messages
2014-08-27 14:21:06 -07:00
ZappoMan
5c2b674a0d
verify delete behavior actually frees memory associated with EntityItems
2014-08-27 12:07:11 -07:00
Ryan Huffman
f1aaea0ffa
Fix bug with chat scrolling randomly
2014-08-27 12:05:57 -07:00
ZappoMan
30e00bbd69
final pass on entities import/export/overlays working as well as production
2014-08-27 11:34:50 -07:00
Brad Hefta-Gaub
e8c3125985
Merge pull request #3323 from chansensturm/wangyix-qt_stats_for_audiomixer
...
Merge of Yixin's PR #3281 to head
2014-08-27 11:14:52 -07:00
Craig Hansen-Sturm
e941e58626
merge HEAD with PR-3281
2014-08-26 18:25:40 -07:00
ZappoMan
b14158385c
first cut at getting pastEntities() working
2014-08-26 16:47:32 -07:00
ZappoMan
4895ee32f7
test and fix issues with exportEntities()
2014-08-26 15:59:49 -07:00
Atlante45
3826ed0d69
Added setFinalPitch/Yaw/Roll to HeadData
2014-08-26 15:36:08 -07:00
Atlante45
9e686b4096
Moved lean and head rotation inside Player class
2014-08-26 14:36:46 -07:00
ZappoMan
ef8feec91a
fix referentials corruption and removed some debugging
2014-08-26 10:42:46 -07:00
Ryan Huffman
e38d8f7afd
Update all locations that update settings to call bumpSettings()
2014-08-26 07:47:22 -07:00
Atlante45
cf14af0766
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-08-25 18:54:41 -07:00
