Seth Alves
|
fd84893c61
|
build separate debug and release versions of polyvox library
|
2015-07-15 09:42:26 -07:00 |
|
Seth Alves
|
316c322118
|
build separate debug and release versions of polyvox library
|
2015-07-15 09:36:51 -07:00 |
|
Brad Davis
|
b18dd54c10
|
Merge pull request #5331 from samcake/punk
Caching the input buffers' gpuObject in GLBackend
|
2015-07-15 06:57:13 -07:00 |
|
samcake
|
c9112966ba
|
revert debug code
|
2015-07-14 22:00:32 -07:00 |
|
Sam Gateau
|
98a3141e11
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2015-07-14 18:38:21 -07:00 |
|
Sam Gateau
|
440464f884
|
Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile
|
2015-07-14 18:35:11 -07:00 |
|
Brad Davis
|
1e6c2e737a
|
Merge pull request #5328 from ZappoMan/removeNakeGL
removing Naked GL calls
|
2015-07-14 18:25:38 -07:00 |
|
ZappoMan
|
47dad82d50
|
removed dead code
|
2015-07-14 18:09:58 -07:00 |
|
samcake
|
de9f97d675
|
Merge pull request #5327 from ZappoMan/master
Remove the NodeBounds feature
|
2015-07-14 18:06:07 -07:00 |
|
ZappoMan
|
f1b85aefa9
|
more dead code removal: NodeBounds
|
2015-07-14 17:59:20 -07:00 |
|
samcake
|
be5ce2114d
|
Merge pull request #5326 from ZappoMan/master
Remove some dead code
|
2015-07-14 17:59:13 -07:00 |
|
ZappoMan
|
23b89a6f7d
|
remove naked gl/dead code from line and cube overlays
|
2015-07-14 17:04:07 -07:00 |
|
ZappoMan
|
d19c7125da
|
remove naked gl calls
|
2015-07-14 16:49:43 -07:00 |
|
ZappoMan
|
bc251de43c
|
delete dead code
|
2015-07-14 16:49:22 -07:00 |
|
Philip Rosedale
|
17ec524253
|
Merge pull request #5324 from ZappoMan/fixLaggingTouch
fix lagging touch events
|
2015-07-14 16:28:00 -07:00 |
|
ZappoMan
|
68f4fe6566
|
fix lagging touch events
|
2015-07-14 16:03:44 -07:00 |
|
Philip Rosedale
|
221a92eeee
|
Merge pull request #5322 from ctrlaltdavid/fix-eye-direction
Fix eye directions so that they're correct when avatar leans backwards
|
2015-07-14 15:38:56 -07:00 |
|
Stephen Birarda
|
6cd584ddd9
|
Merge pull request #5276 from Atlante45/clear_cache_and_restart
Reload content menu item
|
2015-07-14 15:30:33 -07:00 |
|
Atlante45
|
22f0dbdefb
|
CR
|
2015-07-14 15:16:00 -07:00 |
|
David Rowe
|
bfad3ee02a
|
Fix eye directions so that they're correct when avatar leans backwards
|
2015-07-14 14:07:32 -07:00 |
|
Atlante45
|
8fb69ecc96
|
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
|
2015-07-14 13:50:58 -07:00 |
|
Clément Brisset
|
17c6f41db6
|
Merge pull request #5306 from ctrlaltdavid/20606
CR for 20606 - If an external texture isn't found, still display the model
|
2015-07-14 13:49:00 -07:00 |
|
Clément Brisset
|
573b3e3997
|
Merge pull request #5321 from howard-stearns/fst-packager-free-joints
Fix https://app.asana.com/0/32622044445063/39927009585710
|
2015-07-14 13:46:48 -07:00 |
|
Howard Stearns
|
3cd1e318b2
|
Fix https://app.asana.com/0/32622044445063/39927009585710
|
2015-07-14 13:15:24 -07:00 |
|
Atlante45
|
a32f54da2f
|
Cleanup
|
2015-07-14 12:36:18 -07:00 |
|
Atlante45
|
7bf45308b6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart
|
2015-07-14 12:31:37 -07:00 |
|
Seth Alves
|
9b37b83eb6
|
Merge pull request #5320 from AndrewMeadows/barium
fix grab.js when using the spring action
|
2015-07-14 11:02:42 -07:00 |
|
Seth Alves
|
3394c50499
|
Merge pull request #5319 from howard-stearns/sword-update-2
Update sword script for current controller/physics behavior.
|
2015-07-14 10:59:41 -07:00 |
|
Brad Hefta-Gaub
|
f88163b99c
|
Merge pull request #5314 from jherico/homer
Qt 5.5 fixes
|
2015-07-14 10:35:12 -07:00 |
|
Brad Hefta-Gaub
|
049419cec7
|
Merge pull request #5307 from howard-stearns/remove-octreeFades
Remove old octreeFade code that wasn't working anyway
|
2015-07-14 10:24:01 -07:00 |
|
Brad Davis
|
1c8ec3b1c9
|
preventing unused warnings
|
2015-07-14 10:16:06 -07:00 |
|
Howard Stearns
|
5196648b22
|
Remove obsolete enum member.
|
2015-07-14 09:57:19 -07:00 |
|
Howard Stearns
|
c49851cf03
|
Update sword script for current controller/physics behavior.
|
2015-07-14 09:33:08 -07:00 |
|
Andrew Meadows
|
69db9aa01a
|
fix grab transitions between vert and horiz planes
|
2015-07-14 09:24:37 -07:00 |
|
Andrew Meadows
|
7610fe48c2
|
filter action updates during simulation ownership
This fixes a bug where actions can be thrashed (created/deleted)
by late entity update echos from the entity-server.
|
2015-07-14 09:24:37 -07:00 |
|
Brad Davis
|
684d466b44
|
Merge pull request #5308 from venkatn93/avatar
Avatars rendered correctly based on Scene.shouldRenderAvatars
|
2015-07-14 09:06:49 -07:00 |
|
Niraj Venkat
|
ef3c6b25e0
|
More coding standard changes
|
2015-07-14 00:45:38 -07:00 |
|
Niraj Venkat
|
1f1a5f8e75
|
Coding standard and fixing pointers
|
2015-07-13 22:57:11 -07:00 |
|
Philip Rosedale
|
c81053fc83
|
Merge pull request #5318 from samcake/punk
Fixing the ImageOverlay Bug
|
2015-07-13 22:25:46 -07:00 |
|
samcake
|
99ae0326ad
|
FIxing th ecompilation issue on mac, ready to ship
|
2015-07-13 19:17:09 -07:00 |
|
Clément Brisset
|
a432752c39
|
Merge pull request #5316 from ctrlaltdavid/20604
QA for #20604 - Add an "is looking at me" indicator above avatars' heads
|
2015-07-13 16:40:11 -07:00 |
|
David Rowe
|
2bab7d1c03
|
Add parentheses
|
2015-07-13 16:38:51 -07:00 |
|
Sam Gateau
|
f08c608195
|
Remove dead code
|
2015-07-13 16:33:04 -07:00 |
|
Clément Brisset
|
de4a0447f9
|
Merge pull request #5315 from sethalves/fix-pointer.js
update pointer.js to use relative-to-entity line-point ends
|
2015-07-13 16:26:38 -07:00 |
|
Sam Gateau
|
5555ccd225
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2015-07-13 16:19:09 -07:00 |
|
Sam Gateau
|
4743bbad80
|
Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js
|
2015-07-13 16:18:39 -07:00 |
|
Clément Brisset
|
c99382ee74
|
Merge pull request #5287 from ctrlaltdavid/20607
CR for Job #20607 - Interface upgrade message has bad formatting
|
2015-07-13 16:07:17 -07:00 |
|
Clément Brisset
|
24eb4c8263
|
Merge pull request #5309 from sethalves/quiet-compiler
quiet compiler
|
2015-07-13 15:55:35 -07:00 |
|
Clément Brisset
|
fb0dab3bca
|
Merge pull request #5317 from ZappoMan/fixLingeringModels
fix the lingering model parts sometimes left behind when switching domains
|
2015-07-13 15:53:24 -07:00 |
|
ZappoMan
|
5676246d75
|
fix the lingering model parts sometimes left behind when switching domains
|
2015-07-13 15:26:52 -07:00 |
|