Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 05:33:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
39005 commits 25 branches 0 tags 1.1 GiB
Commit graph

39005 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
d00b650ee2 Water sounds 2016-02-15 18:41:56 -08:00
ericrius1
b245499d53 near trigger 2016-02-15 18:30:36 -08:00
ericrius1
f61aea1c9b adding trigger 2016-02-15 18:18:58 -08:00
ericrius1
a5d4ec15ab watering on and off 2016-02-15 18:00:06 -08:00
ericrius1
f97eafc4ee hooking up water to hose 2016-02-15 16:40:03 -08:00
ericrius1
236ff068e2 hose in 2016-02-15 16:16:31 -08:00
ericrius1
a12886eebd growing stuff 2016-02-15 15:57:07 -08:00
ericrius1
03ca41c0c2 each flower needs to be its own object 2016-02-15 15:43:44 -08:00
ericrius1
969ae2e07b cactus getting watered 2016-02-15 15:26:58 -08:00
ericrius1
678caef9c6 flowers ready to be grown through watering 2016-02-15 15:16:49 -08:00
ericrius1
13a8557f03 basic architecture for watering plants set up 2016-02-15 15:12:15 -08:00
ericrius1
3d939a7c23 twerkin 2016-02-15 09:07:16 -08:00
ericrius1
2c895151f6 multiple flowers blooming 2016-02-12 15:32:07 -08:00
ericrius1
b5cc022df0 blooming flowers 2016-02-12 14:58:31 -08:00
ericrius1
11047f676b stable 2016-02-12 13:58:12 -08:00
ericrius1
4c3e3538e8 multiple plants 2016-02-12 13:17:22 -08:00
ericrius1
4f79590919 flower growing in 2016-02-12 11:10:36 -08:00
ericrius1
e32a317533 working 2016-02-12 10:44:35 -08:00
ericrius1
a608725658 changing colors for flower 2016-02-11 20:44:07 -08:00
ericrius1
332ade1db2 bloom tween 2016-02-11 20:34:46 -08:00
ericrius1
f09dd81a14 programatically adjusting flower stretching on sphere 2016-02-11 19:06:11 -08:00
ericrius1
12561f8fcf pretty flowers 2016-02-11 17:06:39 -08:00
ericrius1
b4340f7b70 basic flower petal 2016-02-11 16:28:15 -08:00
ericrius1
7fe555d3a5 initial plant script 2016-02-10 15:44:34 -08:00
Chris Collins
b1c6d1d256 Merge pull request #7070 from sethalves/no-sink-upon-server-restart 
don't sink through floor when server restarts
 2016-02-10 14:42:28 -08:00
Seth Alves
5dd044dc29 Merge pull request #7041 from imgntn/cellscience 
Change the way cellscience entities intitialize & audio plays
 2016-02-10 14:22:30 -08:00
Seth Alves
66584c8e13 Merge pull request #7064 from birarda/integrate-new-hrtf 
cleanup new AM percentage stats in DS
 2016-02-10 14:21:42 -08:00
Andrew Meadows
d121dab937 Merge pull request #7057 from sethalves/grab-then-equip 
Grab then equip
 2016-02-10 14:16:31 -08:00
Seth Alves
11d296a477 if we are told to clear the octree, disable physics until we have (re)loaded entities 2016-02-10 14:08:35 -08:00
Seth Alves
3b1db7a522 Merge pull request #7061 from AndrewMeadows/crash-fix 
Fix crash when deleting many moving dynamic objects.
 2016-02-10 13:58:03 -08:00
Seth Alves
49f2724608 don't return void 2016-02-10 13:49:03 -08:00
Brad Hefta-Gaub
d7db08d150 Merge pull request #7042 from howard-stearns/virtualBaton 
Virtual baton
 2016-02-10 13:48:34 -08:00
Andrew Meadows
8ddbce1ee2 Merge pull request #7059 from sethalves/clamp-ik-dt 
avoid crazy ik-induced shaking / orbits
 2016-02-10 13:32:53 -08:00
James B. Pollack
b07c32e116 Merge pull request #7062 from jherico/webentitiies 
Ensure the QML content gets destroyed on deletion of a QML surface
 2016-02-10 13:27:59 -08:00
Howard Stearns
989192e9fd Make randomize clearer. 2016-02-10 12:53:05 -08:00
James B. Pollack
9a34b68bff add ownership hack to own and handoff movement 2016-02-10 12:50:11 -08:00
Howard Stearns
31d72ffb8d 2 is magic. 2016-02-10 12:17:58 -08:00
Seth Alves
af6bb50f74 fix warning 2016-02-10 12:09:28 -08:00
Howard Stearns
4241f4b305 Convert all simple one-liners containing ') { ' to instead take up three lines. 2016-02-10 12:03:07 -08:00
Stephen Birarda
8598360f2e allow string values to be graphable in DS stats 2016-02-10 11:50:23 -08:00
Brad Hefta-Gaub
5120076add Merge pull request #7060 from jherico/qml 
Small QML fixes
 2016-02-10 11:39:45 -08:00
Seth Alves
9d21c3d549 Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip 2016-02-10 11:35:25 -08:00
Chris Collins
db06674f7e Merge pull request #7058 from hyperlogic/tony/moving-platform-bugfixes 
SpatiallyNestable: bug fixes for kinematic entities
 2016-02-10 11:34:32 -08:00
Brad Davis
a4f2fc58fd Ensure the QML content gets destroyed on deletion of a QML surface 2016-02-10 11:27:18 -08:00
Seth Alves
6fea0b9396 also make sure tau is >= 1.0 2016-02-10 11:20:56 -08:00
Stephen Birarda
a9fc69b4ac cleanup percentage calculation for AM mix stats 2016-02-10 10:49:13 -08:00
Andrew Meadows
84fb983da7 don't forget to remove from _outgoingChanges 2016-02-10 10:36:35 -08:00
Andrew Meadows
132169395c use const reference for std:vector 2016-02-10 10:36:34 -08:00
Andrew Meadows
4bcb7b1ba9 more correct profiling 2016-02-10 10:36:34 -08:00
Andrew Meadows
9b467e94da constify and explicit override 2016-02-10 10:36:34 -08:00