Seiji Emery
|
14a76525b1
|
script dependency...?
(GeometryCache -> AnimationCache -> networking, fbx, model, animation,
script... >.>)
|
2015-08-21 16:56:26 -07:00 |
|
Seiji Emery
|
6b5fb60fcf
|
Merge remote-tracking branch 'highfidelity/master' into gputest
|
2015-08-19 11:24:15 -07:00 |
|
Seth Alves
|
537b690d60
|
Merge pull request #5566 from howard-stearns/recapitate
Get rid of separate head/body avatar
|
2015-08-19 10:46:05 -07:00 |
|
Andrew Meadows
|
990dce6795
|
Merge pull request #5578 from sethalves/polyvox
Polyvox improvements
|
2015-08-19 10:31:13 -07:00 |
|
Brad Hefta-Gaub
|
f8bdfbb271
|
Merge pull request #5598 from howard-stearns/kill-render-assert
kill render assert
|
2015-08-19 10:30:25 -07:00 |
|
Howard Stearns
|
0a8c1846e9
|
This assert causes dev builds to fail when starting interface.
|
2015-08-19 10:24:31 -07:00 |
|
Brad Davis
|
9e54244101
|
Merge pull request #5597 from highfidelity/revert-5582-bart
Revert "Updating to the new version of the sixense library"
|
2015-08-19 09:45:15 -07:00 |
|
Brad Davis
|
aba7bebf6e
|
Revert "Updating to the new version of the sixense library"
|
2015-08-19 09:44:51 -07:00 |
|
Philip Rosedale
|
d9425100b6
|
Merge pull request #5595 from sethalves/fix-inviso-av
possible fix for invisible other's-avatar bug
|
2015-08-18 21:24:15 -07:00 |
|
Philip Rosedale
|
eef556eeb2
|
Merge pull request #5593 from thoys/20528
CR for Job #20528 - Tool window unavailable in Windows Client.
|
2015-08-18 21:23:14 -07:00 |
|
Brad Hefta-Gaub
|
759732f173
|
Merge pull request #5582 from jherico/bart
Updating to the new version of the sixense library
|
2015-08-18 20:05:25 -07:00 |
|
Brad Hefta-Gaub
|
024c2d2300
|
Merge pull request #5596 from sethalves/fix-enable-av-col-menu-item
make enable-avatar-collisions menu item work again
|
2015-08-18 20:04:28 -07:00 |
|
Seth Alves
|
940390ee46
|
make enable-avatar-collisions menu item work again
|
2015-08-18 19:31:05 -07:00 |
|
Brad Davis
|
7f09df1d0b
|
Fixing external
|
2015-08-18 18:56:01 -07:00 |
|
Brad Davis
|
86e21c91ba
|
Case issues again
|
2015-08-18 18:56:00 -07:00 |
|
Brad Davis
|
eba446e7f6
|
Updating to the new version of the sixense library
|
2015-08-18 18:55:59 -07:00 |
|
Seth Alves
|
5fcbd37e43
|
possible fix for invisible other's-avatar bug
|
2015-08-18 15:45:17 -07:00 |
|
Brad Hefta-Gaub
|
a00eb0ca5d
|
Merge pull request #5592 from jherico/homer
Remove keyboard focus highlight on delete entity
|
2015-08-18 15:25:52 -07:00 |
|
Brad Davis
|
944734fed2
|
Remove focus highlight on delete entity
|
2015-08-18 13:59:39 -07:00 |
|
Brad Hefta-Gaub
|
5c1364ca2a
|
Merge pull request #5590 from ctrlaltdavid/20649
Add further temporary debug for tracking down invalid scale value assert
|
2015-08-18 13:31:23 -07:00 |
|
Seth Alves
|
2dc2757eca
|
code review
|
2015-08-18 13:03:54 -07:00 |
|
Brad Hefta-Gaub
|
984ecb7b1f
|
Merge pull request #5591 from ctrlaltdavid/20656
QA for 20656 - Fix edit toolbar moving to top left of screen
|
2015-08-18 12:44:25 -07:00 |
|
David Rowe
|
f6815c215a
|
Fix edit toolbar moving to top left of screen
|
2015-08-18 10:59:49 -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 |
|
David Rowe
|
00aa336a2b
|
Add further temporary debug for tracking down invalid scale value assert
|
2015-08-18 10:01:00 -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 |
|
Thijs Wenker
|
44399da41c
|
Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever.
|
2015-08-18 14:54:21 +02: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
|
1a71c3cc04
|
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
|
2015-08-17 10:17:58 -07:00 |
|
Seth Alves
|
169bb9f3d9
|
Merge pull request #5580 from jherico/homer
Polyvox shader fix
|
2015-08-17 10:12:27 -07:00 |
|
Seth Alves
|
af11e97daa
|
fix broken optimisation for skipping internal voxels when making collision hull
|
2015-08-17 08:49:00 -07:00 |
|