Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 05:38:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26627 commits 69 branches 58 tags 1.2 GiB
Commit graph

26627 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
42202e749d Merge pull request #5065 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-06-05 12:42:46 -07:00
ZappoMan
7dc0e8a66c Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 12:21:29 -07:00
Brad Hefta-Gaub
202e39799a Merge pull request #5062 from ZappoMan/team-teaching 
Team teaching - merge from master
 2015-06-05 12:21:10 -07:00
ZappoMan
35f40df6e2 fix build buster 2015-06-05 12:06:13 -07:00
Eric Levin
21aa3b62bc bumped max line points to 80 2015-06-05 12:04:32 -07:00
Seth Alves
b425cc6491 merge from upstream 2015-06-05 11:56:33 -07:00
Seth Alves
b0480af040 Merge pull request #5053 from AndrewMeadows/isothermal 
fix crash during bogus reconnect on login
 2015-06-05 11:38:23 -07:00
Seth Alves
aff582287d use const references for arguments in action-related calls 2015-06-05 11:26:54 -07:00
Philip Rosedale
1f11625db4 Merge pull request #5060 from ericrius1/paint 
moved ball marker closer to hand so painting feels more visceral
 2015-06-05 11:26:22 -07:00
ZappoMan
f8a2fff5a7 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:06:10 -07:00
Brad Hefta-Gaub
4c52076e13 Merge pull request #5063 from huffman/fix-entity-delete-payload 
Team Teaching - Fix entity payloads not being removed on delete
 2015-06-05 11:03:46 -07:00
ZappoMan
7ebe64b52f Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 11:01:17 -07:00
Andrew Meadows
53fa6cf0b2 Merge pull request #5040 from jherico/web-entities-fix 
Fixing web entity glow and 'back' behavior
 2015-06-05 10:46:58 -07:00
Niraj Venkat
a2165e3a8a Merge branch 'master' of https://github.com/highfidelity/hifi 2015-06-05 10:42:20 -07:00
Seth Alves
28c034698f Merge branch 'master' of github.com:highfidelity/hifi into actions 2015-06-05 10:41:20 -07:00
Seth Alves
c5143cdfa0 Merge pull request #5027 from AndrewMeadows/isentropic 
cleanup around sending all "terse update" data whenever some of it changes
 2015-06-05 10:41:06 -07:00
Niraj Venkat
c8236f867b Address manager changes to support domain ID 2015-06-05 10:40:17 -07:00
Seth Alves
4e10c28b41 merge from upstream 2015-06-05 10:31:13 -07:00
Seth Alves
edb3622c85 Merge pull request #5037 from AndrewMeadows/inertia 
collision groups for physical objects
 2015-06-05 10:26:28 -07:00
Ryan Huffman
37d9394140 Fix entity payloads not being removed on delete 2015-06-05 10:26:09 -07:00
Eric Levin
9f974c3b5c moves ball marker closer to avatar for mouse as well 2015-06-05 10:19:39 -07:00
Sam Gondelman
dd12e4740e example script for controller scripting, input mapping 2015-06-05 10:14:13 -07:00
Seth Alves
08902d0ec9 Merge pull request #5061 from jherico/skybox-jiggle 
Fix the skybox jiggle in the HMD
 2015-06-05 10:14:07 -07:00
Seth Alves
51f5730e68 formatting 2015-06-05 10:05:11 -07:00
Seth Alves
eb912892dc code review 2015-06-05 09:56:34 -07:00
Brad Davis
16f55c7557 Fix the skybox jiggle in the HMD 2015-06-05 09:52:56 -07:00
David Rowe
562228e924 Change login password recovery link text 2015-06-05 09:47:34 -07:00
ZappoMan
807cc3db24 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-05 09:37:39 -07:00
Eric Levin
30ba7ffc29 moved ball marker closer to hand so painting feels more visceral 2015-06-05 09:36:12 -07:00
Brad Hefta-Gaub
4bbde3d724 Merge pull request #5058 from huffman/entity-update-url 
TEAM TEACHING - Fix model entities correctly updating payloads when url changes
 2015-06-05 09:27:36 -07:00
Ryan Huffman
b22ed34825 Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset 
TEAM TEACHING - improvements to avatar part clipping
 2015-06-05 09:26:45 -07:00
ZappoMan
d60810e221 CR feedback 2015-06-05 09:10:38 -07:00
David Rowe
37aefe73f8 Remove unnecessary semicolons 2015-06-05 09:07:07 -07:00
David Rowe
426fbc662a White error text instead of black 2015-06-05 09:03:46 -07:00
David Rowe
6c7fb7e54c Fix setting focus at start-up when not logged in 2015-06-05 09:02:35 -07:00
Seth Alves
2086a25f93 oops 2015-06-05 08:59:19 -07:00
Seth Alves
086b9d404a fix return-type in lambda 2015-06-05 08:59:08 -07:00
Ryan Huffman
9814d11bea Fix model entities correctly updating payloads when url changes 2015-06-05 08:45:31 -07:00
Andrew Meadows
9cb7cb314d update minimum version support 2015-06-05 08:43:48 -07:00
David Rowe
977eae9f86 Make login password and register links work 2015-06-05 08:42:33 -07:00
Andrew Meadows
08b64666fe Merge pull request #5033 from howard-stearns/smooth-initial-crash-volume 
Smooth initial crash volume
 2015-06-05 08:40:09 -07:00
David Rowe
ce78a95dee Make login dialog able to be dragged 2015-06-05 08:22:36 -07:00
Brad Hefta-Gaub
ba5eab7460 Merge pull request #5057 from Atlante45/team-teaching 
Team Teaching - Transform to polyvox corner for render
 2015-06-05 07:48:28 -07:00
Brad Hefta-Gaub
5bace58a55 Merge pull request #5044 from Atlante45/lod 
Team Teaching - Render stats work with engine
 2015-06-05 07:47:33 -07:00
Seth Alves
3dbf28b7b4 use lambdas to remove some repeated code 2015-06-05 07:33:39 -07:00
Seth Alves
b2db5f7fee update grab.js to use pull-to-point action, various other fixes 2015-06-05 07:10:44 -07:00
Atlante45
260272d288 Transform to polyvox corner for render 2015-06-05 14:32:47 +02:00
Clément Brisset
5f16b8752b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 
Conflicts:
	libraries/entities-renderer/src/RenderableEntityItem.cpp
	libraries/render-utils/src/Model.cpp
 2015-06-05 13:28:42 +01:00
Clément Brisset
f19c0d8eec Some renaming for windows compiler 2015-06-05 13:23:58 +01:00
Sam Gateau
aa5e6fa1b0 merging 2015-06-05 00:41:29 -07:00