Brad Hefta-Gaub
fb07956689
Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
...
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Sam Gateau
6b229d8d2d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-09 03:45:55 -07:00
Sam Gateau
8314fe8c7f
FInally getting a nice spot light volume working for all angles
2015-07-09 03:45:19 -07:00
Brad Davis
63dfd570f1
Adding priority support to GenericThread
2015-07-08 22:54:31 -07:00
Brad Davis
08d1364f81
Move file log persistence to a separate thread
2015-07-08 22:35:23 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Brad Hefta-Gaub
02c3b63f45
Merge pull request #5282 from jherico/entity_parsing
...
Working on fixing entity item parsing
2015-07-08 21:02:23 -07:00
Brad Davis
b173ac397c
Merge pull request #5278 from samcake/yellow
...
Adding more NSight instrumentation
2015-07-08 20:28:18 -07:00
Brad Davis
f2beb79d23
Updating buffer parser to use new heapless API
2015-07-08 18:54:38 -07:00
Brad Davis
49a14e3446
Merge remote-tracking branch 'upstream/master' into entity_parsing
2015-07-08 18:37:41 -07:00
Brad Davis
625cc86f83
Merge pull request #5283 from ZappoMan/optimizeByteCountCoded
...
Optimize ByteCountCoded<> to not do extra heap allocations
2015-07-08 18:35:02 -07:00
Atlante45
ee3a8b1b6e
Clear resource caches instead of restarting
2015-07-08 18:23:16 -07:00
ZappoMan
7790e35d24
added bytes consumed result to decode, and exit early after bytes consumed
2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52
Fixing template specialization compilation error on gcc/clang
2015-07-08 18:17:03 -07:00
ZappoMan
c0cdf3256c
comment and dead code
2015-07-08 17:34:36 -07:00
ZappoMan
e885ac1821
improved performance of ByteCountCoding<> decode
2015-07-08 17:32:51 -07:00
Brad Davis
98e0688e98
Reducing heap allocation in network packet parsing
2015-07-08 17:21:38 -07:00
Niraj Venkat
58f127f299
Fixing names of GL enums
2015-07-08 17:17:31 -07:00
Bing Shearer
25a1108b61
Fixed spelling error
2015-07-08 16:24:23 -07:00
Niraj Venkat
1894b42773
Added EXT support for Mac GL Query calls
2015-07-08 16:11:36 -07:00
Niraj Venkat
4478d76618
attempt #3 - fixing ubuntu build
2015-07-08 15:28:25 -07:00
Niraj Venkat
250d2e9e2c
attempt #2 to fix jenkins build error
2015-07-08 15:14:28 -07:00
ZappoMan
6a9344a3f6
fix bug in old version of decode
2015-07-08 15:14:24 -07:00
Sam Gateau
4c44eb63da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-08 14:25:41 -07:00
Sam Gateau
f992e875b4
Adding intrsumentation for nsight and hiding the nsight specific code in cpp
2015-07-08 14:25:13 -07:00
Niraj Venkat
a6ec668b2e
attempt #1 to fix jenkins build error
2015-07-08 14:24:24 -07:00
Andrew Meadows
58c32dbf20
remove whitespace from end of lines
2015-07-08 11:30:04 -07:00
Niraj Venkat
d2af313adf
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuquery
2015-07-08 10:01:47 -07:00
Niraj Venkat
7e59be6196
First take oon the query for the gpu
2015-07-08 10:00:58 -07:00
Andrew Meadows
a0a1b01ea9
coalesce dupe action data members: _id and _type
2015-07-07 17:50:08 -07:00
Andrew Meadows
e9df8cacc7
make some arguments const, cleanup some #includes
2015-07-07 17:50:08 -07:00
Andrew Meadows
77bd7b2821
some ObjectAction methods should be const
2015-07-07 17:50:08 -07:00
Andrew Meadows
f1b505d46b
Merge pull request #5266 from howard-stearns/expose-avatar-collisions-to-scripts
...
Expose avatar collisions to scripts, ...
2015-07-07 16:12:18 -07:00
ZappoMan
20a9227070
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-07 13:16:42 -07:00
Howard Stearns
1c2972bd7c
Expose avatar collisions to scripts, and include velocityChange in exposed collision data.
2015-07-07 11:49:55 -07:00
samcake
5557dc4da2
clean and release the new deferredLIghtingEffect
2015-07-07 10:00:05 -07:00
ZappoMan
a59fd44014
quiet some log spam
2015-07-07 09:04:20 -07:00
Atlante45
687f9dda4a
Restore old offset behaviors
2015-07-06 18:21:17 -07:00
Atlante45
541d9ae431
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard
2015-07-06 18:05:43 -07:00
Brad Davis
bd938d5f4c
Merge pull request #5263 from ZappoMan/inBoundStats
...
Additional inbound entity stats
2015-07-06 17:12:19 -07:00
ZappoMan
05f28064bf
add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor
2015-07-06 16:03:42 -07:00
samcake
c090bd0bd7
Merge branch 'yellow' of https://github.com/samcake/hifi into daft
2015-07-06 15:46:21 -07:00
samcake
9649fe45e4
fix a bad paintRainbow function in the shader...
2015-07-06 15:45:26 -07:00
Sam Gateau
fe633cd545
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-06 15:04:02 -07:00
samcake
a2f6693bd7
getting the deferred lighting to work
2015-07-06 14:40:10 -07:00
Sam Gateau
4d48b98364
For a fistfull of magic numbers
2015-07-06 14:22:09 -07:00
Sam Gateau
95f5b14d45
CLenaing the interface of Item::Status to be more explicit and removing magic numbers
2015-07-06 12:47:35 -07:00
Sam Gateau
e63be58251
CLenaing the interface of Item::Status to be more explicit
2015-07-06 12:23:57 -07:00
Sam Gateau
2bbffff22f
Fixing typos
2015-07-06 10:22:25 -07:00
samcake
76e661f88d
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-07-05 12:08:56 -07:00
ZappoMan
c4a5160b89
CR feedback
2015-07-04 19:13:35 -07:00
Atlante45
c61bf34200
Use depth bias to avoid z-fighting on text entities
2015-07-04 18:35:00 -07:00
Atlante45
0093403bba
Add depth bias option to simple programs
...
Simple programs are now lazily generated and stored in a hash
2015-07-04 18:33:03 -07:00
Atlante45
d243190caf
Coding standard
2015-07-04 16:06:39 -07:00
Atlante45
0eb89efb34
Fix text entity billboarding
2015-07-04 16:06:38 -07:00
ZappoMan
40cdd8646e
add packets per second to octree processing stats
2015-07-03 15:53:53 -07:00
ZappoMan
2aa345dfc6
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-03 15:04:59 -07:00
samcake
4019a216d4
Fixed the viewport expressed in int not getting to the shader, needed to be convert to float
2015-07-03 12:12:54 -07:00
samcake
84b70fbaca
Mergin yellow with the Status bar rendering into Daft cwith the switch to batch for deferred pass
2015-07-03 11:36:19 -07:00
ZappoMan
29a7584ee6
remove dead code
2015-07-03 11:29:59 -07:00
Sam Gateau
e3c06a30a1
removing dead code
2015-07-02 19:29:09 -07:00
ZappoMan
e1530b3ce9
added a FIXME STUTTER note
2015-07-02 18:15:24 -07:00
samcake
f9562bedd9
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 18:14:45 -07:00
Sam Gateau
76ca093e05
something working ?
2015-07-02 18:12:03 -07:00
Stephen Birarda
812b18c74e
Merge pull request #5205 from SeijiEmery/unit-tests
...
Unit tests
2015-07-02 20:58:09 -04:00
samcake
0c55130548
maybe i have solved the passing of the status
2015-07-02 17:31:29 -07:00
ZappoMan
a54cf67064
add stats for processing time per packet
2015-07-02 17:28:53 -07:00
ZappoMan
8916dd2056
add stats for elements and entities per second
2015-07-02 17:00:35 -07:00
ZappoMan
0c0b8dbbc1
add stats for elements and entities per incoming packet
2015-07-02 16:19:13 -07:00
Sam Gateau
dcd61fd417
improvment ?
2015-07-02 16:13:54 -07:00
Sam Gateau
79be37f78f
improvment ?
2015-07-02 16:00:56 -07:00
Sam Gateau
bf052162bb
improvment ?
2015-07-02 15:53:02 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
Sam Gateau
be8fe25338
Trying to finalize the look and behavior of th estatus indicators
2015-07-02 15:06:07 -07:00
ZappoMan
b568e895ec
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
ZappoMan
5c4d4893de
added bytes per edit stats
2015-07-02 13:44:28 -07:00
ZappoMan
63b585da0f
added updates per second stat
2015-07-02 13:28:12 -07:00
Leonardo Murillo
9440546619
Don't display update dialog if this is a PR build
2015-07-02 14:17:36 -06:00
ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -07:00
samcake
faea97d3c7
Merge pull request #5221 from Atlante45/web
...
Fix Web entities
2015-07-02 10:45:20 -07:00
Brad Hefta-Gaub
f16b8d5083
Merge pull request #5246 from jherico/inter_idle_timing
...
Instrument the inter-idle time and tweaking the timeout setting
2015-07-02 09:01:44 -07:00
Seth Alves
b19d505fc1
remove stray debug print
2015-07-01 20:32:45 -07:00
Seth Alves
246861221c
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
2015-07-01 20:17:21 -07:00
Sam Gateau
d019ef4373
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 18:12:11 -07:00
samcake
3564499824
Merge pull request #5249 from ZappoMan/entityServerEditStats
...
add more detailed edit timing to entity server
2015-07-01 18:11:19 -07:00
Niraj Venkat
23979cce8f
Merge branch 'yellow' of https://github.com/samcake/hifi into stats
2015-07-01 17:31:15 -07:00
Niraj Venkat
ee998d0c74
Icon size is a pixel if the inStatus is -1
2015-07-01 17:30:50 -07:00
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Niraj Venkat
219bcd19ed
Status bar update
2015-07-01 16:40:42 -07:00
Brad Davis
59027959b8
CR comments and fixing the average calculation
2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
b4f04af66f
Merge pull request #5242 from jherico/packet_processing
...
Eliminate per-packet locking for processing
2015-07-01 16:11:27 -07:00
ZappoMan
24b4614703
add more detailed edit timing to entity server
2015-07-01 16:11:08 -07:00
Brad Davis
1d16d80c0c
Comments from CR
2015-07-01 14:55:24 -07:00
Brad Davis
1e1f199fdb
Undoing unwisdom
2015-07-01 14:54:26 -07:00
Brad Davis
4c200d75bc
Tweaking packet processing locking
2015-07-01 14:53:08 -07:00
samcake
b23f68107c
Adding the gpu_shader4 for linux and fixing function name for mac
2015-07-01 14:52:23 -07:00
Sam Gateau
93303a02ec
Merge branch 'stats' of https://github.com/venkatn93/hifi into yellow
2015-07-01 14:22:40 -07:00
Sam Gateau
dfa6b03a6b
Making the first statusGetter noitify
2015-07-01 14:20:35 -07:00
Niraj Venkat
32042884c7
Merging sam/yellow
2015-07-01 14:07:36 -07:00
Clément Brisset
93d51717ce
Merge pull request #5201 from ctrlaltdavid/20590
...
QA for #20590 - Delete Interface.ini.lock file at start-up if it exists
2015-07-01 13:54:02 -07:00
Seth Alves
6e3cab9f4d
fix logic problem with previous fix
2015-07-01 12:37:15 -07:00
Seth Alves
593ed9f998
work around problem where EntityItem::setActionData is called before the entity tree is set up
2015-07-01 12:26:51 -07:00
Seth Alves
e8a6acd65b
responses to code review
2015-07-01 10:42:04 -07:00
Seth Alves
5e2f7204b4
responses to code review
2015-07-01 10:29:42 -07:00
Brad Davis
d4d6f8f5d5
Eliminate per-packet locking for processing
2015-07-01 10:06:04 -07:00
Sam Gateau
63e3d0e741
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 07:48:37 -07:00
Sam Gateau
2f04a9d3da
refining the shader pipeline and trying to pass a Status Getter from the model and fails
2015-07-01 07:47:46 -07:00
Seth Alves
a356cbf620
remove commented code
2015-07-01 07:33:46 -07:00
Seth Alves
b7e9056c04
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership
2015-07-01 07:33:29 -07:00
Seth Alves
6e7973f5b9
coding-standard / code-review
2015-06-30 19:28:22 -07:00
Seth Alves
f4bbbcbec7
try to explain action class hierarchy in a comment
2015-06-30 19:05:34 -07:00
Niraj Venkat
a33a76ac27
Merge branch 'yellow' of https://github.com/samcake/hifi into stats
2015-06-30 16:12:56 -07:00
Niraj Venkat
aa55de46c2
Drawing full bounding box
2015-06-30 16:09:45 -07:00
Sam Gateau
8bd5e15f73
Exposing the viewport to the shader and have a first draft of the draw status pipeline
2015-06-30 14:43:57 -07:00
Niraj Venkat
2f2d5815db
Merge branch 'master' of https://github.com/highfidelity/hifi into stats
2015-06-30 14:13:03 -07:00
Niraj Venkat
0ea2774d6e
Merge branch 'yellow' of https://github.com/samcake/hifi into stats
2015-06-30 10:46:07 -07:00
Seth Alves
a300dec1f7
update entity data bytes whenever it's asked for
2015-06-30 10:42:34 -07:00
Seth Alves
505332c367
include action data among physics initiated network updates from interface to entity-server
2015-06-30 10:19:03 -07:00
Seth Alves
7d7e3769f6
suppress a log message
2015-06-30 09:56:15 -07:00
Ryan Huffman
abab284f38
Merge pull request #5235 from ericrius1/lineTransform
...
line entities can now be properly rotated using rotation property
2015-06-30 09:30:01 -07:00
Sam Gateau
20cb519c14
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
2015-06-30 08:19:00 -07:00
Seth Alves
c3747ab8aa
initialize some variables
2015-06-29 19:40:57 -07:00
Seth Alves
88fc74374b
if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol
2015-06-29 19:27:10 -07:00
Seth Alves
0a734c9d3d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership
2015-06-29 16:56:04 -07:00
Seth Alves
fbede0a23f
guard against feeding bullet a NaN
2015-06-29 15:54:24 -07:00
Niraj Venkat
d7791982ac
Starting stats branch
2015-06-29 15:19:50 -07:00
Seth Alves
9b7ea19087
include action type in arguments delivered to scrips
2015-06-29 14:33:58 -07:00
Seth Alves
c539d9f233
allow for removal and readdition of an action in one time-slice without asserting
2015-06-29 12:22:06 -07:00
Seiji Emery
374150a39f
Merge https://github.com/highfidelity/hifi
2015-06-29 11:56:50 -07:00
ericrius1
843ab6d5e3
line entities can now be properly rotated using rotation property
2015-06-29 11:08:09 -07:00
Brad Davis
5cfa22396c
Merge pull request #5219 from venkatn93/master
...
Changing tooltip reticle
2015-06-29 10:51:16 -07:00
Seth Alves
3e88e1f400
unbungle merge
2015-06-29 10:04:27 -07:00
Seth Alves
1d122060a6
merge andrew's sim-ownership branch
2015-06-29 09:50:38 -07:00
Andrew Meadows
513285a00e
use macros for packing/unpacking QByteArray
2015-06-29 07:27:34 -07:00
Andrew Meadows
769755e30a
recycle PROP_SIMULATOR_ID
2015-06-29 06:20:14 -07:00
Seth Alves
0970f010a4
provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are
2015-06-27 13:31:00 -07:00
Seth Alves
c0c1116c69
attempt some clean-ups in edge/unexpected situations
2015-06-27 11:09:28 -07:00
Seth Alves
aa3c7eac9b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-27 10:12:59 -07:00
Seth Alves
30be515a94
remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity
2015-06-27 08:53:27 -07:00
samcake
fefe34e558
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-27 06:48:55 -07:00
samcake
1b69b38835
fix shader issue on mac
2015-06-27 06:34:58 -07:00
Andrew Meadows
426b343e2c
remove cruft canAppendBytes() method
2015-06-26 23:12:48 -07:00
Andrew Meadows
4d4b97fe59
add priority promotion to reduce volunteer races
...
also fix priority inheritance from chained collisions
2015-06-26 22:30:06 -07:00
Brad Hefta-Gaub
9b42221123
Merge pull request #5216 from ctrlaltdavid/comment-update
...
Improve entity properties list code comment
2015-06-26 22:21:39 -07:00
Andrew Meadows
f274958beb
fix bad merge during rebase
2015-06-26 22:13:06 -07:00
Andrew Meadows
e18506c77f
promote volunteer priority
...
also remove some cruft
change uint8_t to be quint8
2015-06-26 22:00:43 -07:00
Andrew Meadows
d6c69e8fe6
pack terse update parameters near each other
...
also don't constantly resend ownership data
2015-06-26 22:00:43 -07:00
Andrew Meadows
ff67b54f87
don't read terse update data for objs we own
2015-06-26 21:58:40 -07:00
Andrew Meadows
1ba937eab9
fix bug in streaming of SimulationOwner class
2015-06-26 21:58:40 -07:00