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

27461 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bing Shearer
25708678f6 Fixed shutdown procedure for Datagrams so that there is no crash on exit 2015-07-09 14:18:53 -07:00
Bing Shearer
ba4049754a Restored indentatioN 2015-07-08 16:53:55 -07:00
Bing Shearer
6080ec4509 Air Hockey UI now follows window border 2015-07-08 16:29:43 -07:00
Bing Shearer
25a1108b61 Fixed spelling error 2015-07-08 16:24:23 -07:00
samcake
a8ddc71946 Merge pull request #5262 from bwent/cookies 
Added checkbox functionality, double-click to reset panel
 2015-07-06 15:09:16 -07:00
bwent
8b4398cd5a Update cookies.js 2015-07-06 15:03:21 -07:00
bwent
2bdd2b8c2c Update cookies.js 2015-07-06 15:02:51 -07:00
bwent
5d91f1be83 Removed header comments 2015-07-06 13:26:16 -07:00
bwent
93fbfcbff7 Added checkbox functionality, double-click to reset panel 2015-07-06 12:09:08 -07:00
Brad Davis
21562c0766 Merge pull request #5258 from ericrius1/nakedGLStripping 
Removing naked GL calls from overlay code
 2015-07-06 10:25:50 -07:00
Clément Brisset
c5a043f2e1 Merge pull request #5253 from ZappoMan/inBoundStats 
add edit update stats
 2015-07-04 21:11:48 -07:00
ZappoMan
c4a5160b89 CR feedback 2015-07-04 19:13:35 -07:00
ZappoMan
74733452da some tweaks to make stats dialog more readable 2015-07-04 11:25:27 -07:00
ZappoMan
40cdd8646e add packets per second to octree processing stats 2015-07-03 15:53:53 -07:00
ZappoMan
2aa345dfc6 Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-03 15:04:59 -07:00
Eric Levin
3d06b011aa adding batch to renderHUD 2015-07-03 13:27:00 -07:00
samcake
c6a613eaa9 Merge pull request #5260 from ZappoMan/deadCodeRemovalMachine 
remove dead code
 2015-07-03 11:53:21 -07:00
ZappoMan
29a7584ee6 remove dead code 2015-07-03 11:29:59 -07:00
Eric Levin
9d3995ae25 Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping 2015-07-03 09:42:19 -07:00
ZappoMan
e1530b3ce9 added a FIXME STUTTER note 2015-07-02 18:15:24 -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
Seiji Emery
1fc1c7c794 PR Fixes 2015-07-02 17:29:08 -07:00
ZappoMan
a54cf67064 add stats for processing time per packet 2015-07-02 17:28:53 -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
ZappoMan
8916dd2056 add stats for elements and entities per second 2015-07-02 17:00:35 -07:00
ZappoMan
0c0b8dbbc1 add stats for elements and entities per incoming packet 2015-07-02 16:19:13 -07:00
ericrius1
4db2b8dd59 removed shader code used in a different branch 2015-07-02 15:05:45 -07:00
ZappoMan
b568e895ec Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats 2015-07-02 15:00:09 -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
ericrius1
8be1fd28e5 stripping naked gl calls from overlays to allow vive and oculus plugins to work 2015-07-02 13:57:00 -07:00
ZappoMan
5c4d4893de added bytes per edit stats 2015-07-02 13:44:28 -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
ZappoMan
63b585da0f added updates per second stat 2015-07-02 13:28:12 -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
ZappoMan
b13a4b2a71 add edit update stats 2015-07-02 11:07:47 -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