Stephen Birarda
aa1c36e61a
fix State.h after bad merge
2015-08-18 11:51:23 -07:00
Stephen Birarda
0f77ab8611
resolve conflicts on merge with upstream/master
2015-08-18 11:45:55 -07:00
Andrew Meadows
52f212b94c
Merge pull request #5585 from sethalves/always-persist-entities-as-json
...
always persist entities as gzipped json
2015-08-18 10:34:26 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
Philip Rosedale
cebc4e4608
Merge pull request #5589 from sethalves/simulations-per-second-readout
...
Simulations per second readout
2015-08-18 09:26:53 -07:00
Seth Alves
e29bb9183b
minimize diff
2015-08-18 02:08:21 -07:00
Seth Alves
8435550fe9
only update simRate once per second
2015-08-18 02:05:50 -07:00
Seth Alves
551f0aaba3
show how many times per second Application::idle is called
2015-08-18 01:41:17 -07:00
Brad Hefta-Gaub
51f0ab3d7c
Merge pull request #5588 from jherico/homer
...
Fix crash on mouse click
2015-08-18 00:58:06 -07:00
Brad Davis
3cbbb5fb79
Fix crash on mouse click
2015-08-18 00:05:02 -07:00
Brad Hefta-Gaub
8944fe5388
Merge pull request #5586 from jherico/homer
...
Add highlighting of keyboard focused items
2015-08-17 17:40:47 -07:00
Brad Davis
cb5f80bf78
Add highlighting of keyboard focused items
2015-08-17 17:11:26 -07:00
Brad Davis
5d65937120
Merge pull request #5583 from ZappoMan/clickToFocusWebEntity
...
make web entity focus click based
2015-08-17 16:57:39 -07:00
Philip Rosedale
01108bdf6b
Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors
...
Synchronize eye joint and debugging vectors
2015-08-17 16:56:01 -07:00
ZappoMan
ae9ccb79ed
cleanup debugging and dead code
2015-08-17 15:58:51 -07:00
ZappoMan
49cf29ce8f
cleanup debugging and dead code
2015-08-17 15:57:20 -07:00
Philip Rosedale
31e4878902
Merge pull request #5584 from sethalves/fix-eye-calibration-saving
...
re-enabled ctrlaltdavid's eye calibration code
2015-08-17 14:49:44 -07:00
ZappoMan
47b0e2fda6
more hacking on click to focus
2015-08-17 14:02:24 -07:00
Seth Alves
4a456488a1
remove the option to persist entities as anything other than json.gz files
2015-08-17 14:01:25 -07:00
ZappoMan
b7d9dc444b
more work on clicking focus
2015-08-17 13:06:32 -07:00
Seth Alves
1c8030472a
back out the more controversial changes
2015-08-17 12:40:56 -07:00
Seth Alves
296a6b1cb8
re-enabled ctrlaltdavid's eye calibration code
2015-08-17 12:20:46 -07:00
Howard Stearns
941b966dc7
Force eyeball update even when not looking at me.
2015-08-17 11:57:08 -07:00
ZappoMan
8cf450cb67
first cut at making focus click based
2015-08-17 11:41:54 -07:00
Seth Alves
169bb9f3d9
Merge pull request #5580 from jherico/homer
...
Polyvox shader fix
2015-08-17 10:12:27 -07:00
Brad Davis
a61d9501c8
Add polyvox to shader tests and clean up test code
2015-08-17 02:04:23 -07:00
Brad Davis
db4d98ccb5
Polyvox shader fix
2015-08-16 23:21:45 -07:00
Brad Hefta-Gaub
53c5c75071
Merge pull request #5574 from bwent/solar-system
...
Updates to solarsystem.js
2015-08-15 11:25:40 -07:00
Brad Hefta-Gaub
b1a4715ce1
Merge pull request #5572 from bwent/particleDance
...
Example particle scripts
2015-08-15 11:24:44 -07:00
Brad Hefta-Gaub
494fd6035a
Merge pull request #5569 from ctrlaltdavid/webwindow-extras
...
Add size and position properties, methods, and events to WebWindow
2015-08-15 11:23:59 -07:00
Brad Hefta-Gaub
34403c6242
Merge pull request #5564 from jherico/maggie
...
Fix warning messages about depth and stencil buffers for the QML surfaces
2015-08-15 11:15:04 -07:00
Brad Hefta-Gaub
821063f6d2
Merge pull request #5575 from SamGondelman/sam/input-plugins
...
Working on toybox script, squeezeHands, and default mappings
2015-08-15 10:59:04 -07:00
Brad Hefta-Gaub
e4dea13256
Merge pull request #5576 from hyperlogic/tony/ati-render-fix
...
Fix for ATI discrete graphics on 2015 macbook pro / mac pro.
2015-08-15 10:05:44 -07:00
Anthony J. Thibault
cd58f012a3
Fix for ATI discrete graphics on 2015 macbook pro / mac pro.
...
Fixed incorrect size for camera transform uniforms passed via
glBindBufferRange. This is a legitimate bug on our side.
I guess Intel and nVidia drivers just happen to ignore this field.
This was likely causing many of the shader TransformCamera members
to be identity or un-initialized, specifically, the projection
matrix values.
This was resulting in a black screen on ATI gpus.
2015-08-15 09:42:05 -07:00
Brad Davis
82310bb499
Attempting to fix rendering issues on 2015 Macs
2015-08-14 23:57:10 -07:00
Brad Davis
9706a44ca1
Merge pull request #5571 from ZappoMan/hmdToolsRedux
...
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 20:11:27 -07:00
Howard Stearns
eeeaa8050d
Fix the rush jobs, so gustavo can build build for me...
2015-08-14 18:58:49 -07:00
Brad Hefta-Gaub
a0e92e71a5
Merge pull request #5562 from AlexanderOtavka/overlay-docs
...
Documentation for overlay changes.
2015-08-14 18:53:34 -07:00
Brad Hefta-Gaub
27f2a628a8
Merge pull request #5568 from huffman/fix-edit-click
...
Update edit.js mouse click code to be more lenient to micro movements
2015-08-14 18:47:48 -07:00
Brad Hefta-Gaub
f76c663bb5
Merge pull request #5558 from AndrewMeadows/chromium
...
coalesce scattered unit-test helper functions
2015-08-14 18:12:03 -07:00
Brad Hefta-Gaub
65b9c7bed8
Merge pull request #5522 from huffman/fix-billboard-url
...
Fix BillboardOverlay breaking when changing url
2015-08-14 18:10:22 -07:00
Brad Hefta-Gaub
fe8fef4242
Merge pull request #5570 from jherico/homer
...
WebEntity keyboard input with mouse hover
2015-08-14 17:32:47 -07:00
Brad Davis
dc2ddd0303
switch statement spacing
2015-08-14 17:12:00 -07:00
bwent
8609129228
fix header
2015-08-14 17:07:01 -07:00
Howard Stearns
d28c555a79
Synchronize eye joint and debugging vectors when the other avatar is looking at me.
2015-08-14 16:47:34 -07:00
Brad Davis
db95657455
PR comments
2015-08-14 16:40:53 -07:00
ZappoMan
6a802560f2
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
2015-08-14 16:27:50 -07:00
bwent
889d9c54a5
add newline at end of file
2015-08-14 16:24:11 -07:00
Brad Davis
208e41efd1
WebEntity keyboard input with mouse hover
2015-08-14 16:18:38 -07:00
bwent
45fe6a438c
Example particle scripts
2015-08-14 16:18:07 -07:00
