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

43709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
04bd27ea55 Merge branch 'fix-edit-js-restart' of github.com:sethalves/hifi into fix-edit-js-restart 2016-05-25 10:41:03 -07:00
Seth Alves
ef709c09d0 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 09:46:30 -07:00
Seth Alves
cd6b9a8a5f Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 09:46:12 -07:00
David Rowe
9ec6b77460 Make file browser dialog movable 2016-05-25 13:49:01 +12:00
Anthony J. Thibault
ea8ba7e2d1 Fixes based on code review feedback. 
* Use isNaN instead of glm::isnan
* prefer abort() over writing to a nullptr, in release assert.
* warn if packet size does not match expectations
 2016-05-24 18:12:40 -07:00
David Rowe
1c4eed640f Fix up file browser resize handle and outlining 2016-05-25 13:10:26 +12:00
Brad Hefta-Gaub
ff45633c21 bump entities version/CR feedback 2016-05-24 17:36:52 -07:00
Brad Hefta-Gaub
fb9f6185db CR feedback 2016-05-24 17:19:53 -07:00
David Rowe
66a90cc3f8 Make file browser dialog resizable 2016-05-25 11:31:39 +12:00
howard-stearns
a3f1ece978 Do button mapping in C++ and simplify vive.json accordingly. Vive and 
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
 2016-05-24 16:10:12 -07:00
Brad Hefta-Gaub
183f38e4f0 pop up warning if domain over capacity 2016-05-24 16:07:57 -07:00
Brad Hefta-Gaub
5668db9e4a cleanup and dead code removal 2016-05-24 15:43:30 -07:00
Brad Hefta-Gaub
3b0081fbbb cleanup and dead code removal 2016-05-24 15:42:55 -07:00
Brad Hefta-Gaub
0553ff5f9f cleanup and dead code removal 2016-05-24 15:41:11 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00
David Rowe
b9aa667c55 Fix QML test environment 2016-05-25 10:37:30 +12:00
James B. Pollack
f1e826b305 make blocky swipable 2016-05-24 15:28:11 -07:00
Brad Hefta-Gaub
12a1857280 check point with protocol refusal working 2016-05-24 15:20:11 -07:00
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
howard-stearns
6b606759aa Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes 2016-05-24 11:31:20 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape 
Add a generic shape primitive
 2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
49ded9c4df Merge pull request #7873 from ctrlaltdavid/20917 
restyle file browser
 2016-05-24 08:40:38 -07:00
Brad Hefta-Gaub
f16a3ce6bb Merge pull request #7962 from zzmp/fix/throttle 
fix throttling when Interface is not in focus
 2016-05-24 08:25:38 -07:00
Seth Alves
0bd6702fce Merge pull request #7963 from ctrlaltdavid/flying-and-ghosting 
tidy zone flying and ghosting entities editor options
 2016-05-24 07:18:30 -07:00
David Rowe
3391430f0a Tidy zone flying and ghosting entities editor options 
Move options to top of section from under "skybox" subsection
Fix capitalization of labels
 2016-05-24 20:28:49 +12:00
Brad Hefta-Gaub
bfb3f2cdfe Merge pull request #7955 from sethalves/quiet-compiler 
quiet gcc 5 warnings
 2016-05-23 19:44:21 -07:00
Zach Pomerantz
7dabce9cff Check throttle before idling/painting 2016-05-23 19:04:35 -07:00
James B. Pollack
c7ae3396eb end of day 2016-05-23 17:29:16 -07:00
James B. Pollack
fafea94196 new blocky, delete old files 2016-05-23 16:48:21 -07:00
Anthony J. Thibault
edfce0d5ba MyAvatar: reset fix, for both oculus and vive 2016-05-23 16:34:19 -07:00
Anthony J. Thibault
f82c3ba4f2 Revert "OpenVRDispalyPlugin: fix one-frame lag in resetSensors." 
This reverts commit 8381e74fb3.
 2016-05-23 16:30:05 -07:00
Anthony J. Thibault
097b16aadc Fix for sensor reset on oculus. 2016-05-23 15:40:29 -07:00
James B. Pollack
7cf56401f5 teleport sparkles, dressing room switch 2016-05-23 15:05:44 -07:00
howard-stearns
fdcd667d3c Fix hand controller pointer after input changes. 2016-05-23 13:33:42 -07:00
David Rowe
504516b627 Merge branch 'master' into 20917 2016-05-24 08:03:54 +12:00
David Rowe
099a675a18 Remove extra logging 2016-05-24 08:03:29 +12:00
James B. Pollack
266dfcd8e9 new lightswitches and cleanup old code, also more blocky stuff 2016-05-23 11:45:55 -07:00
Anthony J. Thibault
4342a07108 Updated AvatarDataPacket section with sequence number info. 2016-05-23 11:11:37 -07:00
Clément Brisset
a8b359dd60 Merge pull request #7943 from birarda/api-recheck-on-fail 
refresh connection info for place/domain while not connected
 2016-05-23 10:57:58 -07:00
Anthony J. Thibault
9aad38b2c2 merge fix 2016-05-23 10:39:39 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Anthony J. Thibault
5fe01acaa8 Added more comments to AvatarDataPacket section. 2016-05-23 10:03:13 -07:00
Seth Alves
00336f4860 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-23 09:58:20 -07:00
Brad Hefta-Gaub
f69c0ce5e5 Merge pull request #7957 from jherico/procedural_skybox_fix 
fix broken procedural skybox when leaving and re-entering
 2016-05-23 09:29:31 -07:00
Brad Hefta-Gaub
72dc24178f Merge pull request #7958 from jherico/keystick_fix 
fix keys getting stuck
 2016-05-23 08:19:43 -07:00
Geenz
bd6f6d2eef Typo. 
Not quite sure how this got here.
 2016-05-23 09:53:22 -04:00
Brad Davis
1f2f9da019 fix keys getting stuck 2016-05-22 23:34:45 -07:00
Brad Davis
11de8a52b2 fix broken procedural skybox when leaving and re-entering 2016-05-22 22:52:56 -07:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00