Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8496 commits 2 branches 0 tags 1.1 GiB
Commit graph

8496 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
ZappoMan
bb41fe6ddb Merge pull request #1573 from stojce/19484 
Code Review for Job #19484
 2014-01-17 13:25:59 -08:00
ZappoMan
d8ce38a0aa Merge pull request #1576 from Atlante45/master 
Fixed mouseVoxel getting resized all the time when flying over smaller voxels
 2014-01-17 13:24:40 -08:00
stojce
99feb36d19 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 20:57:23 +01:00
Atlante45
08de50f578 Fixed mouseVoxel getting resized all the time when flying over smaller voxel 2014-01-17 20:36:43 +01:00
Brad Hefta-Gaub
43da1edadb more particle work 2014-01-17 11:35:35 -08:00
Philip Rosedale
edc93347d1 Merge pull request #1574 from ey6es/master 
Get rid of code to decay pitch on movement, fix eye rotations.
 2014-01-17 11:24:48 -08:00
Andrzej Kapolka
7a4353428e Fixed eye rotations. 2014-01-17 11:05:26 -08:00
Andrzej Kapolka
515cc5316c Get rid of code to decay pitch on movement. 2014-01-17 10:54:44 -08:00
stojce
13f223ff12 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 19:46:44 +01:00
ZappoMan
ea63f05cd4 Merge pull request #1566 from ey6es/master 
When the mouse is hidden, just look straight forward.
 2014-01-16 17:31:14 -08:00
Andrzej Kapolka
7fcd1ccf29 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-16 17:06:55 -08:00
ZappoMan
a304f5f4fa Merge pull request #1565 from ey6es/debone 
More code removal: face rendering, joints in avatar state messages, etc.
 2014-01-16 17:02:22 -08:00
Andrzej Kapolka
0e7692dfea When the mouse is hidden, just look straight forward. 2014-01-16 16:59:50 -08:00
Andrzej Kapolka
8c6c521b65 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 16:38:07 -08:00
Andrzej Kapolka
c93e70e3cb Merge pull request #1563 from birarda/master 
have muting also mute local loopback, NodeList tweak
 2014-01-16 16:37:47 -08:00
Andrzej Kapolka
4ed8ffd831 Merge pull request #1562 from ZappoMan/bugfixes 
fix 3d mode switch on/off issue
 2014-01-16 16:37:03 -08:00
Stephen Birarda
d85616d690 cleaup matching with node in addOrUpdateNode 2014-01-16 16:14:25 -08:00
Andrzej Kapolka
e7a3beed78 Removed a couple more resources. 2014-01-16 15:17:38 -08:00
Andrzej Kapolka
1b891cb326 Removed unused resources. 2014-01-16 15:16:19 -08:00
Andrzej Kapolka
a16d38ced6 Removed joints from avatar state messages. 2014-01-16 15:07:09 -08:00
Andrzej Kapolka
aa3c18c0ed Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 15:01:39 -08:00
Andrzej Kapolka
2e3c597d40 Scooping out more head bits. 2014-01-16 15:01:24 -08:00
Stephen Birarda
0ddf9520dd if audio is muted don't loopback local audio, fixes #1561 2014-01-16 14:55:09 -08:00
Brad Hefta-Gaub
1cfbfe6611 fix 3d mode switch on/off issue 2014-01-16 14:54:08 -08:00
AndrewMeadows
e538b4cd8d Merge pull request #1559 from ZappoMan/windows_build 
remove glut and clean up windows build cmake
 2014-01-16 14:51:21 -08:00
Andrzej Kapolka
a5bf0493f5 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 14:47:56 -08:00
Andrzej Kapolka
50d224661c Pruning more avatar bits. 2014-01-16 14:47:39 -08:00
Brad Hefta-Gaub
cdfc328f79 remove no longer needed compiler warning disable 2014-01-16 14:38:14 -08:00
Brad Hefta-Gaub
ef98a74ec8 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-16 14:33:44 -08:00
ZappoMan
146af812a0 Merge pull request #1557 from birarda/master 
some more library removal
 2014-01-16 14:32:04 -08:00
Brad Hefta-Gaub
87bb4e691c remove glut and clean up windows build cmake 2014-01-16 14:27:08 -08:00
Andrzej Kapolka
58ee527997 Fix GCC warning (string split across lines). 2014-01-16 14:24:19 -08:00
Stephen Birarda
e8b6f8a7e4 remove docs from glew and freeglut 2014-01-16 14:24:04 -08:00
Andrzej Kapolka
dd732c788e Remove MotionDriver. 2014-01-16 14:20:56 -08:00
Stephen Birarda
495d227950 remove Faceshift here report, Quazip find module 2014-01-16 14:18:27 -08:00
Stephen Birarda
323aa18c0e remove MotionDriver and pthread libraries 2014-01-16 14:16:38 -08:00
stojce
631106beb7 Rename mute menu 2014-01-16 23:10:23 +01:00
Stephen Birarda
04675d8a5c Merge pull request #1555 from ey6es/debone 
Removal of old skeleton code, webcam bits.
 2014-01-16 14:08:02 -08:00
Andrzej Kapolka
cf40e76767 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:55:28 -08:00
Stephen Birarda
c2148d2aea Merge pull request #1554 from ZappoMan/bugfixes 
Fix the issue with voxels randomly disappearing in the client
 2014-01-16 13:55:11 -08:00
Andrzej Kapolka
813c31050a Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:54:55 -08:00
Stephen Birarda
c8b3132895 Merge pull request #1553 from ZappoMan/generic_thread_fix 
fixes leak of GenericThread and also fixes crash in octree servers on client disconnect
 2014-01-16 13:52:09 -08:00
Brad Hefta-Gaub
a1257d1b98 fixed comment that erroneously said wait when it should have said quit 2014-01-16 13:39:55 -08:00
Andrzej Kapolka
90f7941d87 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:38:23 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
a76f5a088c fixed comment 2014-01-16 13:19:21 -08:00
Brad Hefta-Gaub
a960330f34 fix voxel randomly disappearing bug 2014-01-16 13:17:41 -08:00