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

71036 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
12454d7ec7 Increase mini tablet grow/shrink time 2018-09-07 16:48:36 +12:00
David Rowe
f3cbca6cee Change "bubble" button to "goto" 2018-09-07 16:43:21 +12:00
David Rowe
d0e73b00f7 Restructure mini tablet code 2018-09-07 15:41:30 +12:00
David Rowe
73253977fe Merge branch 'M17428-c' into M17428-d 
# Conflicts:
#	scripts/system/miniTablet.js
 2018-08-30 16:21:31 +12:00
David Rowe
ec20fb7edb Reorient and reposition mini tablet 2018-08-30 16:16:49 +12:00
David Rowe
a01a5e3b39 Merge branch 'M17428-c' into M17428-d 2018-08-30 13:44:02 +12:00
David Rowe
a5c3450bfc Tweak mini tablet UI layout 2018-08-30 13:43:31 +12:00
David Rowe
c6d0ad39c0 Merge branch 'M17428-c' into M17428-d 2018-08-29 22:13:43 +12:00
David Rowe
15fcafa2f5 Use SVGs for buttons 2018-08-29 22:13:09 +12:00
David Rowe
b338c9f6fa Updated tiny table model and layout 2018-08-29 22:10:24 +12:00
David Rowe
91c1e1b276 Different expansion points and delta rotations if grabbed by other hand 2018-08-29 09:59:04 +12:00
David Rowe
f5c49026ab Expand tablet after it's been released from grab by other hand 2018-08-29 09:49:42 +12:00
David Rowe
49f5d5f2b7 Display mini tablet rotated in palm 2018-08-29 08:55:46 +12:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
Sam Gondelman
89bd24dd54
Merge pull request #13880 from SamGondelman/matCrash 
Fix crash on shutdown in domain with material
 2018-08-28 11:48:35 -07:00
Anthony Thibault
f281afa71f
Merge pull request #13874 from amantley/phaseWalkFix 
Phase walk fix bug 17770
 2018-08-28 11:29:29 -07:00
Sam Gateau
d9d23e7fcf
Merge pull request #13877 from luiscuenca/multiplyOtherAvatars 
Create N replicas of each other-avatar on the client side
 2018-08-28 09:02:13 -07:00
luiscuenca
c19bd8968a Fix mixer crash 2018-08-27 16:48:47 -07:00
Sam Gateau
657373d02f
Merge pull request #13588 from jherico/bug/fb15594 
Working on pauses in tomb domain
 2018-08-27 15:56:55 -07:00
Brad Davis
945982b1bd Working on pauses in tomb domain 2018-08-27 13:28:49 -07:00
Stephen Birarda
7ddd70a84a
Merge pull request #13871 from birarda/bug/double-domain-connect 
force NodeList reset if DS changes session or local ID
 2018-08-27 11:59:24 -07:00
John Conklin II
467fe56103
Merge pull request #13845 from SamGondelman/perf 
Move blendshape packing to worker thread
 2018-08-27 09:40:03 -07:00
luiscuenca
8ede6f1cd0 Fix removing my avatar and code standards 2018-08-27 06:55:52 -07:00
SamGondelman
ff6020e0ef fix compile errors, maybe 2018-08-24 15:41:25 -07:00
SamGondelman
98d145dc24 fix crash on shutdown in domain with material 2018-08-24 15:19:48 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
Stephen Birarda
d8b5a1a4a6 always remove old socket-matching node before add 2018-08-24 14:21:54 -07:00
SamGondelman
70f4d0c634 Merge remote-tracking branch 'upstream/master' into perf 2018-08-24 14:04:37 -07:00
Stephen Birarda
cb4ce4fedb make sure settings are re-requested on new connection 2018-08-24 13:05:04 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002 
workload tracks other avatars and adds/removes from physics simulation accordingly
 2018-08-24 12:43:51 -07:00
luiscuenca
ddbadf5a69 change to Test API 2018-08-24 11:59:46 -07:00
luiscuenca
5654acf5bf Fix warnings 2018-08-24 09:24:58 -07:00
Howard Stearns
9a472fa388
Merge pull request #13870 from zfox23/wallet_autologout 
Implement Wallet Security feature - Auto Logout checkbox
 2018-08-23 18:04:38 -07:00
luiscuenca
1fd0d7da94 Create API call 2018-08-23 18:03:27 -07:00
John Conklin II
bc90d1a439
Merge pull request #13869 from zfox23/MS17738_fixBlastIcon 
Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review
 2018-08-23 17:40:24 -07:00
amantley
671bf32d58 removed whitespace 2018-08-23 17:36:35 -07:00
amantley
884be2f99d removed comment and whitespace 2018-08-23 17:30:03 -07:00
amantley
0cc302f68c set phase to 0.0 2018-08-23 17:28:38 -07:00
Zach Fox
dc1a33ba6e Merge branch 'master' of github.com:highfidelity/hifi into wallet_autologout 2018-08-23 16:58:49 -07:00
Howard Stearns
fe3f48b194
Merge pull request #13859 from howard-stearns/wallet-locker2 
Wallet Locker
 2018-08-23 16:54:19 -07:00
Stephen Birarda
1263db5688 force NL reset if the domain changes session ID or local ID 2018-08-23 16:48:46 -07:00
amantley
220dbf586f set the phase to 0.0 when it is negative 2018-08-23 16:46:58 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Stephen Birarda
6ab3f83be0
Merge pull request #13868 from birarda/feat/avatar-traits 
fix traits re-send after node unignored, agent crash
 2018-08-23 15:53:16 -07:00
luiscuenca
3d959ca7ee Refactoring and cleaning 2018-08-23 15:52:42 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
a1d88a8588 Merge howard/wallet-locker2 into my branch 2018-08-23 14:45:16 -07:00
Stephen Birarda
e1879bf26a add assignment dynamic factory to ESS 2018-08-23 13:55:17 -07:00
Stephen Birarda
09065cf19a provide assignment dynamic factory to agent 2018-08-23 13:31:18 -07:00
Stephen Birarda
36784b0039 reset sent trait data when re-send required 2018-08-23 13:31:18 -07:00