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

19363 commits

Author SHA1 Message Date
Philip Rosedale
2c8b1721cc Add warp from right ('O') button on gamepad 2014-12-05 14:06:41 -08:00
Philip Rosedale
bc609016a9 remove debug 2014-12-05 08:59:41 -08:00
Philip Rosedale
c5247ca65b Add ability to set injector properties during playing, and orbitingSound.js 2014-12-05 08:45:00 -08:00
Philip Rosedale
47c2ea95f4 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-04 16:07:28 -08:00
Clément Brisset
26340353ac Merge pull request from ZappoMan/rayPickWork 
Work on improving pickable entities - Lights Optionally pickable, Spheres & Text pick properly, other bug fixes
 2014-12-04 15:43:17 -08:00
Clément Brisset
2a1c3a3220 Merge pull request from huffman/gamepad-disable-warp 
Disable the warp button in gamepad.js
 2014-12-04 15:27:18 -08:00
Ryan Huffman
ba3f051c8c Disable the warp button in gamepad.js 2014-12-04 15:11:16 -08:00
Brad Hefta-Gaub
0e71c5c282 Merge pull request from huffman/gamepad-mirror-toggle 
Make gamepad mirror button toggle
 2014-12-04 14:49:42 -08:00
Ryan Huffman
3bbee640fb Make gamepad mirror button toggle 2014-12-04 14:48:03 -08:00
Brad Hefta-Gaub
227f5a498f Merge pull request from huffman/gamepad-mirror 
Add button to gamepad.js to toggle mirror mode
 2014-12-04 14:27:09 -08:00
Ryan Huffman
500b8a49d1 Add button to gamepad.js to toggle mirror mode 2014-12-04 14:17:24 -08:00
ZappoMan
842ee714b8 make text entities correctly ray pick 2014-12-04 13:08:16 -08:00
Brad Hefta-Gaub
b9ce5b0d0c Merge pull request from huffman/gamepad-multi-speed 
Add multi-speed control to gamepad.js
 2014-12-04 12:20:36 -08:00
Ryan Huffman
e3a34f6db0 Add multi-speed control to gamepad.js 2014-12-04 12:17:31 -08:00
Brad Hefta-Gaub
3a396b3256 Merge pull request from huffman/entity-tools-fix-rp-rotation 
Fix entity tool rotation to rotate around registration point
 2014-12-04 11:41:22 -08:00
Ryan Huffman
1ee45e8bd1 Fix entity tool rotation to rotate around registration point 2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub
cab1be25ed Merge pull request from huffman/entity-tools-fix-registration-point 
Entity tools fix registration point
 2014-12-04 11:04:27 -08:00
ZappoMan
11f10f9512 make sphere entities pick off their actual sphere, fix bug in ray picking multiple items with different distances 2014-12-04 10:54:04 -08:00
Ryan Huffman
1f82831bcc Fix call to getRelativeCenterPosition 2014-12-04 10:47:09 -08:00
Clément Brisset
a7a7ad775e Merge pull request from huffman/fix-entity-selection 
Fix entity tool selection when inactive
 2014-12-04 10:39:42 -08:00
Ryan Huffman
acd5495b2a Add getRelativeCenterPosition 2014-12-04 10:29:10 -08:00
Ryan Huffman
b2c5b19fd7 Remove print 2014-12-04 10:20:02 -08:00
Ryan Huffman
efdc8f5494 Fix stretch tools to work correctly with registrationPoint 2014-12-04 10:19:51 -08:00
Ryan Huffman
53f195eec4 Fix position of overlays when registrationPoint is not centered 2014-12-04 10:05:34 -08:00
Ryan Huffman
f48d304df0 Add registrationPoint to SelectionManager 2014-12-04 10:03:54 -08:00
ZappoMan
958b37dead Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-04 09:38:38 -08:00
Ryan Huffman
74acf9513b Fix entity tool selection when inactive 2014-12-04 08:47:18 -08:00
Philip Rosedale
dd8deeea59 simpler butterflies script that doesn't put as much traffic on entity server 2014-12-03 22:39:11 -08:00
Brad Hefta-Gaub
c901b8d1eb Merge pull request from AndrewMeadows/thermonuclear 
fix for non-animating models
 2014-12-03 17:26:00 -08:00
Andrew Meadows
ab011d5b30 fix for non-animating models 2014-12-03 16:49:49 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
Philip Rosedale
abd54a4d7b Merge branch 'master' of https://github.com/worklist/hifi 2014-12-03 15:06:29 -08:00
Brad Hefta-Gaub
96c3bfceef Merge pull request from huffman/entity-tools-polish-2 
Entity tools polish - round 2
 2014-12-03 14:31:27 -08:00
Brad Hefta-Gaub
f10b656877 Merge pull request from AndrewMeadows/thermonuclear 
pull entity simulation out of EntityTree
 2014-12-03 14:30:44 -08:00
Andrzej Kapolka
f76ff6a70a Merge pull request from ey6es/master 
Bump up the glyph texture size so that we don't spill over into another
 2014-12-03 14:19:55 -08:00
Andrzej Kapolka
df23a84cc2 Bump up the glyph texture size so that we don't spill over into another 
texture.
 2014-12-03 14:18:47 -08:00
Philip Rosedale
5c59fc786d Merge pull request from ey6es/master 
Fixes for erroneous download percentages (resources and metavoxels); warning fix, metavoxel edit fix.
 2014-12-03 14:03:07 -08:00
Ryan Huffman
d08337326c Update selection box color to red 2014-12-03 12:59:51 -08:00
Andrzej Kapolka
fecb225a06 Prevent erroneous resource download percentages; Qt reports the total bytes as 
-1 before the actual size is available.
 2014-12-03 12:55:58 -08:00
Andrzej Kapolka
88048e8599 Make sure the position of the heightfield/voxel brush is valid before acting. 2014-12-03 12:47:32 -08:00
Andrzej Kapolka
d975e3f0ce Fixed signed/unsigned warnign. 2014-12-03 12:38:10 -08:00
Andrzej Kapolka
1e93137e6b Fix for overflow when computing metavoxel stats. 2014-12-03 12:24:58 -08:00
Stephen Birarda
f0b0c5fe0b change warp button to button face right 2014-12-03 11:08:41 -08:00
Philip Rosedale
d34bf8ccd3 Merge branch 'master' of https://github.com/worklist/hifi 2014-12-03 10:55:43 -08:00
Brad Hefta-Gaub
f70f07e694 Merge pull request from PhilipRosedale/master 
When in HMD, arrow keys make jump turns
 2014-12-03 10:54:22 -08:00
Philip Rosedale
f897e2290d Merge branch 'master' of https://github.com/worklist/hifi 2014-12-03 10:54:09 -08:00
Philip Rosedale
790d3c1cc6 Merge pull request from birarda/master 
fix filename/URL discrepancy for local scripts
 2014-12-03 10:51:35 -08:00
ZappoMan
5f9c1c490b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 2014-12-03 10:44:56 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Ryan Huffman
5c5c66b265 Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2 2014-12-03 08:40:38 -08:00