Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 22:06:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
30248 commits 69 branches 56 tags 1.2 GiB
Commit graph

30248 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
5715042102 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-17 21:53:45 -07:00
Thijs Wenker
29c857f1fa - unitTests for WebSockets + WebSocketServer (added some asynchronous functionality to the unitTest.js library , previous functionality intact) 2015-08-18 03:24:26 +02:00
Thijs Wenker
e43dc3f9fe Completed implementation of WebSocket and WebSocketServer 2015-08-18 03:21:48 +02: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
ZappoMan
014bf661fa bump packet version 2015-08-17 11:18:25 -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
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
Seth Alves
1ee773a532 don't include interrior voxels in cubic collision hull 2015-08-16 14:11:37 -07:00
Seth Alves
c60a8e7dfc minecraft style voxel editing largely works 2015-08-16 12:52:55 -07:00
Seth Alves
a57278ba3c ray-picks against cubic-voxels seem right, now 2015-08-16 11:51:04 -07:00
Seth Alves
4ffb5c9716 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-16 11:05:03 -07:00
Seth Alves
0230d9397c attempt to find exact ray intersection with cubic polyvox -- not working right, yet. 2015-08-16 11:04:52 -07:00
Seth Alves
b129c2a933 in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascript 2015-08-16 09:36:54 -07:00
Seth Alves
6db115bed5 try to make adding and removing voxels work more like expected 2015-08-16 09:36:13 -07:00
Seth Alves
f6cbeb37f8 put a green sphere at the point being pointed to 2015-08-16 09:35:50 -07:00
Seth Alves
558f68c150 increase max polyvox dimension from 32 to 128. don't recompress compressed data unless something changed../../libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp 2015-08-15 16:53:47 -07:00
Seth Alves
c6530c4cec fix newly created polyvox collision-hull bug 2015-08-15 16:16:27 -07:00
Seth Alves
5ecdbaa19d have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoords 2015-08-15 15:18:25 -07:00
Christopher Root
21dc58eb85 Improving readability in shader 2015-08-15 14:40:34 -07:00
Christopher Root
8ea6048ec7 Removing commented out code 2015-08-15 14:31:03 -07:00
Christopher Root
81ea8e8874 Updating some comments and removing unnecessary code 2015-08-15 14:27:08 -07:00