Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 08:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
26077 commits 76 branches 59 tags 1.2 GiB
Commit graph

26077 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Levin
533148f26d line being sent as array 2015-05-28 15:48:31 -07:00
Stephen Birarda
9d2e1773a0 fix memory issues for immediate ice pings 2015-05-28 15:31:21 -07:00
Leonardo Murillo
f8cd670463 Merge pull request #4993 from sethalves/fix-polyvox-in-assignment 
libraries/entities doesn't need polyvox, only libraries/entities-rend…
 2015-05-28 15:52:47 -06:00
Stephen Birarda
da0c9fbc31 fix send of existing peer to querier 2015-05-28 14:37:16 -07:00
Eric Levin
4d4a90e9ce removed render debugging 2015-05-28 14:30:34 -07:00
Seth Alves
94edb72b47 oops 2015-05-28 14:30:06 -07:00
Seth Alves
131827a82b libraries/entities doesn't need polyvox, only libraries/entities-renderer 2015-05-28 14:27:49 -07:00
Stephen Birarda
e096cbe040 have ice-server immediately send peer to DS 2015-05-28 14:25:18 -07:00
Andrew Meadows
7be16da1a8 compute correct time-of-flight for extrapolation 2015-05-28 14:24:39 -07:00
Eric Levin
2d66696675 line working from array of points 2015-05-28 14:18:57 -07:00
Howard Stearns
e7a48af56d Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 14:15:51 -07:00
Howard Stearns
6b3c51c5b7 Merge pull request #4990 from AndrewMeadows/isentropic 
fix crash when creating a box with edit.js
 2015-05-28 14:14:45 -07:00
Stephen Birarda
531ef1fa1c change ice-server heartbeat behaviour 2015-05-28 14:05:43 -07:00
Howard Stearns
243ffbc74b Merge branch 'master' of https://github.com/highfidelity/hifi into preload-collision-sounds 2015-05-28 13:53:59 -07:00
Howard Stearns
0f30ec2ccc Undo the merge with the broken master checking. What could go wrong? 2015-05-28 13:48:27 -07:00
Stephen Birarda
eb6b80133b immediately ping the ICE DS every 25ms 2015-05-28 13:17:48 -07:00
Howard Stearns
810c766f77 When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit. 2015-05-28 12:50:02 -07:00
Andrew Meadows
0c6de897f5 replace tab with spaces 2015-05-28 12:26:29 -07:00
Andrew Meadows
b90d35c0c0 restore code to fix box entites not rendering 
boxes wouldn't render when in an otherwise empty domain
 2015-05-28 12:22:17 -07:00
Andrew Meadows
b7e3461e1a restore _created magic 2015-05-28 12:21:38 -07:00
Seth Alves
591f4d3a2a Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property 2015-05-28 11:27:35 -07:00
Eric Levin
8886e93d5f changed qVector to qVectorVec3 2015-05-28 11:26:41 -07:00
Stephen Birarda
81c23e9ca0 output if pinged node cannot be reached 2015-05-28 11:22:27 -07:00
Seth Alves
06ffcbf24d Merge pull request #4981 from ericrius1/blockWorld 
tiles and block no longer delete on script end, now user can delete a…
 2015-05-28 11:09:14 -07:00
Stephen Birarda
cee058c4ce handle immediate add packets in NodeList 2015-05-28 11:02:45 -07:00
Seth Alves
92817d9302 created-time is a property so it can be persisted to and retrieved from json saves 2015-05-28 10:59:27 -07:00
Stephen Birarda
5c75863af4 immediately send add packet from DS for new node 2015-05-28 10:45:03 -07:00
Eric Levin
72af4e4e67 latest pointer 2015-05-28 10:44:44 -07:00
Seth Alves
d32ae19ac7 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 10:44:05 -07:00
Andrew Meadows
2a4cd468e4 Merge pull request #4979 from sethalves/polyvox 
initial pass at Polyvox Entity Type
 2015-05-28 10:43:50 -07:00
Seth Alves
065f19d527 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 10:31:44 -07:00
Seth Alves
ab86b1d90a code review 2015-05-28 10:29:23 -07:00
Seth Alves
7547ef6ea4 code review 2015-05-28 10:29:07 -07:00
Seth Alves
e46c24ea58 code review 2015-05-28 10:27:59 -07:00
Howard Stearns
63bae07dde Merge pull request #4987 from ericrius1/pointer 
remove whiteboard by default in pointer.js
 2015-05-28 10:20:10 -07:00
Eric Levin
03062fccd3 remove whiteboard by default in pointer.js 2015-05-28 10:17:47 -07:00
Andrew Meadows
799a74baab Merge pull request #4985 from jherico/hydra_hmd_fix 
Fix mouse emulation picking and pointer positioning for the hydra
 2015-05-28 08:16:44 -07:00
Seth Alves
a91a7942a4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-05-28 06:59:39 -07:00
Seth Alves
aefd34f8d6 trying again to get polyvox to build on osx 2015-05-28 06:43:31 -07:00
Seth Alves
24bb17f7b2 trying again to get polyvox to build on osx 2015-05-28 06:36:31 -07:00
Brad Davis
e5bc0fad1e Merge branch 'master' into plugins_pt3 2015-05-27 23:45:31 -07:00
Brad Davis
e5bec42512 Fix mouse emulation picking and pointer positioning for the hydra 2015-05-27 23:36:00 -07:00
Seth Alves
b024bd0ff2 trying again to get polyvox to build on osx 2015-05-27 22:00:20 -07:00
Seth Alves
6a1ea820e7 trying again to get polyvox to build on osx 2015-05-27 21:50:35 -07:00
Seth Alves
1026da18b2 trying again to get polyvox to build on osx 2015-05-27 21:32:20 -07:00
Andrew Meadows
4e073c77b3 Merge pull request #4978 from sethalves/fix-4973 
recreate PR #4973 with some additional changes -- removed const keywo…
 2015-05-27 21:11:28 -07:00
Seth Alves
5b62714ba4 trying again to get polyvox to build on osx 2015-05-27 21:09:48 -07:00
Andrew Meadows
c32ff497e8 Merge pull request #4982 from howard-stearns/unowned-object-sounds 
Unowned object sounds
 2015-05-27 21:07:49 -07:00
Seth Alves
5e79b03faf trying to get polyvox to build on osx 2015-05-27 20:55:16 -07:00
Seth Alves
f4b7a41006 trying to get polyvox to build on osx 2015-05-27 20:46:50 -07:00