Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 23:52:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46092 commits 75 branches 59 tags 1.2 GiB
Commit graph

46092 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
2b1e629cca some extra checks on settings values 2016-08-19 14:51:15 -07:00
howard-stearns
1e08914f8d simplify 2016-08-19 14:32:15 -07:00
James B. Pollack
3922192cfc update 2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a cleanup 2016-08-19 14:29:14 -07:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
Seth Alves
ac4ecc9907 don't send a login-denied packet when we're still waiting for user's public key. 2016-08-19 14:10:27 -07:00
Howard Stearns
e40b33e618 Merge pull request #8478 from howard-stearns/update-discovery-from-master2 
Update discovery from master2
 2016-08-19 13:28:34 -07:00
howard-stearns
b8b345fb43 Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2 2016-08-19 13:04:39 -07:00
elisa-lj11
4aab389305 Merge remote-tracking branch 'highfidelity/master' into zip_project 2016-08-19 11:32:37 -07:00
elisa-lj11
8bc9a92429 removed extraneous debug prints 2016-08-19 11:32:13 -07:00
Anthony J. Thibault
8bb6bb7c6f generalized keyboard focus interface 
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.

* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
 2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565 Merge pull request #8436 from huffman/feat/more-user-activity-data 
Add more user activity data
 2016-08-19 10:48:28 -07:00
Andrew Meadows
5b5ed220bc add BufferView::Iterator operator<() and friend 2016-08-19 10:26:47 -07:00
Andrew Meadows
c3f165d9da BufferView::Iterator doesn't support operator< 2016-08-19 10:15:37 -07:00
Andrew Meadows
304c313db7 minor cleanup 2016-08-19 10:15:30 -07:00
Howard Stearns
1eebf00d95 Merge pull request #8475 from howard-stearns/fixed-aspect-snapshots 
option for fixed aspect-ratio snapshots, and used in snapshot button
 2016-08-19 09:53:32 -07:00
howard-stearns
4d7d483c0e use ceil 2016-08-19 09:51:58 -07:00
elisa-lj11
4c434e875e fixed merge conflicts in Application.cpp 2016-08-19 09:46:22 -07:00
Seth Alves
ff95ef2492 ignoreIK flag on action-grabbable objects works again 2016-08-19 08:59:42 -07:00
Anthony J. Thibault
4db1687746 bug fix for when web-entity is deleted while being scrolled 2016-08-18 18:37:52 -07:00
James B. Pollack
b694b8e541 update turn rate for left stick 2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014 moar 2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e fix bug 2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199 slow 180 rate 2016-08-18 16:50:50 -07:00
Chris Collins
a9fbc4ec2c Merge pull request #8448 from huffman/feat/domain-specify-backup-location 
Add backup directory setting to domain server
 2016-08-18 16:45:50 -07:00
howard-stearns
f6670a6374 new optional aspect-ratio argument to snapshot chain (javascript through 
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio.  Snapshot button uses 1.91.
 2016-08-18 16:29:42 -07:00
Howard Stearns
01fcaa024d Merge pull request #8463 from howard-stearns/html-user-story 
html drill-down user story
 2016-08-18 16:15:47 -07:00
James B. Pollack
3a8de5ab0d fix rotation function 2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4 remove prints 2016-08-18 15:29:49 -07:00
James B. Pollack
c89103481b change load order 2016-08-18 14:40:08 -07:00
James B. Pollack
859d3ccadc tweaks 2016-08-18 14:36:52 -07:00
howard-stearns
aab3b83ad9 open login if user tries to share and is not logged in, rather than 
messaging user that they cannot share
 2016-08-18 14:20:53 -07:00
howard-stearns
4492c4e64e Allow javascript to safely open the correct login window (or answer that 
it is unneded).
 2016-08-18 14:19:36 -07:00
James B. Pollack
2e22bc5e46 new coolin 2016-08-18 14:08:31 -07:00
James B. Pollack
402bad3417 Merge remote-tracking branch 'upstream/master' into demo_movement 2016-08-18 13:43:54 -07:00
James B. Pollack
992504e179 adjust coolin 2016-08-18 13:35:51 -07:00
howard-stearns
5e8722ccf5 persist "open feed after" checkbox setting 2016-08-18 12:58:00 -07:00
Brad Hefta-Gaub
1cec7b2db0 Merge pull request #8429 from SamGondelman/loadingFade2 
Don't do fade effect once physics kick in
 2016-08-18 12:46:24 -07:00
Brad Davis
37192e8251 Merge pull request #8472 from zzmp/fix/buffer-debug-flood 
fix log flood in debug mode from Buffer::Iterator (c)end access
 2016-08-18 12:06:45 -07:00
James B. Pollack
b8213aed7b naming and some logging for teleport stuff 2016-08-18 11:59:58 -07:00
Chris Collins
140b0c4d02 Merge pull request #8462 from jherico/openvr_random_position_fix 
Address issues with random camera locations
 2016-08-18 11:51:47 -07:00
Andrew Meadows
6446c7c302 make createShapeFromInfo() fail gently on bad data 2016-08-18 11:49:15 -07:00
Andrew Meadows
2ba35e6398 skip non-existant meshes 2016-08-18 11:48:56 -07:00
Seth Alves
15ce40ecf4 merge from upstream 2016-08-18 11:46:02 -07:00
Seth Alves
6b46b3082c try, try again 2016-08-18 11:45:03 -07:00
Zach Pomerantz
813fefd599 reimplement buffer get for (c)end 2016-08-18 11:26:25 -07:00
Andrew Meadows
cb9a5466d5 workaround bad FBXMesh data rather than assert 2016-08-18 11:09:48 -07:00
James B. Pollack
37846d9f0c store settings 2016-08-18 11:07:50 -07:00
Clément Brisset
d1fb723b01 Merge pull request #8444 from zzmp/fix/skybox 
fix flashing in default skybox, and allow skybox lighting without textures
 2016-08-18 11:07:09 -07:00
Seth Alves
43c5735baa don't use -Wsuggest-override on older gcc 2016-08-18 11:05:31 -07:00