Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-06 01:50:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66534 commits 6 branches 1 tag 1.1 GiB
Commit graph

27502 commits

Author SHA1 Message Date
samcake
34426bb033 FIxing the compilation on windows with math constants 2018-04-06 12:17:51 -07:00
Andrew Meadows
a9f5b57681 merge 'master' into 'workload-010' 2018-04-06 11:11:06 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66 
Merge back RC66 to master
 2018-04-06 10:43:01 -07:00
John Conklin II
c8d109854b
Merge pull request #12800 from huffman/fix/entity-lock 
Remove lock file recovery in entity server
 2018-04-06 10:04:34 -07:00
Andrew Meadows
ed1761945c add/remove entities to physics using workload output 2018-04-06 07:22:05 -07:00
Andrew Meadows
b96a4ed4be add Space::getRegion(id) 2018-04-06 07:20:53 -07:00
samcake
a5ee211dbf Dirty attempt to capture the owner typefor a payload 2018-04-05 18:04:35 -07:00
samcake
c5b88d55ab Spliting the creation of the Workload engine from the setup and configuration, changing the output from region tracker 2018-04-05 16:05:40 -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
Andrew Meadows
4f0980b94b hook up prototype PhysicsBoundary job 2018-04-05 12:11:57 -07:00
Andrew Meadows
299f2a92e0 merge 'master' into 'workload' 2018-04-05 12:01:19 -07: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
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
samcake
a704085444 Fix typos 2018-04-04 09:18:19 -07: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
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
samcake
88a5105b81 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-04-03 18:00:16 -07:00
samcake
fa35d659dc Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload 2018-04-03 17:56:41 -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
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66 
RC66 mergeback
 2018-04-03 15:39:16 -07:00
samcake
efd2b2720b Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-03 12:46:10 -07: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
Sam Gateau
2afd5f9813 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-02 19:11:02 -07:00
samcake
54e2ad06b8 GOing over the jet lib ui and the nightmare that is the js/qml family 2018-04-02 17:59:28 -07: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
Sam Gateau
dada0b9024 Exploring better task job config api that work 2018-04-02 01:09:35 -07:00
samcake
59a081bcdb merge with upstream 2018-03-30 18:08:38 -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