Sam Gateau
c0496fd466
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-11-12 16:52:34 -08:00
Philip Rosedale
6af2b7aadf
remove buckyballs and face shift lean driving (should be a script if desired)
2014-11-12 07:33:59 -08:00
Sam Gateau
b716a512c6
Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level
2014-11-12 00:26:44 -08:00
Sam Gateau
631ed9da78
let's start reusing the Batch per model from frame to frame
2014-11-10 10:04:19 -08:00
ZappoMan
55576e7f9d
fix crash in mouse messages while quitting
2014-11-06 17:53:22 -08:00
ZappoMan
bceab4ead9
clear all octree related state when disconnecting from a domain
2014-11-06 17:25:49 -08:00
Stephen Birarda
790aa848ae
leverage Camera object for scripting, remove sep interface
2014-11-04 10:33:55 -08:00
Stephen Birarda
8d6b041758
send a pick ray with HFActionEvent, not x,y
2014-11-04 10:01:25 -08:00
Stephen Birarda
d3372537c5
Merge pull request #3715 from ZappoMan/entityScriptsAndEvents
...
Entity Scripts
2014-11-03 15:02:52 -08:00
Sam Gateau
cecf79e580
Fix the problem of actual framerate target not beeing true to the value displayed in the menu, same for resolution scale. Removed the value in Application and relies exclusively on the menu state
2014-11-03 11:22:23 -08:00
ZappoMan
a5088eece6
first cut at running scripts from entities
2014-10-31 14:03:30 -07:00
Ryan Huffman
4f2fef0428
Add edit entities help window
2014-10-30 12:02:30 -07:00
Brad Hefta-Gaub
4e7e9641f0
Merge pull request #3673 from birarda/lobby
...
initial groundwork for lobby interface
2014-10-28 08:48:33 -07:00
Stephen Birarda
8e6b6d5294
have controller A button fire action at center of screen
2014-10-27 15:58:42 -07:00
David Rowe
c6463abfb8
Prevent keys captured by script from being used as menu shortcuts
2014-10-25 09:22:30 -07:00
Sam Gateau
80a87b3b44
framerate is as fast as the display can go
2014-10-24 17:50:31 -07:00
Sam Gateau
9f6454f570
Merge branch 'temp0' of https://github.com/samcake/hifi into temp1
2014-10-23 15:20:20 -07:00
Sam Gateau
ac269e16c0
start working on the target framerate control
2014-10-23 13:19:34 -07:00
Ryan Huffman
14555c4534
Add UndoStackScriptingInterface and support when editing entities
2014-10-22 14:54:04 -07:00
ZappoMan
fc507850be
Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles
2014-10-16 20:36:28 -07:00
Stephen Birarda
fcd73858b8
remove Faceplus as a face tracker option
2014-10-15 15:13:52 -07:00
Sam Gateau
153d3b532b
merged with upstream, all clear
2014-10-14 00:19:19 -07:00
samcake
e7af0cbe7f
Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application
2014-10-14 00:08:29 -07:00
samcake
700ec5cf79
Rendering resolution can be different than the native window resolution
...
- Get rid of the different GlowModes since we found the correct one (DIFFUSE and ADD)
Get rid of the ui to change the mode
- INtroduce a "RenderResolutionScale" in the application that controls the ratio ofthe resolution between the framebuffers and the native window provided by Qt
- In the paintGL, in the default rendering path:
the rendering Framebuffers are resized to the window.size * renderResolutionScale.
The viewport is assigned to the framebuffer size from GlowEffect.prepare() to GlowEffect.render() (and not the original GLCanvas size)
at the end of GLowEffect render, the final step is to blit the colorbuffer from the rendering into the window's default framebuffer at the original resolution, and that requires one more glViewport
- add the ui in developer/render/ menu "scale resolution" where you can select the scaling level. THis should show in the rendering with ugly aliasing when selecting a scale under 1/2.
2014-10-13 18:00:50 -07:00
ZappoMan
4c85e9f581
removing particles
2014-10-13 14:10:57 -07:00
Stephen Birarda
df6f4d4c95
remove cara face tracking, cleanup warnings
2014-10-10 14:17:52 -07:00
David Rowe
b718d27ac6
Merge branch 'master' into 20073
2014-10-10 12:04:36 -07:00
Philip Rosedale
01bef6be6d
remove unused cameraPushback variable
2014-10-08 15:28:29 -07:00
David Rowe
d3b37684cd
Add VR display auto-calibration logic
2014-10-03 13:46:41 -07:00
Stephen Birarda
f27105100a
have AddressManager know its current domain and current path
2014-10-03 10:29:02 -07:00
Stephen Birarda
f7a17b7dec
dynamically load sixense lib on OS X to make avoiding hid_init crash easier
2014-09-29 12:58:01 -07:00
AndrewMeadows
697c7f6a61
Merge pull request #3481 from ZappoMan/collidingEntities
...
First cut at colliding entities
2014-09-25 09:38:50 -07:00
Brad Hefta-Gaub
0775e9dde4
Merge pull request #3479 from PhilipRosedale/master
...
Improved eye contact, audio driven mouth and brows, linear audio scope
2014-09-25 09:32:37 -07:00
ZappoMan
f43ba4a68b
first cut at getting entities to collide
2014-09-24 15:28:04 -07:00
Stephen Birarda
00b0806c4d
move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick
2014-09-23 17:09:46 -07:00
Philip Rosedale
21a15cff2a
Avatar can look at corrected position when looking at me
2014-09-23 12:50:47 -07:00
Andrzej Kapolka
467a9582c7
Somehow my reverting the ambient occlusion effect didn't take.
2014-09-15 13:29:03 -07:00
Andrzej Kapolka
d0f30dfd45
Merge branch 'master' of https://github.com/highfidelity/hifi into deference
2014-09-12 14:44:45 -07:00
Brad Hefta-Gaub
b209b70094
Merge pull request #3404 from birarda/data-web-domain-lookup
...
initial transition to new metaverse API
2014-09-12 13:45:40 -07:00
Stephen Birarda
348bcdb37a
resolve conflicts on merge with upstream master
2014-09-12 11:23:16 -07:00
Stephen Birarda
1f2020d169
some url handling repairs, move existing error reply handlers to new format
2014-09-12 10:13:33 -07:00
Stephen Birarda
b56ea5c936
centralize path creation from position and orientation to AddressManager
2014-09-11 17:17:47 -07:00
Andrzej Kapolka
c2b58c9781
Move deferred lighting into its own class.
2014-09-11 16:39:17 -07:00
Ryan Huffman
4315d63fb5
Merge branch 'master' of github.com:highfidelity/hifi into 19831
2014-09-11 11:13:13 -07:00
Stephen Birarda
aaabe6b1e1
handle domain changes via address bar
2014-09-11 10:45:45 -07:00
Andrzej Kapolka
fe249ef348
Make sure the frustum that we use for culling contains the current camera
...
information.
2014-09-10 15:51:10 -07:00
Andrzej Kapolka
1ef9126482
Migrating to device-independent coordinates.
2014-09-08 13:59:19 -07:00
Brad Hefta-Gaub
a77739f31c
Merge pull request #3369 from ctrlaltdavid/20007
...
Code Review for Job #20007
2014-09-06 15:36:29 -07:00
David Rowe
5ebe6962a4
Make scripts loaded with Script.load() not persist
2014-09-06 09:59:47 -07:00
Andrzej Kapolka
0b2d0a0b07
Fix for mouse events.
2014-09-05 17:30:19 -07:00
