Brad Davis
|
382ef057b0
|
Revert to using QGLWidget
|
2015-07-30 10:59:05 -07:00 |
|
Brad Hefta-Gaub
|
6364072c10
|
Merge pull request #5459 from SamGondelman/sam/input-plugins
Plugins branch - small fixes
|
2015-07-29 18:23:34 -07:00 |
|
Sam Gondelman
|
9025bc3ead
|
press o to toggle overlays in case you don't have a middle mouse click
|
2015-07-29 16:43:25 -07:00 |
|
SamGondelman
|
42e7c5278c
|
attempt to fix ray picking in standing mode
|
2015-07-29 16:04:57 -07:00 |
|
Brad Davis
|
d16e00c17b
|
Merge pull request #5456 from SamGondelman/sam/input-plugins
Plugins branch - fixed comfort mode, other scripts
|
2015-07-29 12:15:42 -07:00 |
|
Sam Gondelman
|
c9ef6d5b26
|
fixed some scripts to work with plugins branch
|
2015-07-29 12:09:28 -07:00 |
|
Bradley Austin Davis
|
80ee31edd9
|
Address crashes on exit
|
2015-07-29 11:00:00 -07:00 |
|
Brad Davis
|
900c2c11df
|
Another whack at touch events
|
2015-07-29 10:29:27 -07:00 |
|
Brad Davis
|
07553e7a7c
|
Accept touch events in the GL window
|
2015-07-29 10:00:41 -07:00 |
|
Brad Davis
|
f0d0979ade
|
Fix UI element placement
|
2015-07-29 09:19:09 -07:00 |
|
Brad Davis
|
3fa7c7b516
|
Fixing GL window header
|
2015-07-28 23:22:28 -07:00 |
|
Brad Davis
|
bb29127eff
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-07-28 23:14:41 -07:00 |
|
Brad Davis
|
87bd930854
|
Renaming mode menu
|
2015-07-28 23:14:34 -07:00 |
|
Brad Davis
|
e109bd42d2
|
Fixing cleanup of glwindow
|
2015-07-28 23:14:33 -07:00 |
|
Brad Davis
|
6a5c2982ac
|
Merge pull request #5453 from hyperlogic/ajt/mirror-anchor-fix
Changed mirror position to not be achored to the head.
|
2015-07-28 20:26:19 -07:00 |
|
Brad Davis
|
3ecc292e16
|
Merge pull request #5454 from hyperlogic/ajt/camera-binding-fix
Fix for edit.js Camera.getPosition(), getOrientation() and getRotation()
|
2015-07-28 20:04:20 -07:00 |
|
Anthony J. Thibault
|
608898848f
|
Fix for edit.js Camera.getPosition(), getOrientation() and getRotation()
JavaScript has problems with const refs, apparently.
Camera.getPosition() was returning undefined.
|
2015-07-28 19:49:06 -07:00 |
|
Anthony J. Thibault
|
044ea2ace5
|
Changed mirror position to not be achored to the head.
But instead it's anchored to the "default" eye position, which
is where the eyes are in the model, before IK or animations occur.
|
2015-07-28 19:31:43 -07:00 |
|
Anthony J. Thibault
|
22d63b7697
|
Compilation fix for GLWindow
|
2015-07-28 18:10:59 -07:00 |
|
Anthony J. Thibault
|
ce7e385900
|
Updated comment
|
2015-07-28 18:03:03 -07:00 |
|
Brad Davis
|
3210037bc1
|
Merge pull request #5449 from ZappoMan/plugins
Plugins Branch - Fix a crash in pendingChanges.updateItem() for the Particle Entity
|
2015-07-28 16:49:30 -07:00 |
|
Brad Davis
|
91768b3992
|
Merge pull request #5450 from SamGondelman/sam/input-plugins
Plugins branch - re-remove hand lasers
|
2015-07-28 16:25:55 -07:00 |
|
Brad Davis
|
8202862750
|
Working on display plugins stability
|
2015-07-28 16:22:22 -07:00 |
|
Brad Davis
|
ead9bbe866
|
Moving display plugins menu
|
2015-07-28 16:22:21 -07:00 |
|
Andrew Meadows
|
fa49342f00
|
Merge pull request #5420 from bwent/solar-system
Example script solarsystem.js with orbiting satellite game
|
2015-07-28 15:06:23 -07:00 |
|
ZappoMan
|
c15161b71a
|
fix crash in Particle Entities and pendingChanges.updateItem()
|
2015-07-28 14:56:38 -07:00 |
|
Howard Stearns
|
a383f43f75
|
Merge pull request #5447 from AndrewMeadows/calcium
fix broken unit test builds
|
2015-07-28 14:34:20 -07:00 |
|
SamGondelman
|
e01cf1760b
|
remove unused method
|
2015-07-28 14:27:31 -07:00 |
|
ZappoMan
|
31bce8a50e
|
Merge branch 'plugins' of https://github.com/highfidelity/hifi into plugins
|
2015-07-28 14:10:11 -07:00 |
|
Philip Rosedale
|
cce6f15de2
|
Merge pull request #5443 from huffman/edit-camera-up
Update edit.js to swing up on activate so that it doesn't intersect with the avatar's head
|
2015-07-28 13:32:34 -07:00 |
|
bwent
|
1107742188
|
Clean up formatting for satellite.js
|
2015-07-28 13:01:20 -07:00 |
|
bwent
|
5272a1d6e7
|
refactoring variables and constants, fix update loop to continue over unlaunched satellites
|
2015-07-28 13:01:20 -07:00 |
|
bwent
|
e0d6609a99
|
resolve file path issue
|
2015-07-28 13:01:20 -07:00 |
|
bwent
|
ccb3d433af
|
Example script solarsystem.js with orbiting satellite game
|
2015-07-28 13:01:20 -07:00 |
|
SamGondelman
|
482f064c64
|
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
|
2015-07-28 12:56:54 -07:00 |
|
SamGondelman
|
782a5c491e
|
removed hand lasers because they had been renamed so they weren't removed
|
2015-07-28 12:56:31 -07:00 |
|
Bradley Austin Davis
|
6df260b3f9
|
Bad variable usage on OSX
|
2015-07-28 12:47:52 -07:00 |
|
Bradley Austin Davis
|
02998d81de
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-07-28 12:45:03 -07:00 |
|
Andrew Meadows
|
d03a7d1b70
|
fix physics-tests build errors
|
2015-07-28 12:24:17 -07:00 |
|
Andrew Meadows
|
2aa453b610
|
fix build errors for shared-tests
|
2015-07-28 12:05:45 -07:00 |
|
Brad Davis
|
2bb7a20578
|
Working on fullscreen targeting
|
2015-07-28 11:30:35 -07:00 |
|
ZappoMan
|
20dde7c27c
|
Merge branch 'plugins' of https://github.com/highfidelity/hifi into plugins
|
2015-07-28 11:29:41 -07:00 |
|
Brad Davis
|
de446fe91e
|
Merge pull request #5440 from SamGondelman/sam/input-plugins
Various input plugins fixes
|
2015-07-28 14:29:32 -04:00 |
|
Andrew Meadows
|
6e41a79551
|
Merge pull request #5360 from BingShearer/Leaves
New falling leaf script based on the existing rain.js
|
2015-07-28 10:08:16 -07:00 |
|
Sam Gondelman
|
469696f283
|
Merge remote-tracking branch 'upstream/plugins' into sam/input-plugins
|
2015-07-28 10:06:42 -07:00 |
|
Brad Davis
|
a049b14d13
|
Merge remote-tracking branch 'upstream/master' into plugins
|
2015-07-28 10:04:19 -07:00 |
|
Brad Hefta-Gaub
|
26111b9b80
|
Merge pull request #5365 from kevinmthomas-carpool/20485
20485
|
2015-07-28 09:59:43 -07:00 |
|
Brad Hefta-Gaub
|
43eec08514
|
Merge pull request #5376 from venkatn93/avatar
New ambient occlusion effect in render pipeline
|
2015-07-28 09:58:51 -07:00 |
|
Brad Hefta-Gaub
|
d8c2b41655
|
Merge pull request #5428 from kevinmthomas-carpool/20628
CR for Job #20628 - JS Stream Player For Domain-Zone
|
2015-07-28 09:58:04 -07:00 |
|
Brad Hefta-Gaub
|
ee641335fa
|
Merge pull request #5421 from thoys/20552
CR for Job #20552 - Add the ability to modify the parameters of planky from a popup dialog
|
2015-07-28 09:57:22 -07:00 |
|