Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 15:16:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66946 commits 6 branches 1 tag 1.1 GiB
Commit graph

27629 commits

Author SHA1 Message Date
David Rowe
8d25a745f0 Fix Controller.getActions(), .getHardware(), and .getStandard() 2018-04-06 17:21:49 +12:00
SamGondelman
44ea5a2e84 add etc2/eac support 2018-04-05 18:59:22 -07:00
Seth Alves
8de545acdf add new address accessor for 'public' addresses, use it for snapshot and stream 2018-04-05 13:39:51 -07:00
Seth Alves
148007435e update comment 2018-04-05 13:01:31 -07:00
Seth Alves
1de878eb9c fix logic 2018-04-05 12:43:03 -07:00
Seth Alves
81ba875ad2 currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version 2018-04-05 12:39:49 -07:00
Gabriel Calero
0da2c972e3 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-05 16:22:56 -03:00
Ryan Huffman
010356709d Remove lock file recovery in entity server 
* We no longer make backups at the ES, so there is no backup to
  recover from if we crash during persist to disk.
  * When loading the most recent backup we look for files that match our
  backup rules. If we have no backup rules we end up grabbing
  everything.
  * Because we grab everything, we are at risk of grabbing the lock file
  and treating it as a backup. In the case where we crash on persist, we
  end up replacing the models.json.gz file with the lock file (!!).

This commit makes a small change to not do the recovery on startup. In a
future update we will remove the backup-related code on the ES
altogether.
 2018-04-05 11:52:31 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003 
cleanup around simulation-ownership
 2018-04-05 10:58:45 -07:00
samcake
78053b8b48 Refix the normal map case foro translucents 2018-04-04 18:33:27 -07:00
Simon Walton
f10bbce557 Squelch initialization warning 2018-04-04 18:32:40 -07:00
Simon Walton
93bcd1df20 Fix Linux build for std::call_once with lambda 
MacOS & Ubuntu don't like the combination of std::call_once and
lambda w/ reference param, for some reason. Change to pointer
param.
 2018-04-04 17:55:45 -07:00
Cristian Luis Duarte
1a967e45a6 Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity 2018-04-04 21:54:12 -03:00
Simon Walton
a370d287c3 Change AudioRingBuffer.cpp to use std::call_once 2018-04-04 16:42:10 -07:00
Simon Walton
d05f0600d4 Handle one-time messages outside LogHandler class 
Also change to std::call_once for the file-scope message IDs.
 2018-04-04 15:44:47 -07:00
Gabriel Calero
15163f5e87 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 19:25:20 -03:00
Atlante45
895023ca4b Fix unprotected tree traversals 2018-04-04 14:54:21 -07:00
Simon Walton
ce5f6da6ca Restore setup of flush timer that was inadvertently lost 2018-04-04 14:43:26 -07:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade 
Update to Transitions debugging / editing script
 2018-04-04 14:31:59 -07:00
Cristian Luis Duarte
b61a436a84 Android fly - Use new asset and screen position - missing cpp 2018-04-04 18:23:03 -03:00
Cristian Luis Duarte
ffb8b0a60e Android fly - Use new asset and screen position 2018-04-04 18:19:01 -03:00
Simon Walton
ed3347a89b Repeated logging - reviewer fixes 2018-04-04 14:11:10 -07:00
Seth Alves
2545e67b14 set lastEditedBy in local tree whenever a script adds or edits an entity 2018-04-04 12:27:41 -07:00
Ryan Huffman
2546ff91ca Fix nodelist connections not resetting on both ends 
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
 2018-04-04 11:53:05 -07:00
Dante Ruiz
09ced24710 hide desktop windows when switching into HMD mode 2018-04-04 11:05:25 -07:00
Stephen Birarda
3a8c9de4fb fix some xcode warnings for unnecessary captured this 2018-04-04 10:38:32 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Gabriel Calero
ddbf4417ff Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-04 12:24:25 -03:00
Seth Alves
db82c464eb
Merge pull request #12741 from ctrlaltdavid/21816 
Remove Entities.currentAvatarEnergy and related from the API
 2018-04-04 08:07:46 -07:00
Olivier Prat
e3908662fe Merge branch 'master' of http://github.com/highfidelity/hifi into zeye 2018-04-04 09:50:37 +02:00
Andrew Meadows
f0fcfc432c fix typo in comment 2018-04-03 22:16:10 -07:00
Andrew Meadows
d57cb0b5d7 use list.empty() instead of comparing list.size() 2018-04-03 22:15:57 -07:00
Andrew Meadows
6d7574cab9 use std::numeric_limtis<uint64_t>::max() instead of -1 2018-04-03 22:13:25 -07:00
Andrew Meadows
70d6aa99e8 more 'const uint64_t&' purges 2018-04-03 21:55:31 -07:00
Andrew Meadows
bd2bfb6807 DRY: simpler removal of element from middle of std::vector 2018-04-03 18:28:07 -07:00
Andrew Meadows
0a2b4a8d1d add comment about returning smart pointer by ref 2018-04-03 18:26:43 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Anthony Thibault
00bec7310e
Merge pull request #12731 from hyperlogic/feature/log-exceptions-in-controller-js 
JavaScript exceptions during Controller system callbacks are now logged
 2018-04-03 16:22:44 -07:00
Cristian Luis Duarte
88c83f3bfe Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 19:59:21 -03:00
Simon Walton
d4ab06b1d4 Move HIFI_FDEBUG macro to LogHandler.h 
Not all uses of repeated log messages include NetworkLogging.h,
but if they use addRepeatedMessageRegex() they must include
LogHandler.h. Also add second macro for client-supplied
message ID.
 2018-04-03 15:53:12 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
David Rowe
a3c8b2792d Fix Window.geometryChanged() values for moving and resizing window 2018-04-04 09:42:05 +12:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline 
fix ContextOverlayInferface highlighing unspecified entities.
 2018-04-03 12:29:19 -07:00
Simon Walton
5b0bcd76e3 Repeated logging - Fixes and clean-up 2018-04-03 12:23:21 -07:00
Cristian Luis Duarte
cbf13c9f8c Merge remote-tracking branch 'hifi/master' into android_jump 2018-04-03 16:12:17 -03:00
Cristian Luis Duarte
1ea056a8a9 Android - Initial Jump button implementation 2018-04-03 16:07:40 -03:00
Simon Walton
a7fc6a2991 Repeated logs - use #define to replace qCDebug 2018-04-03 10:44:53 -07:00
Gabriel Calero
78c50410b3 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-04-03 14:37:19 -03:00
Olivier Prat
01cba0c591 Merge branch 'master' of http://github.com/highfidelity/hifi into zeye 2018-04-03 08:03:35 +02:00
Simon Walton
6d078f41e7 Use unique IDs for log strings that should have repeats supressed 2018-04-02 17:32:18 -07:00
Seth Alves
71d6dbf9bf allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree 2018-04-02 15:52:28 -07:00
David Rowe
ab8ee20960 Add Controller.Actions.Sprint as synonym of Controller.Actions.SPRINT 2018-04-03 10:00:19 +12:00
Brad Davis
14ea168ab3 Merge remote-tracking branch 'upstream/master' into bindless 2018-04-02 13:13:28 -07:00
Anthony Thibault
dc9c9fd0ee
Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping 
Reduce avatar elbow fluttering by disabling pole vectors
 2018-04-02 10:51:28 -07:00
Simon Walton
2ba64e1115 LocalID - Use tbb hash map instead of std one for better concurrency 2018-04-02 10:46:38 -07:00
Simon Walton
f4bd1f5ed7 Add definition for NetworkPeer::NULL_LOCAL_ID to (hopefully) satisfy MacOS 2018-04-02 09:45:46 -07:00
Simon Walton
efb1fdbc0d Local IDs - add an explicit null value, use it for replicated packets 2018-03-30 18:29:26 -07:00
Simon Walton
734b48eee0 Local IDs - Reviewer's suggested improvements 2018-03-30 17:27:52 -07:00
Andrew Meadows
59abc1d5b5 DRY sendBid() and sendUpdate() 2018-03-30 17:04:31 -07:00
Sam Gateau
8178ee7f34 Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror 2018-03-30 17:00:11 -07:00
Sam Gateau
d5496d68fd FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly 2018-03-30 16:58:41 -07:00
Andrew Meadows
766077204e fix typo inside assert() 2018-03-30 16:35:16 -07:00
Dante Ruiz
c99676b510 atlernate fix for selected entities 2018-03-30 13:44:54 -07:00
Andrew Meadows
a924bd4eb0 set correct _bidPriority on first ownership update 2018-03-30 13:18:32 -07:00
Andrew Meadows
5a5376c3d5 untangle 'bidding' from 'owned' 2018-03-30 13:18:32 -07:00
Andrew Meadows
170ec83870 remove unnecessary assert 2018-03-30 13:18:32 -07:00
Andrew Meadows
eb07f6732f add reminder comment 2018-03-30 13:18:32 -07:00
Andrew Meadows
49dce6fa1a remove some redundancy checks 
no need to assert(_entity) : guaranteed by ctor and dtor logic
moved some checks around to avoid redundant work
 2018-03-30 13:18:32 -07:00
Andrew Meadows
dcf5110caa clarify hardcoded constant 2018-03-30 13:18:32 -07:00
Andrew Meadows
4e0f307dc0 quint8 --> uint8_t 2018-03-30 13:18:32 -07:00
Andrew Meadows
d6ac294f39 use uint8_t instead of quint8 2018-03-30 13:18:32 -07:00
Andrew Meadows
4501033861 add description of simulation ownership rules 2018-03-30 13:18:32 -07:00
Andrew Meadows
2be0f0fa22 better comments 2018-03-30 13:18:32 -07:00
Andrew Meadows
c61a226bb5 delete default EntityMotionState ctor 2018-03-30 13:18:32 -07:00
Andrew Meadows
73fa6d3d2f slightly simpler EntityMotionState delete logic 2018-03-30 13:18:32 -07:00
Andrew Meadows
6746e08206 faster EntitySimulation::takeDeadEntities() 2018-03-30 13:18:32 -07:00
Andrew Meadows
e1d2a5e5f3 more cleanup for deleting entities 2018-03-30 13:18:32 -07:00
Andrew Meadows
5854a36ff7 more correct handling of simulated entity 2018-03-30 13:18:32 -07:00
Andrew Meadows
a05c753e03 only process changed entities when simulated 2018-03-30 13:18:32 -07:00
Andrew Meadows
738e1267ab small optimization in EntitySimulation::changeEntity() 2018-03-30 13:18:32 -07:00
Andrew Meadows
f20c9d3c5b EntitySimulation::removeEntityInternal isn't pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
0596497930 more correct comments 2018-03-30 13:18:32 -07:00
Andrew Meadows
5649748b17 make EntitySimulation::changeEntityInternal() pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
bd434e3f18 make EntitySimulation::addEntityInternal() pure virtual 2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad move entityCollisionWithEntity to PhysicalEntitySimulation 2018-03-30 13:18:32 -07:00
John Conklin II
8c8400947f
Merge pull request #12745 from SamGondelman/shadow 
RC66: Fix shadows on primitives
 2018-03-30 12:52:08 -07:00
Gabriel Calero
b123b67134 Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash 2018-03-30 15:38:36 -03:00
SamGondelman
5a7e9d8e3e fix shadows on primitives 2018-03-30 09:48:04 -07:00
Brad Davis
440c01ae05 Merge remote-tracking branch 'upstream/master' into bindless 2018-03-30 09:29:35 -07:00
Olivier Prat
02cf15d115 Lightclusters no unpack position from zdb 2018-03-30 10:06:27 -04:00
John Conklin II
5013760aa1
Merge pull request #12742 from jherico/fix/rc66_crashes 
Fix/rc66 crashes
 2018-03-29 18:04:52 -07:00
Olivier Prat
6f7a1eaefa Fixed correct inverse projection matrix when computing from Zeye 2018-03-29 18:05:43 -04:00
Simon Walton
e9ec4df36f Gcc complained about superfluous const qualifier 2018-03-29 14:10:31 -07:00
Olivier Prat
bd0e13463d Fix on unpackDeferredPosition 2018-03-29 17:06:23 -04:00
David Rowe
7027ccb6d8 Remove unused code 2018-03-30 09:35:25 +13:00
Olivier Prat
5f8693aae2 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 15:52:38 -04:00
David Rowe
3b90078097 Remove Entities.currentAvatarEnergy and related from the API 2018-03-30 08:36:18 +13:00
John Conklin II
a76b4b1008
Merge pull request #12734 from samcake/RC66-fetchMetaItem 
RC66: Add an extra sanity check when calling fetchMetaSubItemBounds
 2018-03-29 11:05:08 -07:00
Simon Walton
1b0b280f3a Fix SequenceNumberStats, misc. clean-up 2018-03-29 10:47:11 -07:00
SamGondelman
afe39aba46 fix octal code char issue 2018-03-29 10:05:08 -07:00
John Conklin II
97d9c1b735
Merge pull request #12726 from jherico/fix/rc66_crashes 
Attempt to resolve potential overlay crashes at shutdown
 2018-03-29 09:37:23 -07:00
Olivier Prat
3c8cd48dfb Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-29 07:21:01 -04:00
Simon Walton
b409e04734 Handle all case of nodes being deleted from nodelist 
Delete erased nodes from local ID mapping, as this uses
SharedPointer. Don't keep the mapping from local IDs
to UUIDs in GateKeeper as it isn't used.
 2018-03-28 17:42:23 -07:00
samcake
2ee0af03c8 Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet 2018-03-28 16:17:55 -07:00
Cristian Luis Duarte
fe9481b28d Cleanup code, comment out log, simplify radar is valid touch code (no more flag) 2018-03-28 19:50:44 -03:00
Anthony J. Thibault
ca3fe28b05 JavaScript exceptions during Controller system callbacks are now logged 
(cherry picked from commit d3aec12e9e76e4aeb8ecbd449cc76afda1a0e35d)
 2018-03-28 14:01:21 -07:00
Olivier Prat
e4416db06f Added save/file dialog for transition configurations in transition editor 2018-03-28 16:54:53 -04:00
Simon Walton
f823f63211 Add domain local ID to DomainServerList 
Also handle domain local ID for 'domain sourced' packets;
bump packet version.
 2018-03-28 13:27:43 -07:00
Cristian Luis Duarte
f0bcaa47c8 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-28 16:47:21 -03:00
Brad Davis
9be162de95 Synchronously shut down QML rendering threads 2018-03-28 09:13:46 -07:00
Olivier Prat
7fa5e384b9 Merge branch 'master' of http://github.com/highfidelity/hifi into fade 2018-03-28 11:21:07 -04:00
Seth Alves
46fb2033f2
Merge pull request #12574 from druiz17/remap-keybaord 
changing keyboard mapping
 2018-03-27 19:00:05 -07:00
Simon Walton
bed4033554 Local node IDs now working correctly 
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
 2018-03-27 18:18:14 -07:00
David Rowe
1bcb9738f0 Miscellaneous fixes noticed in passing 2018-03-28 12:26:08 +13:00
David Rowe
b35ee5ce8a Fix JSDoc links to Vec3 constants 2018-03-28 12:25:49 +13:00
David Rowe
f27e8868eb Add HMD JSDoc 2018-03-28 12:25:12 +13:00
Simon Walton
d3464378b7 Short local source IDs - checkpoint 
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
 2018-03-27 13:46:58 -07:00
Gabriel Calero
3fc78da1f5 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-26 19:51:34 -03:00
Simon Walton
4ec77e3af6 WIP - assign short IDs to nodes and distribute them. 2018-03-26 14:57:59 -07:00
Seth Alves
6948de7e24 default to serverless tutorial 2018-03-26 14:32:40 -07:00
Gabriel Calero
0068e5dc0f Fix account info persistence after login 2018-03-26 14:56:05 -03:00
Dante Ruiz
b8796db1e5 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-26 09:13:58 -07:00
Cristian Luis Duarte
6cb5cd7f92 Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera 2018-03-26 11:19:42 -03:00
Simon Walton
b5f165d481 Store a short ID with the Node on the domain-server side 2018-03-23 16:55:19 -07:00
Cristian Luis Duarte
242b009562 Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events. 2018-03-23 18:59:55 -03:00
SamGondelman
a19f71e759 fix tonemapping on android 2018-03-23 14:16:47 -07:00
Gabriel Calero
8558759d41 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-23 16:56:53 -03:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android 
Android: Stats, disable IK, reduce impact of InputRecorder
 2018-03-23 11:08:50 -07:00
John Conklin II
0bc23456c3
Merge pull request #12682 from ctrlaltdavid/21807 
JSDoc that an entity's clientOnly property can be set at entity creation
 2018-03-22 17:55:45 -07:00
Dante Ruiz
4d52caccde making some more requested changes 2018-03-22 17:39:22 -07:00
Dante Ruiz
1d17658c80 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-22 16:29:16 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
Simon Walton
68ab0eed68 HMACAuth - fix some more spacing issue 2018-03-22 14:44:25 -07:00
John Conklin II
6d9892856d
Merge pull request #12510 from sethalves/serverless-domains 
Serverless domains
 2018-03-22 14:06:49 -07:00
Stephen Birarda
e8bea3a611
Merge pull request #12369 from simon-walton/BugFix 
Lexer code has confusion between strings and chars
 2018-03-22 12:03:47 -07:00
Gabriel Calero
f444766551 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-22 15:15:50 -03:00
Sam Gondelman
e46a8f022c
Merge pull request #12695 from gcalero/fix/current_context 
Fix/current context
 2018-03-22 10:54:34 -07:00
Dante Ruiz
cea0f98aae reverting files 2018-03-22 09:20:27 -07:00
Dante Ruiz
f5a954d08e Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-22 09:06:42 -07:00
Gabriel Calero
12b289bbc1 Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread 2018-03-22 12:38:56 -03:00
Simon Walton
10f3032746 Compare QString w/ char*, not char 2018-03-21 23:09:46 -07:00
Brad Davis
0e7ee95c95 Merge remote-tracking branch 'upstream/master' into bindless 2018-03-21 19:16:55 -07:00
Brad Davis
3b5948ad85 Merge branch 'gl_common' into bindless 2018-03-21 19:16:34 -07:00
Seth Alves
b551b144a7 remove unneeded setIsConnected call 2018-03-21 19:15:27 -07:00
Simon Walton
3e1a333776 Just bump default packet version 2018-03-21 18:40:54 -07:00
Simon Walton
16b0c48b73 HMACAuth - improved syntax for new 2018-03-21 18:32:25 -07:00
Simon Walton
29b4353397 Spacing clean-up 2018-03-21 18:26:32 -07:00
Simon Walton
d58b2acc8c Use raw pointer for possibly-opaque openssl context type 2018-03-21 18:25:26 -07:00
Simon Walton
3ced1c8923 More Openssl 1.1 (Android) fixes 2018-03-21 17:31:54 -07:00
Simon Walton
ef08770235 Missed reviewer change 2018-03-21 17:17:24 -07:00
Simon Walton
755d89464f HMAC Auth - reviewer-requested changes 2018-03-21 17:15:49 -07:00
Simon Walton
64973aa334 OpenSSL HMAC changes for Android 
Looks like Android uses OpenSSL 1.1.0, which provides
an allocator for its HMAC context.
 2018-03-21 17:06:15 -07:00
Seth Alves
4f20a87c6d review 2018-03-21 16:26:02 -07:00
Seth Alves
916ed3a0d4 review 2018-03-21 16:18:31 -07:00
Brad Davis
d529d7b1d3 Remove whitespace before shader version line 2018-03-21 16:07:04 -07:00
Seth Alves
ae94ab3d67 make sure _sockAddr is cleared if the new url isn't a hifi:// one 2018-03-21 15:28:12 -07:00
Simon Walton
fb16e772ba Move HMACAuth class to networking lib 
Also reverts addition of openssl headers to shared lib.
Commit will require rerunning cmake.
 2018-03-21 15:25:50 -07:00
Simon Walton
adbb2400ab HMAC Auth - add openssl to cmake file for lib shared 2018-03-21 14:58:14 -07:00
Seth Alves
bea7ee42e2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 14:30:07 -07:00
Seth Alves
ef52ae13ee rearrange domain-url-changed signals 2018-03-21 14:30:00 -07:00
Simon Walton
eb04f77c3d HMAC Auth - code modifications requested by reviewer 2018-03-21 14:04:34 -07:00
Gabriel Calero
35935ed41a Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-03-21 17:41:02 -03:00
Gabriel Calero
11bfc1ca74 Add Goto as splash screen in android 2018-03-21 17:40:14 -03:00
Brad Davis
ae8df7e24e Merge remote-tracking branch 'origin/gl_common' into HEAD 2018-03-21 12:35:17 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex 
Materials on primitives
 2018-03-21 12:08:24 -07:00
John Conklin II
283aff71ec
Merge pull request #12612 from jherico/gl_common 
Break out common GL and GLES code into a single shared library
 2018-03-21 11:28:24 -07:00
Seth Alves
4033af9b11 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-21 11:11:43 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776 
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
 2018-03-21 09:27:51 -07:00
Dante Ruiz
86cd5ffa30 Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord 2018-03-21 08:49:25 -07:00
Bradley Austin Davis
d5d8e4c0b0 Restoring geometry shader 2018-03-20 18:28:53 -07:00
Simon Walton
8ce03d65b7 Only update the connection secret UUID if it changes 
Rekeying the openssl HMAC context occasionally causes
hash generation errors. It is not clear why. The Node
secret never seems to change to check for this before
rekeying. Also other clean-up for PR.
 2018-03-20 18:16:45 -07:00
Anthony J. Thibault
f19b1d9890 Fix for character walk animations in desktop mode. 2018-03-20 18:12:55 -07:00
Olivier Prat
6b44d79f90 Proposal to improve fade editing with some extra visual cues 2018-03-20 17:48:41 -07:00
Olivier Prat
143a315f1d Fade edited objects are now selected with ray picking 2018-03-20 15:29:50 -07:00
Sam Gateau
a7533e5287
Merge pull request #12675 from SamGondelman/hotfix 
Model behaves correctly if missing material
 2018-03-20 14:27:21 -07:00
Sam Gateau
e59eed64fb
Merge pull request #12680 from SamGondelman/relative 
Support relative paths for material images
 2018-03-20 14:24:50 -07:00
Bradley Austin Davis
a861be112f Fix GLES build 2018-03-20 14:15:38 -07:00
Stephen Birarda
0074c0470d
Merge pull request #12524 from birarda/feat/runtime-beside-exe 
switch back to app-local VC runtimes and UCRT
 2018-03-20 14:07:27 -07:00
John Conklin II
de5ff20968
Merge pull request #12664 from gcalero/android_websurface_check_nocrash 
Android - Prevent crash when setting the url property to _webSurface.
 2018-03-20 11:40:08 -07:00
Seth Alves
585a523823 unmangle merge 2018-03-20 11:17:56 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload 
Add support for .content.zip content uploads
 2018-03-20 10:07:53 -07:00
Brad Davis
f77228bbfe Fixing missing m_pi define 2018-03-20 09:58:47 -07:00
Brad Davis
659da9b0e4 Merge remote-tracking branch 'upstream/master' into gl_common 2018-03-20 09:18:56 -07:00
Anthony J. Thibault
69f462baeb Disable elbow pole vectors, solve from joint limit centers. 2018-03-19 18:53:00 -07:00
Simon Walton
2a486a4c14 Bump packet version numbers 2018-03-19 17:48:11 -07:00
Simon Walton
020a6a6585 Take out hash timing code 2018-03-19 15:57:32 -07:00
Simon Walton
da7298b8bd Support only HMAC - take out passing around of secret UUID 
Also other clean-up for production use.
 2018-03-19 15:28:44 -07:00
Seth Alves
f61504b814 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-19 14:59:18 -07:00
Seth Alves
bc527d5ae8 try again on expandToLocalDataAbsolutePath 2018-03-19 14:59:10 -07:00
John Conklin II
91db0ab00f
Merge pull request #12650 from ctrlaltdavid/21798 
Messages API JSDoc
 2018-03-19 13:56:57 -07:00
David Rowe
541d798a6b Update code comment 2018-03-20 09:53:57 +13:00
David Rowe
4b52c21d1c JSDoc that an entity's clientOnly property can be set at entity creation 2018-03-20 09:51:10 +13:00
Seth Alves
a623ba7499 expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url 2018-03-19 13:48:31 -07:00
Simon Walton
af21cac0c2 Fixes for gcc 2018-03-19 12:53:16 -07:00
Cristian Luis Duarte
17fddd9e0e RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface 2018-03-19 15:33:14 -03:00
SamGondelman
8ddf360c79 support relative paths for material images 2018-03-19 09:59:11 -07:00
Seth Alves
af42b5e93f trying to fix expandToLocalDataAbsolutePath 2018-03-19 09:42:03 -07:00
Simon Walton
d889384d94 Use elaborated type-specifier for openssl internal class 2018-03-19 09:41:57 -07:00
Seth Alves
a4599fe7ce Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 20:07:35 -07:00
Seth Alves
a144b738e5 fix ACs 2018-03-16 22:39:43 -04:00