Seth Alves
c95db5672a
include argument-packing version in serialized argument data
2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c
Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire
2015-06-26 07:20:51 -07:00
Seth Alves
015498a6e0
move function up so this builds in non-debug mode
2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d
fix alt-branch of ifdef
2015-06-26 07:04:10 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Seth Alves
7c26641560
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-25 17:40:27 -07:00
bwent
aa865680ab
Added faceCamera property to Text Entities
...
…and removed from base
2015-06-25 15:38:38 -07:00
Niraj Venkat
6b14a64c8c
Formatting changes and teleport on click
2015-06-25 15:15:44 -07:00
Brad Hefta-Gaub
6c4a4866d3
Merge pull request #5202 from Atlante45/overlay
...
Overlay have correct bounds
2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e
Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
...
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Clément Brisset
e05b4e3115
Merge pull request #5203 from howard-stearns/set-injector-options-from-script
...
Set injector options from script
2015-06-24 16:54:11 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Atlante45
85b2771c4a
Extend Extents
2015-06-24 15:44:48 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Seiji Emery
6e87f44ec7
Merge remote-tracking branch 'upstream/master'
2015-06-24 15:12:57 -07:00
bwent
0516caaa32
Added CHECK_PROPERTY_CHANGE macro
2015-06-24 14:58:33 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Howard Stearns
3b8a46b87d
Allow scripted audio injectors to have options set.
2015-06-23 21:01:34 -07:00
Seth Alves
28582ed14d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 19:50:35 -07:00
David Rowe
33b48947a5
Delete Interface.ini.lock file at start-up if it exists
...
Otherwise Interface freezes.
2015-06-23 17:36:19 -07:00
Brad Davis
8f8bda327c
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
2015-06-23 16:54:32 -07:00
bwent
99cd9bada1
Added Billboard entity property and enabled billboarding for text entities
2015-06-23 16:22:34 -07:00
Seth Alves
a46e8ed14c
quiet compiler
2015-06-23 15:27:35 -07:00
Seth Alves
0af137af36
save encoded action data rather than generating it on demand
2015-06-23 15:27:25 -07:00
ericrius1
b1190bee6e
deleted empty files I accidently committed.
2015-06-23 14:13:13 -07:00
David Rowe
93509f4c6e
Code review
2015-06-23 11:25:02 -07:00
Seth Alves
6e34678a59
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 10:48:21 -07:00
Seth Alves
4bf4e9f5da
Merge pull request #5164 from ericrius1/lineBounds
...
Line bounds
2015-06-23 10:47:38 -07:00
Seth Alves
20f173a474
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 19:36:09 -07:00
Brad Hefta-Gaub
a3e1987078
Merge pull request #5176 from huffman/fix-raypicking-crash
...
DO NOT MERGE - Fix recalculateMeshBoxes being called outside of mutex
2015-06-22 19:03:31 -07:00
Seiji Emery
dfe58a5ed4
Disabled Model (entity) Tests, as they are waaay out of date and will not run with the current codebase. These should get reimplemented at some point.
2015-06-22 17:42:07 -07:00
Brad Hefta-Gaub
e0f9f8b613
Merge pull request #5183 from birarda/ac-scripts
...
fix AC crash with no controller scripting interface
2015-06-22 17:22:56 -07:00
Philip Rosedale
6ef7e486b1
Merge pull request #5165 from ctrlaltdavid/20582
...
CR for #20582 - Fix the issue with Domain backups
2015-06-22 17:02:38 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Seth Alves
4849e2922e
quiet valgrind
2015-06-22 14:21:25 -07:00
Brad Davis
98f7b0a689
Merge pull request #5181 from birarda/master
...
fix for double store on index path lookup
2015-06-22 13:58:36 -07:00
Brad Davis
9f98547390
Merge branch 'master' into plugins
2015-06-22 13:35:40 -07:00
Seth Alves
7f4e3f8216
when deserializing action, remove any existing actions that weren't part of the serialized data
2015-06-22 13:12:34 -07:00
Seth Alves
55975fd611
don't add an action of we're about to remove it
2015-06-22 13:11:42 -07:00
Howard Stearns
240272be11
Merge pull request #5161 from PhilipRosedale/master
...
Always test and remove DC Offset
2015-06-22 12:09:08 -07:00
Philip Rosedale
111b0f286d
Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
...
Tidy address bar code
2015-06-22 12:08:33 -07:00
Philip Rosedale
e5c1e0ca67
Merge pull request #5159 from howard-stearns/refactor-playSound
...
Refactor playSound
2015-06-22 12:07:08 -07:00
Stephen Birarda
ff21c22245
fix AC crash with no controller scripting interface
2015-06-22 11:56:07 -07:00
Stephen Birarda
a9eccb687a
fix for double store on index path lookup
2015-06-22 11:26:17 -07:00
ericrius1
362d9a2481
syncing brush sphere with line color
2015-06-22 10:35:00 -07:00
Brad Davis
3231bbba5a
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
Brad Davis
1b44c220a7
Prep work for procedural stars & stuff
2015-06-22 09:43:12 -07:00
Seth Alves
bce8b0cc1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 07:19:55 -07:00
Seth Alves
c14276145d
lock when reading or writing _actionsToAdd or _actionsToRemove
2015-06-22 07:19:40 -07:00
Seth Alves
03a2d190b0
quiet valgrind
2015-06-22 07:18:55 -07:00
Seth Alves
f284e9d070
quiet compiler
2015-06-22 07:18:30 -07:00
samcake
be8ae9580d
Merge pull request #5177 from bwent/doubleClickEvent
...
Expose mouseDoublePressEvents to js
2015-06-22 11:13:05 +02:00
Seth Alves
77cb3c0caa
quiet valgrind
2015-06-21 18:13:13 -07:00
Seth Alves
717c8ed3ad
formatting
2015-06-21 18:12:24 -07:00
Bradley Austin Davis
4ccdc78866
Fixing frustum perspective bug
2015-06-21 15:53:24 -07:00
Seth Alves
746033f3bd
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-21 07:34:48 -07:00
Bradley Austin Davis
577962cb67
Merge branch 'master' into overlay
2015-06-20 10:37:55 -07:00
ericrius1
dbec1aad0c
line entity points are now local to entity position. Changed paint script to reflect this
2015-06-19 18:54:28 -07:00
David Rowe
0b13accf94
Merge branch 'master' into addressbar-tidy
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2015-06-19 17:42:27 -07:00
Ryan Huffman
1371f775ee
Add mutex lock around access to Model::_calculatedMeshPartOffset
2015-06-19 16:51:13 -07:00
Ryan Huffman
a7f291154b
Add lock around recalculateMeshPartOffsets call
2015-06-19 16:28:58 -07:00
Seth Alves
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Seth Alves
6deedd19a3
zero velocities when we clear simulatorID
2015-06-19 16:19:21 -07:00
Niraj Venkat
482f12be8c
Returning ref to stack to view controller
2015-06-19 16:05:45 -07:00
bwent
c315bcec24
Expose mouseDoublePressEvents to js
2015-06-19 15:52:27 -07:00
Ryan Huffman
1734d5e584
Fix recalculateMeshBoxes being called outside of mutex
2015-06-19 15:05:55 -07:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Howard Stearns
7cf7f0df1a
Remove #include that was introduced in version 1 that is not needed in final.
2015-06-19 14:38:43 -07:00
Howard Stearns
b506fe0f1d
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
2015-06-19 14:22:04 -07:00
Howard Stearns
dc10e15e96
Put the common stuff on AudioInjector rather than AudioClient, so that assignment-client (which depends on script-engine) does not need to depend on audio-client.
2015-06-19 14:20:00 -07:00
Niraj Venkat
054e12a315
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-19 11:22:50 -07:00
Niraj Venkat
1494aa4faa
Adding new icon and getters
2015-06-19 11:18:16 -07:00
Ryan Huffman
35f9d49c06
Fix DrawOverlay3D::getOpaquePipeline invalid signature
2015-06-19 10:47:25 -07:00
Ryan Huffman
665baff665
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2
Move circle3d and text overlays to batches
2015-06-19 09:45:13 -07:00
Seth Alves
89ec3c21b4
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-19 09:36:11 -07:00
Seth Alves
fca06d9d3d
add actionData to properties that EntityItem transmits and receives
2015-06-19 09:36:06 -07:00
Sam Gateau
873955b17e
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-06-19 18:02:56 +02:00
Clément Brisset
5192796851
Merge pull request #5168 from samcake/daft
...
Improving the rendering job architecture
2015-06-19 18:00:39 +02:00
Sam Gateau
2920197e88
Merge branch 'daft' of https://github.com/samcake/hifi into punk
2015-06-19 17:48:07 +02:00
Sam Gateau
b0f5990bd7
fix syntax
2015-06-19 17:13:29 +02:00
Atlante45
9c7f24eeb6
Add culled option for simple programs
2015-06-19 16:50:38 +02:00
Sam Gateau
5a2d2485c0
Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque
2015-06-19 16:30:48 +02:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Seth Alves
fce551099f
first stab at sending action data across wire
2015-06-18 18:32:57 -07:00
ericrius1
0e177a3e31
deleted unnessary line break
2015-06-18 18:23:09 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
ericrius1
7293330ced
fixed indentation and lines delete when user exits to help with large model.svo/json file size
2015-06-18 18:17:02 -07:00
ericrius1
830a8b6909
checking for bounds and modified paint script to start a new line entity if user paints outside of line entity's bounding box
2015-06-18 18:14:03 -07:00
Seth Alves
32cf669d8b
moving toward sending actions over wire
2015-06-18 17:51:41 -07:00
David Rowe
709508857c
Delete maximum rolling backup file if it exists before rolling backup
2015-06-18 17:39:31 -07:00
Philip Rosedale
2f080a8e29
Merge pull request #5147 from sethalves/more-actions
...
offset action
2015-06-18 17:35:50 -07:00
Brad Davis
8e5da5acaa
Fix debug compile error
2015-06-18 17:05:49 -07:00
ericrius1
8183e7393d
adding check for points inside bounds'
2015-06-18 17:00:27 -07:00
ericrius1
6a5deaaef1
returning true from set line points
2015-06-18 16:54:39 -07:00
Seth Alves
5e80868fe0
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 16:31:07 -07:00
Seth Alves
c9a7136d51
Merge pull request #5162 from PhilipRosedale/smoother
...
Smoother motion for physical objects as viewed by remote observer
2015-06-18 16:30:34 -07:00
ericrius1
2b4146125f
adding logic to check points of line are inside bounds
2015-06-18 16:27:06 -07:00
Seth Alves
816726efdc
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 15:33:46 -07:00
Seth Alves
021dc64789
merge from upstream
2015-06-18 15:03:09 -07:00
Seth Alves
3c90c851e9
start on code to de/serialize actions
2015-06-18 15:01:34 -07:00
Andrew Meadows
d88d9b2b88
Merge pull request #5141 from sethalves/overloaded-virtual
...
use -Woverloaded-virtual with g++. quiet compiler warnings
2015-06-18 14:58:47 -07:00
Philip Rosedale
61a2196a30
Reduce error tolerances for ballistic prediction that trigger updating the server
2015-06-18 13:21:37 -07:00
Seth Alves
99afd07395
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 12:45:40 -07:00
Philip Rosedale
e46a820872
remove debug
2015-06-18 12:37:50 -07:00
Philip Rosedale
bffc1a38a7
Separate DC offset rejection, and call it all the time
2015-06-18 12:33:05 -07:00
Brad Davis
0cdee2d6ec
preprocessor error on Linux/Mac
2015-06-18 12:14:55 -07:00
Sam Gateau
fb42613344
Fixing transparency that i just broke
2015-06-18 20:25:51 +02:00
Brad Hefta-Gaub
b008b810e1
Merge pull request #5145 from Atlante45/text
...
Bring back display names
2015-06-18 11:25:45 -07:00
Seth Alves
1e3681462c
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 11:20:59 -07:00
David Rowe
1047703718
Tidy address bar code
...
Re-enable and reposition mouse drag areas
Remove unused graphics assets
Remove unused includes
2015-06-18 11:18:56 -07:00
Howard Stearns
37d6e21ce3
Merge branch 'master' of https://github.com/highfidelity/hifi into refactor-playSound
2015-06-18 11:16:16 -07:00
Seth Alves
7d707447ca
move multi-line function out of header
2015-06-18 11:07:50 -07:00
Seth Alves
97eeb20625
Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual
2015-06-18 11:04:24 -07:00
Howard Stearns
fdf5860c4f
Refactor playSound.
2015-06-18 10:39:58 -07:00
Seth Alves
53b5c8e6e7
more merge fallout
2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c
actionEvent signal, captureActions, began work on hmdControls.js
2015-06-18 09:52:36 -07:00
ZappoMan
383a2c3d63
another attempt
2015-06-18 09:43:39 -07:00
ZappoMan
673e1ee0cc
first cut and removing openGl dependency in shared
2015-06-18 09:30:34 -07:00
Seth Alves
992c253a42
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 07:35:31 -07:00
Atlante45
26e8c490c3
constexpr not handled on windows
2015-06-18 15:23:54 +02:00
Atlante45
5166d833a7
Make array size a constexpr
2015-06-18 15:23:53 +02:00
Atlante45
30fbd37645
Transmit normal to text rendering shader
2015-06-18 15:23:52 +02:00
Atlante45
1cab853f18
Better guard Transform scale
2015-06-18 15:23:50 +02:00
Atlante45
8a3a7e5b7f
Reorder triangle strip
2015-06-18 15:23:50 +02:00
Atlante45
a9d2bb1e1c
Coding standard
2015-06-18 15:23:50 +02:00
Atlante45
254f05072f
Fix inverted if
2015-06-18 15:23:49 +02:00
Atlante45
70a020c7e3
BevelRect use triangle strips
2015-06-18 15:23:49 +02:00
Atlante45
d7b9a1b032
Cleanup TextRenderer3D methods args
2015-06-18 15:23:49 +02:00
Atlante45
47634a48a6
Make renderDisplayName const
2015-06-18 15:22:49 +02:00
Atlante45
ca98b378df
Adjust sdf frag shader alpha correctly
2015-06-18 15:22:49 +02:00
Atlante45
bdaf8a8a32
Fix bevel quads
2015-06-18 15:22:48 +02:00
Atlante45
e8e1f81880
Make Batch copy constructor explicit
2015-06-18 15:22:48 +02:00
Atlante45
a486ed1a57
Add _glUniform1i to Batches
2015-06-18 15:22:48 +02:00
samcake
89fe1c47be
preping for debug the jobs
2015-06-18 13:02:06 +02:00
Brad Davis
5c4fa77acd
Merge branch 'temp' into overlay
2015-06-18 00:59:31 -07:00
Brad Davis
d9452cfd2e
Merge branch 'gpu-error-tweak' into overlay
2015-06-18 00:54:48 -07:00
Brad Davis
dfea571e62
Removing a 'using namespace' from a header and tweaking error checking code
2015-06-18 00:54:35 -07:00
Brad Davis
a83a4fb0a1
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-17 19:53:31 -07:00
Seth Alves
c6a0630aa5
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-17 19:10:37 -07:00
Seth Alves
eb89835d42
Merge branch 'master' of github.com:highfidelity/hifi into fix-line-data-handling
2015-06-17 18:35:00 -07:00
Seth Alves
610bfc63e8
check success in OctreePacketData::appendValue for qvectors of vec3s before proceeding with further data appends
2015-06-17 18:34:46 -07:00
Seth Alves
8735fa1eac
have variantMapToScriptValue handle lists.
2015-06-17 18:33:43 -07:00
Brad Hefta-Gaub
4501fb1d61
Merge pull request #5073 from jherico/ovr6
...
Support Oculus SDK version 0.6 on windows only
2015-06-17 18:17:34 -07:00
Brad Hefta-Gaub
d1777e0231
Merge pull request #5153 from jherico/fix-gl-matrix
...
Preserve the GL matrix stack when running batch commands
2015-06-17 17:14:25 -07:00
Bradley Austin Davis
4633cabcec
Merge remote-tracking branch 'upstream/master' into ovr6
2015-06-17 17:07:43 -07:00
Brad Hefta-Gaub
d4f4580a7c
Merge pull request #5152 from sethalves/fix-build
...
fix debug build
2015-06-17 16:27:58 -07:00
David Rowe
6623d0c552
Add "Reload" button associated with entity editor's script URL field
...
The Reload button re-downloads the script for both the editor and for
everyone in the vicinity.
2015-06-17 16:11:32 -07:00
David Rowe
67206332e6
Make individual reload buttons reload scripts
2015-06-17 16:11:30 -07:00
David Rowe
f220d40bb8
Re-download scripts upon Reload All
2015-06-17 16:11:25 -07:00
Bradley Austin Davis
1705eb8f80
Reverting some changes, putting overlay rendering in its own state manager
2015-06-17 16:08:19 -07:00
Brad Davis
f2261b5ed5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:34:50 -07:00
Brad Davis
2ab3f42c6a
Merge pull request #5124 from venkatn93/master
...
New address bar with forward and back buttons
2015-06-17 15:33:10 -07:00
Seth Alves
15f156fcd2
Merge branch 'fix-build' of github.com:sethalves/hifi into actions-over-wire
2015-06-17 15:18:39 -07:00
Seth Alves
fbfa73af2d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-17 15:18:17 -07:00
Brad Davis
c8cc3a46b3
Merge remote-tracking branch 'origin/fix-gl-matrix' into overlay
2015-06-17 15:13:35 -07:00
Brad Davis
ae1c9603b9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 15:13:04 -07:00
Seth Alves
68df6b662d
fix ifdefs around asserts
2015-06-17 15:03:09 -07:00
Bradley Austin Davis
a27e06713b
Preserve the GL matrix stack when running batch commands
2015-06-17 14:57:14 -07:00
Seth Alves
44bb220130
fix debug build
2015-06-17 14:54:13 -07:00
Seth Alves
9a51a4c5b1
fix debug build
2015-06-17 14:48:37 -07:00
Seth Alves
22ac61e476
work around hiding of virtual functions in PolyVox entity classses
2015-06-17 14:40:24 -07:00
ZappoMan
f2ba91383c
fix some warnings
2015-06-17 14:26:36 -07:00
Seth Alves
59389ce506
Merge branch 'master' of github.com:highfidelity/hifi into overloaded-virtual
2015-06-17 14:18:47 -07:00
ZappoMan
58ee5217e3
fix some warnings
2015-06-17 14:08:02 -07:00
Niraj Venkat
9b9aba48f0
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-17 13:50:30 -07:00
Philip Rosedale
196a1546ab
Merge pull request #5135 from howard-stearns/not-clipped-local-sounds
...
Don't clip local audio sounds
2015-06-17 13:37:56 -07:00
Seth Alves
ac491dabdb
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-17 13:20:14 -07:00
Bradley Austin Davis
2172445db7
Merge remote-tracking branch 'upstream/master' into ovr6
2015-06-17 12:56:41 -07:00
Brad Davis
4282c044ef
Working on mirror and overlay
2015-06-17 12:01:39 -07:00
Howard Stearns
b4dfaba55e
Incorporate ctrlaltdavid's changes.
2015-06-17 11:59:15 -07:00
Seth Alves
3e758a8f43
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-17 11:53:12 -07:00
Seth Alves
85564199c6
git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point
2015-06-17 11:22:10 -07:00
Stephen Birarda
bc20ea6ed2
fix for path handling on return of place info
2015-06-17 11:18:43 -07:00
Brad Davis
5ded9e7eb9
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-17 10:50:01 -07:00
Philip Rosedale
8b8f0bcbde
Merge pull request #5132 from sethalves/polyvox
...
Polyvox fixes
2015-06-17 10:49:35 -07:00
Clément Brisset
d67d350e72
Merge pull request #5143 from ZappoMan/atmosphereBatchFix
...
Change atmospheres to render using batch compatible pipeline and shaders
2015-06-17 19:48:11 +02:00
Clément Brisset
42a5ddd116
Merge pull request #5144 from birarda/master
...
make goToUser public again
2015-06-17 19:27:29 +02:00
Stephen Birarda
dc4ae082f8
make goToUser public again
2015-06-17 10:13:53 -07:00
ZappoMan
fb59939cf4
CR feedback
2015-06-17 10:02:02 -07:00
ZappoMan
e9bf553254
CR feedback
2015-06-17 09:59:38 -07:00
ZappoMan
689e10cc27
build buster fix
2015-06-17 09:53:50 -07:00
ZappoMan
af5a910f58
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix
2015-06-17 09:36:16 -07:00
ZappoMan
8162c37013
cleanup
2015-06-17 09:33:15 -07:00
ZappoMan
268bb370cc
cleanup
2015-06-17 09:24:42 -07:00
ZappoMan
0e18c75b0b
cleanup
2015-06-17 09:23:12 -07:00
ZappoMan
ea98581d22
reorganize files to cleanup headers
2015-06-17 09:18:00 -07:00
Sam Gateau
3176c8e93c
polish before PR
2015-06-17 17:09:33 +02:00
samcake
febc3333cd
Solving the rendering of textured overlay3d
2015-06-17 16:50:35 +02:00
samcake
d703748ec3
trying to solve the rendering of overlay3d
2015-06-17 16:44:02 +02:00
Seth Alves
f5cea57a48
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-06-17 07:20:15 -07:00
Seth Alves
0ec7d3ded8
fix some float/double jumble
2015-06-17 07:02:54 -07:00
Sam Gateau
5c547037f2
Migrating the overaly 3d rendering in their own job and their own shader
2015-06-17 15:54:20 +02:00
samcake
cc65ad3ffb
IMproving the JOb interface
2015-06-17 15:52:11 +02:00
Brad Davis
2bf53b625e
Working on overlays and stats
2015-06-17 02:00:13 -07:00
Seth Alves
b8cf4ea29d
use -Woverloaded-virtual with g++. quiet compiler warnings
2015-06-16 21:19:31 -07:00
Brad Davis
4762e1a00c
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-16 21:01:00 -07:00
Brad Davis
659fa2387c
Working on overlays / stats
2015-06-16 21:00:13 -07:00
ZappoMan
569971582d
more hacking on trying to port atmospheres to the new pipeline
2015-06-16 18:39:35 -07:00
Seth Alves
2ad25a2386
Merge branch 'master' of github.com:highfidelity/hifi into float-vs-double
2015-06-16 18:25:38 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
ZappoMan
722ac618f5
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix
2015-06-16 17:08:15 -07:00
Niraj Venkat
5fcf8e5922
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-16 16:34:38 -07:00
Seth Alves
0ef75da5d5
Merge pull request #5139 from ZappoMan/fixRayPicking
...
fix FPS while still maintaining ray picking
2015-06-16 16:17:42 -07:00
ZappoMan
6f0ae96f56
fix warning
2015-06-16 16:01:01 -07:00
Brad Hefta-Gaub
dfc3664469
Merge pull request #5131 from ericrius1/particleFix
...
fixed particles not showing up by fixing billboarding code to account…
2015-06-16 15:58:40 -07:00
ZappoMan
5abd608ccc
fix typo
2015-06-16 15:55:37 -07:00
ZappoMan
1beb95cfe7
fix FPS while still maintaining ray picking
2015-06-16 15:38:16 -07:00
Seth Alves
49a68b4565
Merge pull request #5137 from murillodigital/auto-updater
...
Fixing bug on platforms for which we don't release
2015-06-16 15:31:48 -07:00
ZappoMan
167e7d1377
first cut at atmospheres in batch (doesn't work)
2015-06-16 14:05:14 -07:00
Andrew Meadows
7721f6de96
Merge pull request #5134 from birarda/master
...
add goBack and goForward to AddressManager
2015-06-16 13:50:20 -07:00
Leonardo Murillo
80ab2f31f4
typo
2015-06-16 14:49:55 -06:00
Leonardo Murillo
e1fb01e6dd
Fixing bug on platforms for which we don't release
2015-06-16 14:49:19 -06:00
Stephen Birarda
e9bdf7e73a
add missing bools to handleViewpoint call
2015-06-16 13:39:11 -07:00
Stephen Birarda
1af4b1c54c
cleanup handleUrl call, add disabling of Menu items
2015-06-16 13:17:13 -07:00
Leonardo Murillo
917aa5db6d
Code review changes
2015-06-16 13:21:40 -06:00
Brad Davis
02d33f6086
Working on overlay rendering
2015-06-16 12:14:42 -07:00
Leonardo Murillo
6fcdb83d46
Merge branch 'master' of github.com:highfidelity/hifi into auto-updater
2015-06-16 12:54:32 -06:00
Howard Stearns
6d99d50f72
Don't clip local audio sounds ( https://app.asana.com/0/32622044445063/37633564937422 )
...
and quiet some warnings (of https://app.asana.com/0/32622044445063/37620738098871 ).
2015-06-16 10:51:42 -07:00
Seth Alves
d7eddc398b
don't make changes if the polyvox is locked
2015-06-16 10:14:01 -07:00
Brad Davis
4f8ea3f624
Merge remote-tracking branch 'upstream/master' into ovr6
2015-06-16 09:58:20 -07:00
Brad Davis
ba13b7820c
Working on overlay refactor
2015-06-16 09:58:03 -07:00
Niraj Venkat
de13fe85fe
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-16 09:50:37 -07:00
Seth Alves
e98b28c1d8
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-06-16 09:32:53 -07:00
ericrius1
70e042085b
fixed indentation
2015-06-16 09:11:36 -07:00
Stephen Birarda
ef62f7e9f0
fix relative path lookup effect on history
2015-06-16 08:46:04 -07:00
Stephen Birarda
8e46043f14
add fixed back/forward, buttons to menu
2015-06-16 08:41:21 -07:00
Sam Gateau
d1ac3148f0
migrating the transparent pipeline
2015-06-16 17:33:53 +02:00
Sam Gateau
b1ff877af1
trying to improve something ?
2015-06-16 15:56:38 +02:00
Sam Gateau
e4d0090939
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-16 15:01:24 +02:00
Sam Gateau
9be87758fd
Improving the design of the Jobs and varying
2015-06-16 15:00:47 +02:00
Seth Alves
6def25de92
formatting
2015-06-15 16:22:06 -07:00
Brad Davis
07845df4dc
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-15 16:13:51 -07:00
Brad Davis
1bae590389
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
2015-06-15 16:13:02 -07:00
Seth Alves
445381bb6b
fix DEFAULT_VOXEL_DATA, recompress voxel data when a script calls setVoxel. Use provided transform when rendering.
2015-06-15 16:07:28 -07:00
Seth Alves
4a00bd3e7f
quiet compiler
2015-06-15 16:06:20 -07:00
ericrius1
67ed1369cc
fixed indentation
2015-06-15 15:04:38 -07:00
ericrius1
2663e5a876
correct particle count for systems without textures
2015-06-15 14:43:13 -07:00
eric levin
27c6190665
fixed particles not showing up by fixing billboarding code to account for new winding order
2015-06-15 14:24:18 -07:00
ZappoMan
1c3b484466
fix detailed ray picking against models
2015-06-15 12:48:51 -07:00
Seth Alves
5f3b902798
remove debugging print
2015-06-15 11:24:29 -07:00
Seth Alves
c1668553fd
make sure that the root node always appends an entity count (even if it's zero). This keeps the unreasonably-deep-recursion warnings from happening
2015-06-15 11:22:07 -07:00
Leonardo Murillo
c065269ba7
Merging with upstream
2015-06-15 11:58:52 -06:00
Sam Gateau
38694e4f65
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-14 18:56:34 +02:00
Brad Davis
00d8fe75ab
Breaking up overlay into rendering and compositing classes
2015-06-13 17:36:08 -07:00
Brad Davis
49f4ab99df
Revert "Revert "Fix broken identity transforms on OSX""
...
This reverts commit 1feceec0c7
2015-06-13 10:03:10 -07:00
