Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 05:50:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67870 commits 25 branches 0 tags 1.1 GiB
Commit graph

28034 commits

Author SHA1 Message Date
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -07:00
Thijs Wenker
7f4e9a0089 style 2018-05-21 06:17:08 +02:00
Thijs Wenker
f4df75d016 CR feedback 2018-05-21 06:04:05 +02:00
Livi Erickson
70bbac5c83 update with lastEditedCheck 2018-05-20 18:49:41 -07:00
Livi Erickson
9f7b383757 address CR feedback 2018-05-20 18:22:17 -07:00
Livi Erickson
9c0084209b fix style error, start lifetime properly for cloned entities 2018-05-20 16:41:14 -07:00
Liv Erickson
6c8d68afc6 add extra cleanup in delete messages and simulation, as a fall back 2018-05-18 18:18:42 -07:00
Liv Erickson
29b11b9101 some fixes to server cloneables 2018-05-18 17:12:41 -07:00
Liv Erickson
de05388ebf Merge branch 'master' of github.com:highfidelity/hifi into clone-server 2018-05-18 10:42:26 -07:00
Brad Davis
3356486f27 Fix populated texture size tracking 2018-05-18 09:23:54 -07:00
Brad Davis
91f1d93d4e Fix flicker while transferring texture data 2018-05-18 09:23:54 -07:00
Brad Davis
ae07036f20 Add ideal resource texture memory stat 2018-05-18 09:23:53 -07:00
Brad Davis
fb81cf927a Faster texture transfers 2018-05-18 09:21:02 -07:00
Liv
40ff3f966f
Merge pull request #13165 from ctrlaltdavid/21872-b 
JSDoc stubs for various APIs
 2018-05-18 09:11:55 -07:00
David Back
4e14eb37e3 update comment 2018-05-17 16:34:19 -07:00
David Back
30855f94eb set last edited to 0 to ensure server update 2018-05-17 16:02:58 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
David Back
26b6b851f5 Merge branch 'cloneables' of github.com:dback2/hifi into cloneables 2018-05-17 14:50:39 -07:00
David Back
b8ce07744d initialize prop defaults, no bool returns 2018-05-17 14:50:14 -07:00
David Rowe
33ba559bb4 Show all OverlayWebWindows properties and functions together 2018-05-18 08:02:02 +12:00
David Rowe
2669a39e0f Deprecate Agent API items that shouldn't be exposed in the API 2018-05-18 07:32:25 +12:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00
Liv Erickson
ec8aa71dc4 Add JSDoc header to new clone function in Entity API 2018-05-17 11:25:20 -07:00
David Back
42d8492427 no clock skew 2018-05-17 11:17:04 -07:00
David Back
3730cbe36c reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable 2018-05-17 10:28:48 -07:00
David Back
900b373c96 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-17 09:04:28 -07:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
David Rowe
145d73aa76 OverlayWebWindow JSDoc fixes 2018-05-17 19:18:00 +12:00
John Conklin II
4ce4afe0b1
Merge pull request #13180 from Cristo86/android_no_joystick_fix 
Fix Joystick/Control not showing up in Samsung after typing address (Android)
 2018-05-16 15:41:24 -07:00
samcake
adc8a07d3c Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn 2018-05-16 13:14:14 -07:00
samcake
21e069c90c Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa 2018-05-16 13:09:55 -07:00
David Back
6484c866f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-16 11:35:34 -07:00
Sam Gateau
523d57d948
Merge pull request #13162 from AndrewMeadows/avatar-collisions 
avatars collide again
 2018-05-16 09:25:05 -07:00
Cristian Luis Duarte
b5e8adfc39 Use availableSize() to get screen size instead of size() as it returns a wrong screen size on some Samsung devices (misplacing controls that are relative to screen size) 2018-05-16 12:53:39 -03:00
Gabriel Calero
5afc9c6df3 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-16 12:45:17 -03:00
David Back
1e2d2819d5 tweaks 2018-05-15 17:36:39 -07:00
David Back
f8fc7bedd7 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 17:31:43 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
samcake
179801dab6 FIxing the transparent ambient lighting bug 2018-05-15 17:22:28 -07:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto 
Android Search & Go To
 2018-05-15 16:43:38 -07:00
David Rowe
f571e90ef5 Merge branch 'master' into 21872-b 2018-05-16 10:20:53 +12:00
David Rowe
f629022b8c AvatarList API JSDoc stubs 2018-05-16 10:16:13 +12:00
David Rowe
fdeb0e3305 Avatar API JSDoc stubs 2018-05-16 09:20:54 +12:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
John Conklin II
ce1231910c
Merge pull request #13140 from Cristo86/android_avatar_name 
@SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.
 2018-05-15 13:22:15 -07:00
Gabriel Calero
306b8cc68a Set HomeActivity transparent to avoid texture corruption (black and white) 2018-05-15 15:14:17 -03:00
David Back
623410a0aa Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 09:53:24 -07:00
Olivier Prat
d10b5a16f2 Turned off jitter with FXAA 2018-05-15 15:09:02 +02:00
Olivier Prat
bed7752a1a Fixed bug with highlighting and TAA 2018-05-15 12:27:04 +02:00