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

27460 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
2bbffff22f Fixing typos 2015-07-06 10:22:25 -07:00
Sam Gateau
e3c06a30a1 removing dead code 2015-07-02 19:29:09 -07:00
samcake
f9562bedd9 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 18:14:45 -07:00
Sam Gateau
76ca093e05 something working ? 2015-07-02 18:12:03 -07:00
Stephen Birarda
812b18c74e Merge pull request #5205 from SeijiEmery/unit-tests 
Unit tests
 2015-07-02 20:58:09 -04:00
Seiji Emery
16e7af1848 Reverted macro naming convention 2015-07-02 17:41:38 -07:00
samcake
0c55130548 maybe i have solved the passing of the status 2015-07-02 17:31:29 -07:00
Seiji Emery
1fc1c7c794 PR Fixes 2015-07-02 17:29:08 -07:00
Seiji Emery
28543c0bf2 PR Fixes 2015-07-02 17:27:00 -07:00
Seiji Emery
7ba03418fc PR Fixes 2015-07-02 17:24:03 -07:00
Sam Gateau
dcd61fd417 improvment ? 2015-07-02 16:13:54 -07:00
Sam Gateau
79be37f78f improvment ? 2015-07-02 16:00:56 -07:00
Sam Gateau
bf052162bb improvment ? 2015-07-02 15:53:02 -07:00
Sam Gateau
8d8a902328 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338 Trying to finalize the look and behavior of th estatus indicators 2015-07-02 15:06:07 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
Clément Brisset
66fa1f5422 Merge pull request #5255 from murillodigital/master 
Don't display update dialog if this is a PR build
 2015-07-02 13:34:52 -07:00
Leonardo Murillo
9440546619 Don't display update dialog if this is a PR build 2015-07-02 14:17:36 -06:00
Brad Hefta-Gaub
b11172affb Merge pull request #5254 from jherico/timing_menu_log 
Inhibiting log spam unless a menu item is selected
 2015-07-02 12:48:01 -07:00
Brad Davis
d5fe6f0bdb Inhibiting log spam unless a menu item is selected 2015-07-02 12:34:32 -07:00
Philip Rosedale
fba569d7db Merge pull request #5218 from huffman/fix-hmd-displayname-orientation 
Fix avatar displayname to point towards camera
 2015-07-02 12:19:40 -07:00
samcake
faea97d3c7 Merge pull request #5221 from Atlante45/web 
Fix Web entities
 2015-07-02 10:45:20 -07:00
Clément Brisset
b616fff222 Merge pull request #5220 from howard-stearns/avatar-collision-sounds 
Avatar collision sounds
 2015-07-02 10:27:24 -07:00
Philip Rosedale
0905962d90 Merge pull request #5251 from ctrlaltdavid/20600 
Fix Show Eye Focus and Show Look-at Vectors
 2015-07-02 09:16:20 -07:00
Brad Hefta-Gaub
f16b8d5083 Merge pull request #5246 from jherico/inter_idle_timing 
Instrument the inter-idle time and tweaking the timeout setting
 2015-07-02 09:01:44 -07:00
Howard Stearns
1f3a1f6ac8 Add comments re upcoming physics changes. 2015-07-02 10:07:14 -05:00
Howard Stearns
d0675c7f22 Side-effect new value before emit. 2015-07-02 09:56:02 -05:00
David Rowe
925fd71262 Fix rendering of look-at vectors 2015-07-01 22:45:47 -07:00
David Rowe
0df9ebeda3 Fix rendering of look-at avatar sphere 
postLighting is never true.
 2015-07-01 22:45:13 -07:00
Seth Alves
b19d505fc1 remove stray debug print 2015-07-01 20:32:45 -07:00
Seth Alves
246861221c rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready. 2015-07-01 20:17:21 -07:00
Sam Gateau
d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-07-01 18:12:11 -07:00
samcake
3564499824 Merge pull request #5249 from ZappoMan/entityServerEditStats 
add more detailed edit timing to entity server
 2015-07-01 18:11:19 -07:00
Niraj Venkat
23979cce8f Merge branch 'yellow' of https://github.com/samcake/hifi into stats 2015-07-01 17:31:15 -07:00
Niraj Venkat
ee998d0c74 Icon size is a pixel if the inStatus is -1 2015-07-01 17:30:50 -07:00
Sam Gateau
e8b11f1198 Exposing the display Item Status to js to turn it on/off 2015-07-01 17:27:41 -07:00
Brad Hefta-Gaub
bfd72a89af Merge pull request #5250 from jherico/animation_perf_tester 
Animation performance test script
 2015-07-01 17:24:59 -07:00
Brad Davis
566842389b Animation performance test script 2015-07-01 17:04:48 -07:00
Brad Davis
88a733181e Fixing comment to reflect code 2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01 CR comments and fixing the microsecond display 2015-07-01 16:53:12 -07:00
Niraj Venkat
219bcd19ed Status bar update 2015-07-01 16:40:42 -07:00
Brad Davis
59027959b8 CR comments and fixing the average calculation 2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29 Merge pull request #5247 from ericrius1/handRender 
Fixed broken rendering of hydra visualization paraphernalia
 2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09 Instrument the inter-idle time and tweaking the timeout setting 2015-07-01 16:14:17 -07:00
Brad Hefta-Gaub
b4f04af66f Merge pull request #5242 from jherico/packet_processing 
Eliminate per-packet locking for processing
 2015-07-01 16:11:27 -07:00
ZappoMan
24b4614703 add more detailed edit timing to entity server 2015-07-01 16:11:08 -07:00
ericrius1
a24df5c02f added postLighting check back for rendering avatar Hands 2015-07-01 15:28:48 -07:00
ericrius1
f49f368ec3 removed dead commented out code 2015-07-01 15:16:34 -07:00
ericrius1
50a7332a5a removed accidental lineRotations.js file commit 2015-07-01 15:14:53 -07:00
ericrius1
8129d0eb1f hydra lasers are now rendering again 2015-07-01 15:12:37 -07:00