Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 20:00:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Midnight
7da4bc04d3 Add DodgeBall. 2017-08-18 13:36:07 -07:00
Andrew Meadows
8ad41227ce use more correct method name 2017-08-18 13:35:13 -07:00
Dante Ruiz
8d04047d8a starting to integrate teleport.js 2017-08-18 13:23:44 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
vladest
d29d4b5016 Adopt clonable settings to new styling 2017-08-18 21:44:44 +02:00
Andrew Meadows
65cf7b4f61 add OctreeSendThread::traverseAndBuildPacket() 
cleanup and split data packing from bandwidth management
 2017-08-18 11:32:05 -07:00
Andrew Meadows
075b8574fb using 0.0 for time stats is unambiguous 2017-08-18 11:31:03 -07:00
Zach Fox
1a62f60348 Commit early and often. 2017-08-18 11:30:25 -07:00
Andrew Meadows
0de109e2e8 cleanup and fix typos 2017-08-18 11:29:47 -07:00
Zach Fox
ace1e00158 MOREEEE PROGRESS 2017-08-18 10:52:42 -07:00
Elisa Lupin-Jimenez
762f1a9c5c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-18 10:49:51 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49:40 -07:00
SamGondelman
c9f4958925 handControllerGrab fix, maybe, hopefully 2017-08-18 10:39:40 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
vladest
2e5e0c94f1 Added login button to Tablet 2017-08-18 15:34:15 +02:00
vladest
4eba09214c Delegate highlighting to delegate item. Make sure ListView will not snap highlighted item 2017-08-18 08:11:29 +02:00
David Rowe
c3f96b6727 Fix damping property name 2017-08-18 13:27:38 +12:00
Elisa Lupin-Jimenez
4c28b9f09a attempt to check version of interface 2017-08-17 18:16:41 -07:00
Zach Fox
ccf81f801d All the pieces! 2017-08-17 17:06:48 -07:00
Zach Fox
05648bdbcb Passphrases working 2017-08-17 16:53:38 -07:00
Zach Fox
d052b49a54 Login and picture selection done 2017-08-17 16:34:33 -07:00
Zach Fox
5f69f30551 MOAR PROGRESS 2017-08-17 16:20:50 -07:00
Zach Fox
9135e37078 Go go go go gog o 2017-08-17 15:20:17 -07:00
Sam Gateau
5ac65e8f35 Merge pull request #11184 from Zvork/fadeinvertfix 
Fade edition bug fix
 2017-08-17 15:10:50 -07:00
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
David Rowe
5dd74d71fb Activate the color picker 2017-08-18 09:55:09 +12:00
vladest
f3969b0909 Switch off snap behavior 2017-08-17 22:28:42 +02:00
vladest
855f9d8a95 Missed qml file added 2017-08-17 21:47:48 +02:00
Menithal
dc5e374485 Merge remote-tracking branch 'upstream/master' into 21484 2017-08-17 22:28:43 +03:00
vladest
f77b913a14 Added input meter 2017-08-17 20:55:00 +02:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Elisa Lupin-Jimenez
4b1498f727 moved blocksApp.js to unpublished scripts, added icon 2017-08-17 10:18:29 -07:00
Elisa Lupin-Jimenez
a9d5cb45e9 changed icon to white 2017-08-17 10:11:29 -07:00
Artur Gomes
e8fea16449 Fix for line points disappearing on second client (trying new value to 
see if the line replicates correctly)
 2017-08-17 17:19:13 +01:00
Artur Gomes
e59ff51cdd Fixed two icons showing up when picking a color from the color table or 
from the custom colors.
 2017-08-17 16:25:33 +01:00
vladest
1a32a6fac3 Merge branch 'master' into audio_devices_split 2017-08-17 17:20:11 +02:00
vladest
d6c426d064 Reworking according new design 2017-08-17 17:17:02 +02:00
Artur Gomes
321742a865 Fix for points disappearing on second client (the one that's not 
drawing) (trying to limit it a bit more to see if it results in no loss
at all)
 2017-08-17 16:01:53 +01:00
Artur Gomes
2835130515 Fix dynamic hue not cycling through all the 360 hue values when drawing 
the line due to the change in the max size of the line.
 2017-08-17 15:53:13 +01:00
Artur Gomes
4f5bfcbc2b Merge remote-tracking branch 'upstream/master' 2017-08-17 14:57:31 +01:00
Artur Gomes
be35734074 Fix tablet not reopening after removing headset and putting it back on. 2017-08-17 14:56:29 +01:00
Olivier Prat
7910b0d8ff Switched back to full float for outline depth buffer because of precision issues 2017-08-17 15:55:59 +02:00
Olivier Prat
2d598f3428 Improved outline visual width normalization that makes it independant from resolution. It is now a ratio of the screen height 2017-08-17 15:44:02 +02:00
Olivier Prat
68753211dc Fixed bug on Mac where the outline effect would stop working once the window was resized 2017-08-17 15:25:41 +02:00
Artur Gomes
5e6e675f62 Replace stars brush. 2017-08-17 09:45:54 +01:00
Olivier Prat
1e4cf5d797 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-08-17 09:46:49 +02:00
EagleJumpDev
d01ce27ebf Merge branch 'master' of https://github.com/highfidelity/hifi into hifi_eaglejumpdev 
Test merge..... BUILD_WIN.md only change
 2017-08-16 22:17:35 -07:00
EagleJumpDev
f54e028c19 Out of memory errors detected on systems with only 6GB of main memory. Maybe 8GB should be the minimimum? 2017-08-16 22:16:50 -07:00
David Rowe
32113e84e4 Move color circle crosshairs witih laser 2017-08-17 14:45:47 +12:00