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

25887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Levin
e7c5a24e3d fixed packet number increment logic 2015-06-02 09:38:45 -07:00
Eric Levin
f51ad6b8da merged master 2015-06-01 15:39:05 -07:00
Eric Levin
785144404c changed entity packet type version number 2015-06-01 15:37:29 -07:00
Eric Levin
83bf4241e4 resolved merge conflicts... but now lines not flying across clients 2015-06-01 15:16:08 -07:00
Seth Alves
ef5fa48c2a Merge pull request #5017 from birarda/master 
update polyvox for xcode C++11 build
 2015-06-01 15:06:51 -07:00
Stephen Birarda
94131908fb update polyvox for xcode C++11 build 2015-06-01 14:53:11 -07:00
Stephen Birarda
12bcbbf338 Merge pull request #5012 from ctrlaltdavid/20555 
DO NOT MERGE - QA for #20555 - Re-style QML Address Bar
 2015-06-01 17:08:00 -04:00
David Rowe
7d12482a49 Untabify 2015-06-01 13:54:14 -07:00
David Rowe
9c52c79fe1 Combine icon and input areas into a single SVG 2015-06-01 13:29:36 -07:00
Stephen Birarda
293af425ac remove vhacd block from windows build guide 2015-06-01 12:49:26 -07:00
Eric Levin
5cce4edec8 fix merge conflicts attemp 1 2015-06-01 11:18:33 -07:00
Eric Levin
b6b5078048 removed unneeded append methods from OctreePacketData 2015-06-01 11:11:08 -07:00
Eric Levin
93c3f90c95 clened up read and write of qVec- no longer converting between qVector and qByteArray 2015-06-01 11:08:48 -07:00
David Rowe
b166e24ff5 Fix initial fade-in 2015-06-01 11:06:33 -07:00
samcake
b676036895 Merge pull request #5007 from SamGondelman/master 
Fixed avatar billboards not displaying
 2015-06-01 10:54:19 -07:00
Eric Levin
7b08537574 code standards fixes 2015-06-01 09:51:24 -07:00
Philip Rosedale
6290f8c992 Merge pull request #5013 from ericrius1/grab 
removed sounds from grab script
 2015-06-01 09:39:04 -07:00
Eric Levin
45331e5a0e removed sounds from grab script 2015-06-01 09:37:54 -07:00
Philip Rosedale
63ae711015 Merge pull request #5005 from howard-stearns/sound-parameter-tweaks 
Sound parameter tweaks
 2015-06-01 09:37:36 -07:00
Eric Levin
8a191a661d adding flag for points changed 2015-06-01 09:35:32 -07:00
David Rowe
9a8bb67f37 Tidy address bar dialog code 2015-06-01 09:01:11 -07:00
David Rowe
e41b4c1b7b Add new address bar dialog error message 
Implemented as a new simple InformationDialog so that can try it out
without reworking MessageDialog immediately for all QML UI.
 2015-06-01 09:01:11 -07:00
David Rowe
05e251eba4 Add icon to address bar dialog 2015-06-01 09:01:10 -07:00
David Rowe
881941b64d Restyle address bar dialog 
Made the dialog a stand-alone QML file that doesn't inherit from other
dialog QML files so that don't need to rework all dialogs right now.
 2015-06-01 09:01:09 -07:00
David Rowe
a43593c3b2 Dialog opacity transition tidying 2015-06-01 09:01:08 -07:00
David Rowe
2a931119bd Replace expand/collapse dialog animation with fade in/out 2015-06-01 09:01:08 -07:00
Eric Levin
9ca5310c21 cleaned up another qDebugging line 2015-05-31 15:33:51 -07:00
Eric Levin
9641b11086 array of points takes absolute positions now, so script writer has an easier time 2015-05-31 14:59:09 -07:00
Eric Levin
115bf3dd25 cleaned up logging and testing code. 2015-05-31 14:52:44 -07:00
Eric Levin
27b59b5f72 fixed bug in qvec unpacking code 2015-05-31 14:46:20 -07:00
Eric Levin
5e22af8643 points and line width persistent accross clients 2015-05-31 14:21:28 -07:00
Philip Rosedale
396a20c72d Merge pull request #5006 from ericrius1/brownianFun 
added brownianFun script to apply random forces to balls in a pen
 2015-05-30 15:25:38 -07:00
Eric Levin
cb72b620cf printing bytes out correctly 2015-05-29 19:42:07 -07:00
Eric Levin
8dda86f80d added brownianFun script to apply random forces to balls in a pen 2015-05-29 17:02:51 -07:00
Eric Levin
7d5dd278a1 adding unpacking 2015-05-29 16:54:40 -07:00
Sam Gondelman
c19115a485 actually fixed billboard 2015-05-29 16:53:01 -07:00
Sam Gondelman
4c83c6918d fixed avatar billboards not displaying 2015-05-29 16:44:16 -07:00
Howard Stearns
9c56f6270e Remove debug print. 2015-05-29 16:21:57 -07:00
Howard Stearns
6e2378e676 Sound parameter tweaks. 2015-05-29 16:19:41 -07:00
Philip Rosedale
11844463d1 Merge pull request #4915 from AndrewMeadows/isothermal 
DO NOT MERGE grabHockey.js script can safely manipulate misc objects again
 2015-05-29 16:07:32 -07:00
Philip Rosedale
6b9f6ff7bb Merge pull request #4994 from AndrewMeadows/isentropic 
compute correct deltaTime for extrapolation of moving entity and other fixes
 2015-05-29 16:07:10 -07:00
Stephen Birarda
e7ce8706a3 Merge pull request #5004 from birarda/domain-dtls 
fix debug for failed ping to DS
 2015-05-29 16:21:41 -04:00
Stephen Birarda
33fde7c66d remove extra debug 2015-05-29 13:21:24 -07:00
Brad Hefta-Gaub
7d1cd70e89 Merge pull request #4969 from jherico/plugins_pt3 
Working towards display plugins
 2015-05-29 13:19:18 -07:00
Brad Davis
77b45e2b4a Adding missing files 2015-05-29 12:59:55 -07:00
Brad Davis
f98305dd55 CR comments 2015-05-29 12:45:03 -07:00
Stephen Birarda
2207bfaf40 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-dtls 2015-05-29 12:06:12 -07:00
Stephen Birarda
e253687dcd fix fail case for DS pings 2015-05-29 12:06:07 -07:00
Andrew Meadows
8177512432 send all TerseUpdate properties when one changes 2015-05-29 11:35:50 -07:00
Seth Alves
b0f6826d17 Merge pull request #4995 from birarda/domain-dtls 
speed up initial connection to domains
 2015-05-29 10:50:01 -07:00