Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
47208 commits 71 branches 56 tags 1.2 GiB
Commit graph

17863 commits

Author SHA1 Message Date
Chris Collins
2b8765b47e Merge pull request #8765 from ctrlaltdavid/fix-address-bar 
Fix address bar not being able to regain focus
 2016-10-10 10:11:34 -07:00
David Rowe
12f4b2854d Fix address bar not being able to regain focus 2016-10-08 19:38:57 +13:00
David Rowe
a934f59c2a Fix virtual keyboard in login dialog 2016-10-08 13:37:31 +13:00
Ryan Huffman
6476dfecc6 Update help window images 2016-10-07 16:06:26 -07:00
Ryan Huffman
c995e51128 Fix compilation bugs in Application 2016-10-07 10:30:18 -07:00
Ryan Huffman
b839926396 Remove unnecessary lambda for location initialization on startup 2016-10-07 10:30:18 -07:00
Ryan Huffman
9ddeda389e Update initial run logic 2016-10-07 10:30:18 -07:00
Ryan Huffman
20b93a7afa Add redirection to entry on first turn if you don't have Vive 2016-10-07 10:30:18 -07:00
Ryan Huffman
216cf2b4bc Update tutorial to work with HMD + Hand Controllers only 2016-10-07 10:30:18 -07:00
Ryan Huffman
1699299de9 Fix location that server content version is looked for 2016-10-07 10:30:18 -07:00
Ryan Huffman
37096910fc Fix tutorial begin location 2016-10-07 10:30:18 -07:00
Ryan Huffman
9c7ea6ac7c Update logic for going to tutorial on launch 2016-10-07 10:30:18 -07:00
Ryan Huffman
1e0772d613 Remove unused variable 2016-10-07 10:30:18 -07:00
Ryan Huffman
4c3cb83d47 Set default preferred device to vive and rift 2016-10-07 10:30:18 -07:00
Ryan Huffman
9f53652dfb Add routing of new users to tutorial 2016-10-07 10:30:18 -07:00
Ryan Huffman
54498a8f3f Add the ability to ignore invisible entities in findRayIntersection 2016-10-07 10:30:18 -07:00
Howard Stearns
3a294e77d4 Merge pull request #8745 from huffman/feat/new-help-window 
Update the help window
 2016-10-07 10:01:47 -07:00
David Rowe
bdff71151d Updates from code review 2016-10-07 13:35:44 +13:00
David Rowe
e2e762f9e7 Merge branch 'master' into 21055 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
 2016-10-07 11:27:35 +13:00
Ryan Downe Karpf
877d62069e Merge pull request #8750 from ctrlaltdavid/21066 
QA READY: Improve address bar address entry
 2016-10-06 14:45:25 -07:00
David Rowe
b6221a5f83 Fix clearing address bar after navigating using picture card 2016-10-07 09:45:34 +13:00
Ryan Huffman
a74b8f3f24 Update help window images 2016-10-06 13:37:56 -07:00
Ryan Huffman
508950841b Adjust the img size in help.html 2016-10-06 13:22:59 -07:00
Ryan Huffman
e59069fe35 Update help window images 2016-10-06 13:00:07 -07:00
Chris Collins
80ecf88935 Merge pull request #8731 from huffman/feat/interface-run-server 
Add flag to interface to have it start the sandbox server
 2016-10-06 09:18:41 -07:00
Ryan Huffman
246a816b80 Update help window tabs to activate on mouse down instead of up 2016-10-05 22:54:39 -07:00
David Rowe
1ee9317234 Fix clearing address and cursor upon address bar closing 2016-10-06 17:00:25 +13:00
David Rowe
a347936b68 Fix location not being updated after using back and forwards buttons 2016-10-06 16:47:49 +13:00
David Rowe
2807f76e68 Fix semantics of function parameter 2016-10-06 15:49:16 +13:00
David Rowe
742e603fd6 Show cursor if user clicks in address bar 2016-10-06 15:21:08 +13:00
David Rowe
7d23cd7c7c Don't show cursor until after have started entering an address 2016-10-06 15:19:58 +13:00
David Rowe
b70eac353b Enable address entry by typing without clicking in address bar 2016-10-06 15:18:07 +13:00
Chris Collins
bc6797fc3a Merge pull request #8733 from zzmp/fix/audio-channel-swap 
fix intermittent channel swapping
 2016-10-05 15:54:25 -07:00
Ryan Huffman
0e3e2b8a9a Update date in help.html 2016-10-05 15:50:49 -07:00
David Rowe
1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
 2016-10-06 09:29:09 +13:00
Zach Pomerantz
afce8c4a45 STEREO_FACTOR -> AudioConstants::STEREO 2016-10-05 13:02:28 -07:00
Clément Brisset
d18394f249 Merge pull request #8596 from huffman/feat/my-avatar-self-id 
Add ability to parent overlays to MyAvatar for use across servers
 2016-10-05 12:03:01 -07:00
Clément Brisset
3f64847888 Merge pull request #8726 from huffman/feat/model-overlay-hide-change-textures 
Fix model overlay visibility and texture properties
 2016-10-05 11:54:11 -07:00
Brad Hefta-Gaub
6f86ce8d3b Merge pull request #8683 from jherico/oglplus_b_gone2 
Remove all usage of oglplus
 2016-10-05 09:59:42 -07:00
Howard Stearns
32db63e177 Merge pull request #8737 from highfidelity/domain-check 
Domain check
 2016-10-05 08:47:27 -07:00
Brad Hefta-Gaub
415b492c8c Merge pull request #8715 from jherico/offscreen_fences2 
Support external GL textures with proper fencing
 2016-10-05 05:13:06 -07:00
Ryan Huffman
ff8f45d36c Fix application directory path 2016-10-04 16:47:59 -07:00
Ryan Huffman
224c35d568 Clean up launch server in main.cpp 2016-10-04 16:47:59 -07:00
Ryan Huffman
0aba1d3e54 Fix server arguments causing crash on startup 2016-10-04 16:47:58 -07:00
Ryan Huffman
fe6382d1b6 Update server content path to be relative 2016-10-04 16:47:58 -07:00
Ryan Huffman
392ecb0dae Update interface to launch server 2016-10-04 16:47:58 -07:00
Ryan Huffman
847a5cc7a1 Remove old texture setting code in ModelOverlay 2016-10-04 16:25:48 -07:00
Ryan Huffman
93d995a5ae Fix model overlay visible not working 2016-10-04 16:25:40 -07:00
Ryan Huffman
c683c82817 Fix setting textures in model overlays 2016-10-04 16:24:43 -07:00
Howard Stearns
4974c88880 Merge pull request #8663 from howard-stearns/address-bar-text-area-changes 
Address bar text area changes
 2016-10-04 13:50:40 -07:00